- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -2,3 +2,10 @@
 /firefox-60.2.0esr.source.tar.xz
 /firefox-60.2.1esr.source.tar.xz
 /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
+/firefox-60.7.0esr.source.tar.xz
+/firefox-60.7.1esr.source.tar.xz
+/firefox-60.7.2esr.source.tar.xz
+/firefox-60.8.0esr.source.tar.xz

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
+

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@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
+

Save-x28-before-clobbering-it-in-the-regex-compiler.patch

@@ -0,0 +1,97 @@
+# HG changeset patch
+# User Lars T Hansen <lhansen@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
+

mozjs60.spec

@@ -1,5 +1,9 @@
 %global major 60
 
+# Enable LTO
+%global optflags        %{optflags} -flto
+%global build_ldflags   %{build_ldflags} -flto
+
 # Require libatomic for ppc
 %ifarch ppc
 %global system_libatomic 1
@@ -11,8 +15,8 @@
 %endif
 
 Name:           mozjs%{major}
-Version:        60.2.2
-Release:        1%{?dist}
+Version:        60.8.0
+Release:        3%{?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
@@ -23,7 +27,6 @@ Source0:        https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/sourc
 Patch0001:      fix-soname.patch
 Patch0002:      copy-headers.patch
 Patch0003:      tests-increase-timeout.patch
-Patch0004:      tests-snans-be.patch
 Patch0008:      Always-use-the-equivalent-year-to-determine-the-time-zone.patch
 Patch0009:      icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
 Patch0010:      icu_sources_data-Write-command-output-to-our-stderr.patch
@@ -37,6 +40,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++
@@ -73,7 +80,6 @@ pushd ../..
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-%patch0004 -p1
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
@@ -88,6 +94,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,8 +108,13 @@ popd
 rm -rf ../../modules/zlib
 
 %build
-# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
-export CFLAGS="%{optflags} -fno-tree-vrp -fno-strict-aliasing -fno-delete-null-pointer-checks"
+# Enable LTO
+export AR=%{_bindir}/gcc-ar
+export RANLIB=%{_bindir}/gcc-ranlib
+export NM=%{_bindir}/gcc-nm
+
+export CFLAGS="%{optflags}"
+
 export CXXFLAGS="$CFLAGS"
 export LINKFLAGS="%{?__global_ldflags}"
 export PYTHON="%{__python2}"
@@ -173,6 +190,48 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
 %{_includedir}/mozjs-%{major}/
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 60.8.0-2
+- Enable LTO
+
+* Tue Jul 09 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.8.0-1
+- Update to 60.8.0
+
+* Sat Jun 22 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.7.2-1
+- Update to 60.7.2
+
+* Wed Jun 19 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.7.1-1
+- Update to 60.7.1
+
+* Tue May 21 2019 Kalev Lember <klember@redhat.com> - 60.7.0-1
+- Update to 60.7.0
+
+* Mon Apr 15 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.6.1-2
+- Backport two Firefox 61 patches and allow compiler optimizations on aarch64
+
+* Sun Apr 14 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.6.1-1
+- Update to 60.6.1
+
+* Thu Feb 21 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.4.0-5
+- Re-enable null pointer gcc optimization
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 60.4.0-4
+- Rebuild for readline 8.0
+
+* Thu Feb 14 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.4.0-3
+- Build aarch64 with -O0 because of rhbz#1676292
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 02 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.4.0-1
+- Update to 60.4.0
+
+* Mon Nov 12 2018 Kalev Lember <klember@redhat.com> - 60.3.0-1
+- Update to 60.3.0
+
 * Thu Oct 04 2018 Kalev Lember <klember@redhat.com> - 60.2.2-1
 - Update to 60.2.2
 

sources

@@ -1 +1 @@
-SHA512 (firefox-60.2.2esr.source.tar.xz) = 8149ad0c974a70d8cb18a9212540235089b2a3470edf4dab5eece68b2fab2c10ff426a8a8acde5543b81f847d751ef4a286c9aa8aa33bb7281b429e95d292ba0
+SHA512 (firefox-60.8.0esr.source.tar.xz) = 0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54

tests-snans-be.patch

@@ -1,32 +0,0 @@
-From: Adrian Bunk <bunk@debian.org>
-Date: Tue, 3 Jul 2018 10:03:37 +0100
-Subject: Fix sort_snans.js test on big endian
-
-Bug-Debian: https://bugs.debian.org/878285
----
- js/src/tests/non262/TypedArray/sort_snans.js | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/js/src/tests/non262/TypedArray/sort_snans.js b/js/src/tests/non262/TypedArray/sort_snans.js
-index 9e3ad16..df6cd52 100644
---- a/js/src/tests/non262/TypedArray/sort_snans.js
-+++ b/js/src/tests/non262/TypedArray/sort_snans.js
-@@ -34,6 +34,18 @@ function testFloat32NaNRanges(start, end) {
- // and startHi, startLow and endHi, endLow should be 32-bit integers which,
- // when combined (Hi + Low), form Float64 NaNs.
- function testFloat64NaNRanges(startHi, startLow, endHi, endLow) {
-+
-+    // Swap on big endian platforms
-+    if ((new Uint32Array((new Uint8Array([1,2,3,4])).buffer))[0] === 0x01020304) {
-+	let tmp = startHi;
-+	startHi = startLow;
-+	startLow = tmp;
-+
-+	tmp = endHi;
-+	endHi = endLow;
-+	endLow = tmp;
-+    }
-+
-     let skipN = 10e6;
- 
-     let sampleSizeHi  = Math.floor((endHi - startHi)/skipN);