- updated to 60.7.0 (using firefox sources)

[packages/mozjs68.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 7d86f33ac8d8d163ee5c41f5489a13246d1f9617..6fdb47cda6eaa1efc2478ae85eea3556b82dc1fa 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -10,20 +10,19 @@ diff -ur mozjs-60.1.0/build/moz.configure/init.configure mozjs-60.1.0-x32/build/
          endianness = 'little'
      elif cpu in ('s390', 's390x'):
          canonical_cpu = cpu
-diff -ur mozjs-60.1.0/js/src/jsmath.cpp mozjs-60.1.0-x32/js/src/jsmath.cpp
---- mozjs-60.1.0/js/src/jsmath.cpp     2018-06-19 00:23:59.000000000 +0200
-+++ mozjs-60.1.0-x32/js/src/jsmath.cpp 2019-03-31 11:02:09.300861938 +0200
+--- firefox-60.7.0/js/src/jsmath.cpp.orig      2019-05-24 22:04:38.196451155 +0200
++++ firefox-60.7.0/js/src/jsmath.cpp   2019-05-24 22:10:43.717804289 +0200
 @@ -58,7 +58,9 @@
  
  // Older glibc versions don't define SYS_getrandom, so we define it here if
  // it's not available. See bug 995069.
--# if defined(__x86_64__)
-+# if defined(__x86_64__) && defined(__ILP32__)
-+#  define GETRANDOM_NR (__X32_SYSCALL_BIT + 318)
-+# elif defined(__x86_64__)
- #  define GETRANDOM_NR 318
- # elif defined(__i386__)
- #  define GETRANDOM_NR 355
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && defined(__ILP32__)
++#define GETRANDOM_NR (__X32_SYSCALL_BIT + 318)
++#elif defined(__x86_64__)
+ #define GETRANDOM_NR 318
+ #elif defined(__i386__)
+ #define GETRANDOM_NR 355
 diff -ur mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py
 --- mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py       2018-06-19 00:24:03.000000000 +0200
 +++ mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py   2019-03-31 10:39:21.792681467 +0200