diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 0c52eec..d75b3c0 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 18 12:44:44 UTC 2021 - Guillaume GARDET + +- Add patch to fix build on aarch64 - bmo#1729124 + * mozilla-bmo1729124.patch + ------------------------------------------------------------------- Fri Oct 1 18:33:33 UTC 2021 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 8e2133d..4a4e09d 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -227,6 +227,7 @@ Patch28: mozilla-libavcodec58_91.patch Patch29: mozilla-silence-no-return-type.patch Patch30: mozilla-bmo1725828.patch Patch31: mozilla-bmo531915.patch +Patch32: mozilla-bmo1729124.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -357,6 +358,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/mozilla-bmo1729124.patch b/mozilla-bmo1729124.patch new file mode 100644 index 0000000..3a6b27e --- /dev/null +++ b/mozilla-bmo1729124.patch @@ -0,0 +1,50 @@ + +# HG changeset patch +# User Zhao Jiazhong +# Date 1631000649 0 +# Node ID eac40293649628d32911c909219d514bebb8ce63 +# Parent 6582d77235867224aaf8621bad8ee167dfb31460 +Bug 1729124 - [MIPS64][ARM64] Fix gcc build issue. r=lth + +The SpecificRegs struct needs a constructor. + +Differential Revision: https://phabricator.services.mozilla.com/D124535 + +diff --git a/js/src/wasm/WasmBCRegDefs.h b/js/src/wasm/WasmBCRegDefs.h +--- a/js/src/wasm/WasmBCRegDefs.h ++++ b/js/src/wasm/WasmBCRegDefs.h +@@ -374,25 +374,31 @@ struct SpecificRegs { + }; + #elif defined(JS_CODEGEN_ARM) + struct SpecificRegs { + RegI64 abiReturnRegI64; + + SpecificRegs() : abiReturnRegI64(ReturnReg64) {} + }; + #elif defined(JS_CODEGEN_ARM64) +-struct SpecificRegs {}; ++struct SpecificRegs { ++ // Required by gcc. ++ SpecificRegs() {} ++}; + #elif defined(JS_CODEGEN_MIPS32) + struct SpecificRegs { + RegI64 abiReturnRegI64; + + SpecificRegs() : abiReturnRegI64(ReturnReg64) {} + }; + #elif defined(JS_CODEGEN_MIPS64) +-struct SpecificRegs {}; ++struct SpecificRegs { ++ // Required by gcc. ++ SpecificRegs() {} ++}; + #else + struct SpecificRegs { + # ifndef JS_64BIT + RegI64 abiReturnRegI64; + # endif + + SpecificRegs() { MOZ_CRASH("BaseCompiler porting interface: SpecificRegs"); } + }; +