The package rpms/mozjs60.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mozjs60.git/commit/?id=d748a5beea....
Change:
-%ifarch aarch64
Thanks.
Full change:
============
commit d748a5beeaa75b4d59e4f9d7679c1c639789d7a2
Author: Frantiek Zatloukal <fzatlouk(a)redhat.com>
Date: Mon Apr 15 11:34:24 2019 +0200
Allow compiler optimizations on aarch64
diff --git a/mozjs60.spec b/mozjs60.spec
index bbae962..2f2bb6a 100644
--- a/mozjs60.spec
+++ b/mozjs60.spec
@@ -12,7 +12,7 @@
Name: mozjs%{major}
Version: 60.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: SpiderMonkey JavaScript library
License: MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and
ASL 2.0
@@ -36,6 +36,10 @@ Patch14: init_patch.patch
# Patches from Fedora firefox package:
Patch26: build-icu-big-endian.patch
+# aarch64 fixes for -O2
+Patch30: Save-x28-before-clobbering-it-in-the-regex-compiler.patch
+Patch31:
Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch
+
BuildRequires: autoconf213
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -86,6 +90,12 @@ pushd ../..
%patch26 -p1 -b .icu
%endif
+# aarch64 -O2 fixes
+%ifarch aarch64
+%patch30 -p1
+%patch31 -p1
+%endif
+
# make sure we don't ever accidentally link against bundled security libs
rm -rf security/
popd
@@ -96,11 +106,6 @@ rm -rf ../../modules/zlib
%build
export CFLAGS="%{optflags}"
-# Use O0 on aarch64 to fix FTBFS (rhbz#1676292)
-%ifarch aarch64
-export CFLAGS=$(echo "$CFLAGS" | sed 's/O2/O0/g')
-%endif
-
export CXXFLAGS="$CFLAGS"
export LINKFLAGS="%{?__global_ldflags}"
export PYTHON="%{__python2}"
@@ -176,6 +181,9 @@ ln -s libmozjs-%{major}.so.0
%{buildroot}%{_libdir}/libmozjs-%{major}.so
%{_includedir}/mozjs-%{major}/
%changelog
+* Mon Apr 15 2019 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 60.6.1-2
+- Backport two Firefox 61 patches and allow compiler optimizations on aarch64
+
* Sun Apr 14 2019 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 60.6.1-1
- Update to 60.6.1
commit cab8ab5a61f47daa426edc8a84aee0a860647046
Author: Frantiek Zatloukal <fzatlouk(a)redhat.com>
Date: Mon Apr 15 11:34:02 2019 +0200
Attempt to fix aarch64 -O2
diff --git
a/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch
b/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch
new file mode 100644
index 0000000..46d280d
--- /dev/null
+++
b/Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Lars T Hansen <lhansen(a)mozilla.com>
+# Date 1519822672 -3600
+# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6
+# Parent 223c97459e96183eb616aed39147207bdb953ba8
+Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object
constructor. r=sstangl
+
+Origin: upstream
+Applied-upstream: 61, commit:
https://hg.mozilla.org/mozilla-central/rev/800abe66894d
+---
+ js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 4 deletions(-)
+
+diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
+index 35ca20d7405f..1c20a1093d13 100644
+--- a/js/src/vm/UnboxedObject.cpp
++++ b/js/src/vm/UnboxedObject.cpp
+@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
+ #endif
+
+ #ifdef JS_CODEGEN_ARM64
+- // ARM64 communicates stack address via sp, but uses a pseudo-sp for
+- // addressing.
+- masm.initStackPtr();
++ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
++ // addressing. The register we use for PSP may however also be used by
++ // calling code, and it is nonvolatile, so save it. Do this as a special
++ // case first because the generic save/restore code needs the PSP to be
++ // initialized already.
++ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
++ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
++
++ // Initialize the PSP from the SP.
++ masm.initStackPtr();
+ #endif
+
+ MOZ_ASSERT(propertiesReg.volatile_());
+@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1;
+ if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
+ masm.PopRegsInMask(savedNonVolatileRegisters);
+
+- masm.abiret();
++#ifdef JS_CODEGEN_ARM64
++ // Now restore the value that was in the PSP register on entry, and return.
++
++ // Obtain the correct SP from the PSP.
++ masm.Mov(sp, PseudoStackPointer64);
++
++ // Restore the saved value of the PSP register, this value is whatever the
++ // caller had saved in it, not any actual SP value, and it must not be
++ // overwritten subsequently.
++ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
++
++ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
++ masm.Ret(vixl::lr);
++#else
++ masm.abiret();
++#endif
+
+ masm.bind(&failureStoreOther);
+
+--
+2.21.0
+
diff --git a/Save-x28-before-clobbering-it-in-the-regex-compiler.patch
b/Save-x28-before-clobbering-it-in-the-regex-compiler.patch
new file mode 100644
index 0000000..3886c0e
--- /dev/null
+++ b/Save-x28-before-clobbering-it-in-the-regex-compiler.patch
@@ -0,0 +1,97 @@
+# HG changeset patch
+# User Lars T Hansen <lhansen(a)mozilla.com>
+# Date 1521449886 -3600
+# Node ID 903a79a1efff18fc7cc50db09a3fe5d768adc9a8
+# Parent 4d2955a9ca7e30ca4c3af9c214ccc77fb2fe7fb8
+Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl
+
+Origin: upstream
+Applied-upstream: 61, commit:
https://hg.mozilla.org/mozilla-central/rev/903a79a1efff
+---
+diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp
b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
+--- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp
++++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
+@@ -118,17 +118,25 @@ NativeRegExpMacroAssembler::GenerateCode
+
+ Label return_temp0;
+
+ // Finalize code - write the entry point code now we know how many
+ // registers we need.
+ masm.bind(&entry_label_);
+
+ #ifdef JS_CODEGEN_ARM64
+- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
++ // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for
++ // addressing. The register we use for PSP may however also be used by
++ // calling code, and it is nonvolatile, so save it. Do this as a special
++ // case first because the generic save/restore code needs the PSP to be
++ // initialized already.
++ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
++ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
++
++ // Initialize the PSP from the SP.
+ masm.initStackPtr();
+ #endif
+
+ // Push non-volatile registers which might be modified by jitcode.
+ size_t pushedNonVolatileRegisters = 0;
+ for (GeneralRegisterForwardIterator iter(savedNonVolatileRegisters); iter.more();
++iter) {
+ masm.Push(*iter);
+ pushedNonVolatileRegisters++;
+@@ -416,17 +424,32 @@ NativeRegExpMacroAssembler::GenerateCode
+ masm.pop(temp0);
+ masm.movePtr(temp0, StackPointer);
+ #endif
+
+ // Restore non-volatile registers which were saved on entry.
+ for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more();
++iter)
+ masm.Pop(*iter);
+
++#ifdef JS_CODEGEN_ARM64
++ // Now restore the value that was in the PSP register on entry, and return.
++
++ // Obtain the correct SP from the PSP.
++ masm.Mov(sp, PseudoStackPointer64);
++
++ // Restore the saved value of the PSP register, this value is whatever the
++ // caller had saved in it, not any actual SP value, and it must not be
++ // overwritten subsequently.
++ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
++
++ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
++ masm.Ret(vixl::lr);
++#else
+ masm.abiret();
++#endif
+
+ // Backtrack code (branch target for conditional backtracks).
+ if (backtrack_label_.used()) {
+ masm.bind(&backtrack_label_);
+ Backtrack();
+ }
+
+ // Backtrack stack overflow code.
+diff --git a/js/src/jit-test/tests/regexp/bug1445907.js
b/js/src/jit-test/tests/regexp/bug1445907.js
+new file mode 100644
+--- /dev/null
++++ b/js/src/jit-test/tests/regexp/bug1445907.js
+@@ -0,0 +1,15 @@
++// On ARM64, we failed to save x28 properly when generating code for the regexp
++// matcher.
++//
++// There's wasm and Debugger code here because the combination forces the use of
++// x28 and exposes the bug when running on the simulator.
++
++if (!wasmIsSupported())
++ quit();
++
++var g = newGlobal('');
++var dbg = new Debugger(g);
++g.eval(`var m = new WebAssembly.Instance(new
WebAssembly.Module(wasmTextToBinary('(module (func (export
"test")))')))`);
++var re = /./;
++dbg.onEnterFrame = function(frame) { re.exec("x") };
++result = g.eval("m.exports.test()");
+
+--
+2.21.0
+
commit 711d5d86269f6bb2ef5d54e1b9e2b00d789e2997
Author: Frantiek Zatloukal <fzatlouk(a)redhat.com>
Date: Sun Apr 14 23:19:44 2019 +0200
Update to 60.6.1
diff --git a/.gitignore b/.gitignore
index 8d8258c..0b33dca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/firefox-60.2.2esr.source.tar.xz
/firefox-60.3.0esr.source.tar.xz
/firefox-60.4.0esr.source.tar.xz
+/firefox-60.6.1esr.source.tar.xz
diff --git a/mozjs60.spec b/mozjs60.spec
index d9d266c..bbae962 100644
--- a/mozjs60.spec
+++ b/mozjs60.spec
@@ -11,8 +11,8 @@
%endif
Name: mozjs%{major}
-Version: 60.4.0
-Release: 5%{?dist}
+Version: 60.6.1
+Release: 1%{?dist}
Summary: SpiderMonkey JavaScript library
License: MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and
ASL 2.0
@@ -176,6 +176,9 @@ ln -s libmozjs-%{major}.so.0
%{buildroot}%{_libdir}/libmozjs-%{major}.so
%{_includedir}/mozjs-%{major}/
%changelog
+* Sun Apr 14 2019 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 60.6.1-1
+- Update to 60.6.1
+
* Thu Feb 21 2019 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 60.4.0-5
- Re-enable null pointer gcc optimization
diff --git a/sources b/sources
index 5c7415c..849749a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (firefox-60.4.0esr.source.tar.xz) =
8119f52b2fc06f76868bf0781fec9d46c8551f0a3ca832ac9bdef6aa6d77c1d785e50d35059f0df5e3586f3396b912af06e448d65e7f5d1f468338eebe8b2cd4
+SHA512 (firefox-60.6.1esr.source.tar.xz) =
a1683e9ad551c2aa6b84013216393fe1f7107728c253ed8e5700d419cf0956513110ed4e1b5dbac3e3bc23930e3024706f1b24d405b6edcdf8c175b03ab241ed
commit a1b605c73f382db25977cb2d4d70a3ba2ff85b92
Author: Frantiek Zatloukal <fzatlouk(a)redhat.com>
Date: Sun Apr 14 22:39:46 2019 +0200
Rebase Always-use-the-equivalent-year-to-determine-the-time-zone patch
diff --git a/Always-use-the-equivalent-year-to-determine-the-time-zone.patch
b/Always-use-the-equivalent-year-to-determine-the-time-zone.patch
index 1d8b4a2..81474a4 100644
--- a/Always-use-the-equivalent-year-to-determine-the-time-zone.patch
+++ b/Always-use-the-equivalent-year-to-determine-the-time-zone.patch
@@ -9,90 +9,92 @@ Bug:
https://bugzilla.mozilla.org/show_bug.cgi?id=1479687
Origin: upstream
Applied-upstream: 62,
commit:https://hg.mozilla.org/mozilla-central/rev/ce9f1466ec78
---
- js/src/jsdate.cpp | 12 ++++++++----
+ js/src/jsdate.cpp | 11 +++++++----
js/src/vm/Time.cpp | 14 ++++----------
js/src/vm/Time.h | 2 +-
- 3 files changed, 13 insertions(+), 15 deletions(-)
+ 3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
-index b7f49e7..f32a853 100644
+index 07af3d18c865..ff8fd6c3763c 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
-@@ -2684,12 +2684,16 @@ static size_t
- FormatTime(char* buf, int buflen, const char* fmt, double utcTime, double localTime)
- {
- PRMJTime prtm = ToPRMJTime(localTime, utcTime);
-- int eqivalentYear = IsRepresentableAsTime32(utcTime)
-- ? prtm.tm_year
-- : EquivalentYearForDST(prtm.tm_year);
-+
-+ // If an equivalent year was used to compute the date/time components, use
-+ // the same equivalent year to determine the time zone name and offset in
-+ // PRMJ_FormatTime(...).
-+ int timeZoneYear = IsRepresentableAsTime32(utcTime)
-+ ? prtm.tm_year
-+ : EquivalentYearForDST(prtm.tm_year);
- int offsetInSeconds = (int) floor((localTime - utcTime) / msPerSecond);
-
-- return PRMJ_FormatTime(buf, buflen, fmt, &prtm, eqivalentYear,
offsetInSeconds);
-+ return PRMJ_FormatTime(buf, buflen, fmt, &prtm, timeZoneYear, offsetInSeconds);
+@@ -2353,12 +2353,15 @@ static PRMJTime ToPRMJTime(double localTime, double utcTime) {
+ static size_t FormatTime(char* buf, int buflen, const char* fmt, double utcTime,
+ double localTime) {
+ PRMJTime prtm = ToPRMJTime(localTime, utcTime);
+- int eqivalentYear = IsRepresentableAsTime32(utcTime)
+- ? prtm.tm_year
+- : EquivalentYearForDST(prtm.tm_year);
++ // If an equivalent year was used to compute the date/time components, use
++ // the same equivalent year to determine the time zone name and offset in
++ // PRMJ_FormatTime(...).
++ int timeZoneYear = IsRepresentableAsTime32(utcTime)
++ ? prtm.tm_year
++ : EquivalentYearForDST(prtm.tm_year);
+ int offsetInSeconds = (int)floor((localTime - utcTime) / msPerSecond);
+
+- return PRMJ_FormatTime(buf, buflen, fmt, &prtm, eqivalentYear,
++ return PRMJ_FormatTime(buf, buflen, fmt, &prtm, timeZoneYear,
+ offsetInSeconds);
}
-
- enum class FormatSpec {
+
diff --git a/js/src/vm/Time.cpp b/js/src/vm/Time.cpp
-index da690fe..3a80d7f 100644
+index f59977f0d0e9..5ee4794b3e83 100644
--- a/js/src/vm/Time.cpp
+++ b/js/src/vm/Time.cpp
-@@ -262,7 +262,7 @@ PRMJ_InvalidParameterHandler(const wchar_t* expression,
+@@ -247,7 +247,7 @@ static void PRMJ_InvalidParameterHandler(const wchar_t* expression,
+
/* Format a time value into a buffer. Same semantics as strftime() */
- size_t
- PRMJ_FormatTime(char* buf, int buflen, const char* fmt, const PRMJTime* prtm,
-- int equivalentYear, int offsetInSeconds)
-+ int timeZoneYear, int offsetInSeconds)
- {
- size_t result = 0;
+ size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+- const PRMJTime* prtm, int equivalentYear,
++ const PRMJTime* prtm, int timeZoneYear,
+ int offsetInSeconds) {
+ size_t result = 0;
#if defined(XP_UNIX) || defined(XP_WIN)
-@@ -295,7 +295,8 @@ PRMJ_FormatTime(char* buf, int buflen, const char* fmt, const
PRMJTime* prtm,
- * Fill out |td| to the time represented by |prtm|, leaving the
- * timezone fields zeroed out. localtime_r will then fill in the
- * timezone fields for that local time according to the system's
-- * timezone parameters.
-+ * timezone parameters. Use |timeZoneYear| for the year to ensure the
-+ * time zone name matches the time zone offset used by the caller.
- */
- struct tm td;
- memset(&td, 0, sizeof(td));
-@@ -305,19 +306,12 @@ PRMJ_FormatTime(char* buf, int buflen, const char* fmt, const
PRMJTime* prtm,
- td.tm_mday = prtm->tm_mday;
- td.tm_mon = prtm->tm_mon;
- td.tm_wday = prtm->tm_wday;
-- td.tm_year = prtm->tm_year - 1900;
-+ td.tm_year = timeZoneYear - 1900;
- td.tm_yday = prtm->tm_yday;
- td.tm_isdst = prtm->tm_isdst;
-
- time_t t = mktime(&td);
-
-- // If |prtm| cannot be represented in |time_t| the year is probably
-- // out of range, try again with the DST equivalent year.
-- if (t == static_cast<time_t>(-1)) {
-- td.tm_year = equivalentYear - 1900;
-- t = mktime(&td);
-- }
+@@ -280,7 +280,8 @@ size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+ * Fill out |td| to the time represented by |prtm|, leaving the
+ * timezone fields zeroed out. localtime_r will then fill in the
+ * timezone fields for that local time according to the system's
+- * timezone parameters.
++ * timezone parameters. Use |timeZoneYear| for the year to ensure the
++ * time zone name matches the time zone offset used by the caller.
+ */
+ struct tm td;
+ memset(&td, 0, sizeof(td));
+@@ -290,19 +291,12 @@ size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+ td.tm_mday = prtm->tm_mday;
+ td.tm_mon = prtm->tm_mon;
+ td.tm_wday = prtm->tm_wday;
+- td.tm_year = prtm->tm_year - 1900;
++ td.tm_year = timeZoneYear - 1900;
+ td.tm_yday = prtm->tm_yday;
+ td.tm_isdst = prtm->tm_isdst;
+
+ time_t t = mktime(&td);
+
+- // If |prtm| cannot be represented in |time_t| the year is probably
+- // out of range, try again with the DST equivalent year.
+- if (t == static_cast<time_t>(-1)) {
+- td.tm_year = equivalentYear - 1900;
+- t = mktime(&td);
+- }
-
- // If either mktime or localtime_r failed, fill in the fallback time
- // zone offset |offsetInSeconds| and set the time zone identifier to
- // the empty string.
+ // If either mktime or localtime_r failed, fill in the fallback time
+ // zone offset |offsetInSeconds| and set the time zone identifier to
+ // the empty string.
diff --git a/js/src/vm/Time.h b/js/src/vm/Time.h
-index db61e89..597673b 100644
+index 3a51d869c922..37b7faeec028 100644
--- a/js/src/vm/Time.h
+++ b/js/src/vm/Time.h
-@@ -55,7 +55,7 @@ PRMJ_NowShutdown() {}
+@@ -49,7 +49,7 @@ inline void PRMJ_NowShutdown() {}
+
/* Format a time value into a buffer. Same semantics as strftime() */
- extern size_t
- PRMJ_FormatTime(char* buf, int buflen, const char* fmt, const PRMJTime* tm,
-- int equivalentYear, int offsetInSeconds);
-+ int timeZoneYear, int offsetInSeconds);
-
-
+ extern size_t PRMJ_FormatTime(char* buf, int buflen, const char* fmt,
+- const PRMJTime* tm, int equivalentYear,
++ const PRMJTime* tm, int timeZoneYear,
+ int offsetInSeconds);
+
/**
+--
+2.21.0
+