- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
2020-08-01 04:34:24 +00:00 · 2020-07-28 08:29:19 +00:00 · 2020-02-17 16:27:44 +01:00 · 2020-02-17 16:27:15 +01:00 · 2020-01-29 14:06:43 +00:00 · 2019-09-10 12:30:43 +02:00
11 changed files with 685 additions and 110 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,11 @@
 /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
+/firefox-60.9.0esr.source.tar.xz
--- 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
+
--- 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
@ -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
+
--- a/Save-x28-before-clobbering-it-in-the-regex-compiler.patch
+++ b/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
+
--- a/enddianness.patch
+++ b/enddianness.patch
@ -0,0 +1,225 @@
+From f66d410f3ba767efb91c6b9545d373267cd975f2 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sat, 7 Sep 2019 20:43:40 +0200
+Subject: [PATCH] enddianness.patch
+
+Bug 1488552 - Ensure proper running on 64-bit and 32-bit BE platforms.
+---
+ js/src/gc/Marking-inl.h       | 16 ++++++++++++++++
+ js/src/gc/RelocationOverlay.h | 13 ++++++++++++-
+ js/src/jsfriendapi.h          |  8 ++++++++
+ js/src/vm/StringType.h        | 13 +++++++++++++
+ 4 files changed, 49 insertions(+), 1 deletion(-)
+
+Index: firefox-60.9.0/js/src/gc/Marking-inl.h
+===================================================================
+--- firefox-60.9.0.orig/js/src/gc/Marking-inl.h	2019-09-01 15:09:17.000000000 +0200
+++ firefox-60.9.0/js/src/gc/Marking-inl.h	2019-12-09 11:42:31.024301901 +0100
+@@ -82,12 +82,28 @@
+   MOZ_ASSERT(!isForwarded());
+   // The location of magic_ is important because it must never be valid to see
+   // the value Relocated there in a GC thing that has not been moved.
+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
+  // On 32-bit, the magic_ aliases with whatever comes after the first
+  // pointer; on little-endian 64-bit, the magic_ aliases with the
+  // 32 most significant bits of the pointer, which are the second half.
+   static_assert(offsetof(RelocationOverlay, magic_) ==
+                     offsetof(JSObject, group_) + sizeof(uint32_t),
+                 "RelocationOverlay::magic_ is in the wrong location");
+   static_assert(offsetof(RelocationOverlay, magic_) ==
+                     offsetof(js::Shape, base_) + sizeof(uint32_t),
+                 "RelocationOverlay::magic_ is in the wrong location");
+#elif JS_BITS_PER_WORD == 64
+  // On big-endian 64-bit, the magic_ aliases with the 32 most
+  // significant bits of the pointer, but now that's the first half.
+  static_assert(offsetof(RelocationOverlay, magic_) ==
+                    offsetof(JSObject, group_),
+                "RelocationOverlay::magic_ is in the wrong location");
+  static_assert(offsetof(RelocationOverlay, magic_) ==
+                    offsetof(js::Shape, base_),
+                "RelocationOverlay::magic_ is in the wrong location");
+#else
+#  error "Unknown endianness or word size"
+#endif
+   static_assert(
+       offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length),
+       "RelocationOverlay::magic_ is in the wrong location");
+Index: firefox-60.9.0/js/src/gc/RelocationOverlay.h
+===================================================================
+--- firefox-60.9.0.orig/js/src/gc/RelocationOverlay.h	2019-09-01 15:09:17.000000000 +0200
+++ firefox-60.9.0/js/src/gc/RelocationOverlay.h	2019-12-09 11:42:31.024301901 +0100
+@@ -33,14 +33,25 @@
+   /* See comment in js/public/HeapAPI.h. */
+   static const uint32_t Relocated = js::gc::Relocated;
+ 
+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
+   /*
+-   * Keep the low 32 bits untouched. Use them to distinguish strings from
+   * Keep the first 32 bits untouched. Use them to distinguish strings from
+    * objects in the nursery.
+    */
+   uint32_t preserve_;
+ 
+   /* Set to Relocated when moved. */
+   uint32_t magic_;
+#elif JS_BITS_PER_WORD == 64
+  /*
+   * On big-endian, we need to reorder to keep preserve_ lined up with the
+   * low 32 bits of the aligned group_ pointer in JSObject.
+   */
+  uint32_t magic_;
+  uint32_t preserve_;
+#else
+#  error "Unknown endianness or word size"
+#endif
+ 
+   /* The location |this| was moved to. */
+   Cell* newLocation_;
+Index: firefox-60.9.0/js/src/jsfriendapi.h
+===================================================================
+--- firefox-60.9.0.orig/js/src/jsfriendapi.h	2019-09-01 15:09:18.000000000 +0200
+++ firefox-60.9.0/js/src/jsfriendapi.h	2019-12-09 11:42:31.024301901 +0100
+@@ -9,6 +9,7 @@
+ 
+ #include "mozilla/Atomics.h"
+ #include "mozilla/Casting.h"
+#include "mozilla/EndianUtils.h"
+ #include "mozilla/Maybe.h"
+ #include "mozilla/MemoryReporting.h"
+ #include "mozilla/UniquePtr.h"
+@@ -609,8 +610,15 @@
+   static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6);
+   static const uint32_t EXTERNAL_FLAGS = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5);
+   static const uint32_t TYPE_FLAGS_MASK = JS_BIT(6) - 1;
+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
+   uint32_t flags;
+   uint32_t length;
+#elif JS_BITS_PER_WORD == 64
+  uint32_t length;
+  uint32_t flags;
+#else
+#  error "Unknown endianness or word size"
+#endif
+   union {
+     const JS::Latin1Char* nonInlineCharsLatin1;
+     const char16_t* nonInlineCharsTwoByte;
+Index: firefox-60.9.0/js/src/vm/StringType.h
+===================================================================
+--- firefox-60.9.0.orig/js/src/vm/StringType.h	2019-09-01 15:09:39.000000000 +0200
+++ firefox-60.9.0/js/src/vm/StringType.h	2019-12-09 11:42:31.028301901 +0100
+@@ -7,6 +7,7 @@
+ #ifndef vm_StringType_h
+ #define vm_StringType_h
+ 
+#include "mozilla/EndianUtils.h"
+ #include "mozilla/MemoryReporting.h"
+ #include "mozilla/PodOperations.h"
+ #include "mozilla/Range.h"
+@@ -168,8 +169,20 @@
+   struct Data {
+     union {
+       struct {
+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
+         uint32_t flags;  /* JSString */
+         uint32_t length; /* JSString */
+#elif JS_BITS_PER_WORD == 64
+        /*
+         * On big-endian, we need to reorder to keep flags lined up
+         * with the low 32 bits of the aligned group_ pointer in
+         * JSObject.
+         */
+        uint32_t length; /* JSString */
+        uint32_t flags;  /* JSString */
+#else
+#  error "Unknown endianness or word size"
+#endif
+       };
+       uintptr_t flattenData; /* JSRope (temporary while flattening) */
+     } u1;
+Index: firefox-60.9.0/js/src/js-config.h.in
+===================================================================
+--- firefox-60.9.0.orig/js/src/js-config.h.in	2019-09-01 15:09:18.000000000 +0200
+++ firefox-60.9.0/js/src/js-config.h.in	2019-12-09 11:43:13.052302975 +0100
+@@ -38,6 +38,13 @@
+ /* Define to 1 if SpiderMonkey should include ctypes support.  */
+ #undef JS_HAS_CTYPES
+ 
+/* Define to 1 if SpiderMonkey should include trace logging support. */
+#undef JS_TRACE_LOGGING
+
+/* Define to 1 if SpiderMonkey should include a breakpoint function for
+ * artificial OOMs. */
+#undef JS_OOM_BREAKPOINT
+
+ /* Define to 1 if SpiderMonkey should support the ability to perform
+    entirely too much GC.  */
+ #undef JS_GC_ZEAL
+@@ -48,12 +55,25 @@
+ /* Define to 1 to perform extra assertions and heap poisoning. */
+ #undef JS_CRASH_DIAGNOSTICS
+ 
+/* Define to 1 if SpiderMonkey is compiled with support for private values at
+ * odd-numbered memory addresses. */
+#undef JS_UNALIGNED_PRIVATE_VALUES
+
+ /* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
+ #undef JS_NUNBOX32
+ 
+ /* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
+ #undef JS_PUNBOX64
+ 
+/* Define exactly one of these to 1 to indicate JIT code generation mode. */
+#undef JS_CODEGEN_NONE
+#undef JS_CODEGEN_ARM
+#undef JS_CODEGEN_ARM64
+#undef JS_CODEGEN_MIPS32
+#undef JS_CODEGEN_MIPS64
+#undef JS_CODEGEN_X86
+#undef JS_CODEGEN_X64
+
+ /* MOZILLA JSAPI version number components */
+ #undef MOZJS_MAJOR_VERSION
+ #undef MOZJS_MINOR_VERSION
+Index: firefox-60.9.0/js/src/jsapi.cpp
+===================================================================
+--- firefox-60.9.0.orig/js/src/jsapi.cpp	2019-09-01 15:09:18.000000000 +0200
+++ firefox-60.9.0/js/src/jsapi.cpp	2019-12-09 11:43:13.052302975 +0100
+@@ -115,6 +115,14 @@
+ #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
+ #endif
+ 
+// See preprocessor definition of JS_BITS_PER_WORD in jstypes.h; make sure
+// JS_64BIT (used internally) agrees with it
+#ifdef JS_64BIT
+static_assert(JS_BITS_PER_WORD == 64, "values must be in sync");
+#else
+static_assert(JS_BITS_PER_WORD == 32, "values must be in sync");
+#endif
+
+ JS_PUBLIC_API bool JS::CallArgs::requireAtLeast(JSContext* cx,
+                                                 const char* fnname,
+                                                 unsigned required) const {
+Index: firefox-60.9.0/js/src/jstypes.h
+===================================================================
+--- firefox-60.9.0.orig/js/src/jstypes.h	2019-09-01 15:09:18.000000000 +0200
+++ firefox-60.9.0/js/src/jstypes.h	2019-12-09 11:43:13.052302975 +0100
+@@ -141,12 +141,17 @@
+ #define JS_BITS_PER_BYTE 8
+ #define JS_BITS_PER_BYTE_LOG2 3
+ 
+-#if defined(JS_64BIT)
+#if (defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8) || \
+    (defined(UINTPTR_MAX) && UINTPTR_MAX == 0xFFFFFFFFFFFFFFFFu)
+ #define JS_BITS_PER_WORD 64
+ #else
+ #define JS_BITS_PER_WORD 32
+ #endif
+ 
+static_assert(sizeof(void*) == 8 ? JS_BITS_PER_WORD == 64
+                                 : JS_BITS_PER_WORD == 32,
+              "preprocessor and compiler must agree");
+
+ /***********************************************************************
+ ** MACROS:      JS_FUNC_TO_DATA_PTR
+ **              JS_DATA_TO_FUNC_PTR
+
--- a/jsproperty-endian.patch
+++ b/jsproperty-endian.patch
@ -0,0 +1,36 @@
+From a95105b7846c29c5bd3868719621ab3679d9932b Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sat, 7 Sep 2019 21:45:58 +0200
+Subject: [PATCH] jsproperty-endian.patch
+
+Bug 1543659 - fix JSPropertySpec::ValueWrapper on 64-bit big-endian platforms
+
+Add some padding to make the union's int32 member correspond to the
+low-order bits of the string member.  This fixes TypedArray tests on
+s390x.
+---
+ js/src/jsapi.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/js/src/jsapi.h b/js/src/jsapi.h
+index 0f11787f6..f1c084f6a 100644
+--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
+@@ -1581,7 +1581,14 @@ struct JSPropertySpec {
+     uintptr_t type;
+     union {
+       const char* string;
+#if MOZ_BIG_ENDIAN && JS_BITS_PER_WORD == 64
+      struct {
+        uint32_t padding;
+        int32_t int32;
+      };
+#else
+       int32_t int32;
+#endif
+     };
+   };
+ 
+-- 
+2.23.0
+
--- a/mozjs60.spec
+++ b/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.9.0
+Release:        7%{?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
@ -34,9 +37,23 @@ Patch12:        emitter.patch
 Patch13:        emitter_test.patch
 Patch14:        init_patch.patch

+# s390x fixes:
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/enddianness.patch
+Patch15:        enddianness.patch
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/jsproperty-endian.patch
+Patch16:        jsproperty-endian.patch
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/tests-Skip-a-test-on-s390x.patch
+Patch17:        tests-Skip-a-test-on-s390x.patch
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/tests-Expect-a-test-to-fail-on-big-endian.patch
+Patch18:        tests-Expect-a-test-to-fail-on-big-endian.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 +90,6 @@ pushd ../..
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-%patch0004 -p1
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
@ -83,11 +99,23 @@ pushd ../..
 %patch13 -p1
 %patch14 -p1

+# s390x fixes
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %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 +124,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}"
@ -133,6 +166,43 @@ popd
 # Fix permissions
 chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc

+# Avoid multilib conflicts
+case `uname -i` in
+  i386 | ppc | s390 | sparc )
+    wordsize="32"
+    ;;
+  x86_64 | ppc64 | s390x | sparc64 )
+    wordsize="64"
+    ;;
+  *)
+    wordsize=""
+    ;;
+esac
+
+if test -n "$wordsize"
+then
+  mv %{buildroot}%{_includedir}/mozjs-60/js-config.h \
+     %{buildroot}%{_includedir}/mozjs-60/js-config-$wordsize.h
+
+  cat >%{buildroot}%{_includedir}/mozjs-60/js-config.h <<EOF
+#ifndef JS_CONFIG_H_MULTILIB
+#define JS_CONFIG_H_MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "js-config-32.h"
+#elif __WORDSIZE == 64
+# include "js-config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
+
+fi
+
 # Remove unneeded files
 rm %{buildroot}%{_bindir}/js%{major}-config
 rm %{buildroot}%{_libdir}/libjs_static.ajs
@ -146,7 +216,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
 %check
 # Run SpiderMonkey tests
 %{__python2} tests/jstests.py -d -s -t 1800 --no-progress ../../js/src/js/src/shell/js \
-%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le
+%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le s390x
 ;
 %else
 || :
@ -154,7 +224,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so

 # Run basic JIT tests
 %{__python2} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic \
-%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le
+%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le s390x
 ;
 %else
 || :
@ -173,6 +243,71 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
 %{_includedir}/mozjs-%{major}/

 %changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 60.9.0-7
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 60.9.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 60.9.0-5
+- Update enddianness.patch with more s390x fixes
+- Enable tests on s390x again
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 60.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 60.9.0-3
+- Fix multilib conflicts in js-config.h
+
+* Sat Sep 07 2019 Kalev Lember <klember@redhat.com> - 60.9.0-2
+- Backport patches for s390x support
+
+* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 60.9.0-1
+- Update to 60.9.0
+
+* 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

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (firefox-60.2.2esr.source.tar.xz) = 8149ad0c974a70d8cb18a9212540235089b2a3470edf4dab5eece68b2fab2c10ff426a8a8acde5543b81f847d751ef4a286c9aa8aa33bb7281b429e95d292ba0
+SHA512 (firefox-60.9.0esr.source.tar.xz) = 4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf
--- a/tests-Expect-a-test-to-fail-on-big-endian.patch
+++ b/tests-Expect-a-test-to-fail-on-big-endian.patch
@ -0,0 +1,24 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 28 Sep 2018 09:51:33 +0100
+Subject: tests: Expect a test to fail on big-endian
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: no
+---
+ js/src/tests/jstests.list | 3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: firefox-60.9.0/js/src/tests/jstests.list
+===================================================================
+--- firefox-60.9.0.orig/js/src/tests/jstests.list	2019-12-10 11:04:22.464247245 +0100
+++ firefox-60.9.0/js/src/tests/jstests.list	2019-12-10 11:15:21.496264080 +0100
+@@ -451,6 +451,8 @@
+ #
+ skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
+ 
+# Assumes little-endian IEEE representation of floating point numbers
+fails-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-|ppc-/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
+ 
+ ###########################################################
+ # Tests disabled due to issues in test262 importer script #
+
--- a/tests-Skip-a-test-on-s390x.patch
+++ b/tests-Skip-a-test-on-s390x.patch
@ -0,0 +1,16 @@
+Index: firefox-60.9.0/js/src/tests/jstests.list
+===================================================================
+--- firefox-60.9.0.orig/js/src/tests/jstests.list	2019-12-10 11:03:40.064246162 +0100
+++ firefox-60.9.0/js/src/tests/jstests.list	2019-12-10 11:04:22.464247245 +0100
+@@ -447,6 +447,10 @@
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1321616
+ skip script test262/annexB/built-ins/Function/createdynfn-html-close-comment-params.js
+ 
+# Crashes on s390x and ppc64, avoid it
+#
+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
+
+ 
+ ###########################################################
+ # Tests disabled due to issues in test262 importer script #
+
--- a/tests-snans-be.patch
+++ b/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);
Author	SHA1	Message	Date
Fedora Release Engineering	e5b3e47f21	- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-08-01 04:34:24 +00:00
Fedora Release Engineering	c6e591474e	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-28 08:29:19 +00:00
Kalev Lember	2722d5b430	Enable tests on s390x again This adds two more Debian patches to fix issues with tests on s390x.	2020-02-17 16:27:44 +01:00
Kalev Lember	4bdd99ed97	Update enddianness.patch with more s390x fixes Update enddianness.patch with more fixes from bmo#1590907 to fix strings usage on s390x. This also syncs the patch to opensuse mozjs60. https://gitlab.gnome.org/GNOME/gjs/issues/293	2020-02-17 16:27:15 +01:00
Fedora Release Engineering	78626be98e	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-29 14:06:43 +00:00
Kalev Lember	d2795ed492	Fix multilib conflicts in js-config.h The multilib header handling is copied verbatim from libjpeg-turbo.	2019-09-10 12:30:43 +02:00
Kalev Lember	f00bcf36c0	Backport patches for s390x support	2019-09-07 21:52:31 +02:00
Kalev Lember	02c58cc60b	Update to 60.9.0	2019-09-03 16:34:19 +02:00
Fedora Release Engineering	6e4ad8449e	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-25 17:46:14 +00:00
František Zatloukal	5395cffee2	Enable LTO	2019-07-10 09:45:50 +02:00
František Zatloukal	cb01018c75	Update to 60.8.0	2019-07-09 21:20:20 +02:00
František Zatloukal	5bba358c4d	Update to 60.7.2	2019-06-22 16:28:04 +02:00
František Zatloukal	5169aa3583	Update to 60.7.1	2019-06-19 20:05:13 +02:00
Kalev Lember	7a410da378	Update to 60.7.0	2019-05-21 17:12:16 +02:00
František Zatloukal	d748a5beea	Allow compiler optimizations on aarch64	2019-04-15 16:04:50 +02:00
František Zatloukal	cab8ab5a61	Attempt to fix aarch64 -O2	2019-04-15 11:34:02 +02:00
František Zatloukal	711d5d8626	Update to 60.6.1	2019-04-14 23:51:34 +02:00
František Zatloukal	a1b605c73f	Rebase Always-use-the-equivalent-year-to-determine-the-time-zone patch	2019-04-14 23:19:18 +02:00
František Zatloukal	ca946228cd	Re-enable null pointer gcc optimization	2019-02-21 10:05:03 +01:00
Igor Gnatenko	4b22c2f4ca	Rebuild for readline 8.0	2019-02-17 09:30:51 +01:00
František Zatloukal	44b31ba543	Build aarch64 with -O0	2019-02-14 12:59:53 +01:00
Fedora Release Engineering	9062389a4f	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-01 11:32:07 +00:00
František Zatloukal	2218902e6f	Update to 60.4.0	2019-01-02 17:43:51 +01:00
Kalev Lember	c60e0347ab	Drop upstreamed tests-snans-be.patch	2018-11-12 18:49:30 +01:00
Kalev Lember	ed6bf9c19c	Update to 60.3.0	2018-11-12 18:35:35 +01:00