]>
Commit | Line | Data |
---|---|---|
1 | diff -ur mozjs-60.1.0/build/moz.configure/init.configure mozjs-60.1.0-x32/build/moz.configure/init.configure | |
2 | --- mozjs-60.1.0/build/moz.configure/init.configure 2018-06-19 00:23:55.000000000 +0200 | |
3 | +++ mozjs-60.1.0-x32/build/moz.configure/init.configure 2019-03-31 10:40:40.743730317 +0200 | |
4 | @@ -630,6 +630,8 @@ | |
5 | endianness = 'little' | |
6 | elif cpu in ('x86_64', 'ia64'): | |
7 | canonical_cpu = cpu | |
8 | + if os.endswith('gnux32'): | |
9 | + canonical_cpu = 'x32' | |
10 | endianness = 'little' | |
11 | elif cpu in ('s390', 's390x'): | |
12 | canonical_cpu = cpu | |
13 | diff -ur mozjs-60.1.0/js/src/jsmath.cpp mozjs-60.1.0-x32/js/src/jsmath.cpp | |
14 | --- mozjs-60.1.0/js/src/jsmath.cpp 2018-06-19 00:23:59.000000000 +0200 | |
15 | +++ mozjs-60.1.0-x32/js/src/jsmath.cpp 2019-03-31 11:02:09.300861938 +0200 | |
16 | @@ -58,7 +58,9 @@ | |
17 | ||
18 | // Older glibc versions don't define SYS_getrandom, so we define it here if | |
19 | // it's not available. See bug 995069. | |
20 | -# if defined(__x86_64__) | |
21 | +# if defined(__x86_64__) && defined(__ILP32__) | |
22 | +# define GETRANDOM_NR (__X32_SYSCALL_BIT + 318) | |
23 | +# elif defined(__x86_64__) | |
24 | # define GETRANDOM_NR 318 | |
25 | # elif defined(__i386__) | |
26 | # define GETRANDOM_NR 355 | |
27 | diff -ur mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py | |
28 | --- mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py 2018-06-19 00:24:03.000000000 +0200 | |
29 | +++ mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py 2019-03-31 10:39:21.792681467 +0200 | |
30 | @@ -57,6 +57,7 @@ | |
31 | 'sparc64': 64, | |
32 | 'x86': 32, | |
33 | 'x86_64': 64, | |
34 | + 'x32': 32, | |
35 | } | |
36 | ||
37 | CPU = EnumString.subclass(*CPU_bitness.keys()) | |
38 | @@ -73,6 +74,7 @@ | |
39 | ||
40 | # The order of those checks matter | |
41 | CPU_preprocessor_checks = OrderedDict(( | |
42 | + ('x32', '__x86_64__ && __ILP32__'), | |
43 | ('x86', '__i386__ || _M_IX86'), | |
44 | ('x86_64', '__x86_64__ || _M_X64'), | |
45 | ('arm', '__arm__ || _M_ARM'), |