From 49bb7a96a20d6817b64e87424d5a10e5945e47ea Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 29 Aug 2017 13:01:25 +0200 Subject: Trying to fix jit build on s390x - by using atomic lucky --- build-jit-atomic-always-lucky.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 build-jit-atomic-always-lucky.patch (limited to 'build-jit-atomic-always-lucky.patch') diff --git a/build-jit-atomic-always-lucky.patch b/build-jit-atomic-always-lucky.patch new file mode 100644 index 0000000..ad8af85 --- /dev/null +++ b/build-jit-atomic-always-lucky.patch @@ -0,0 +1,12 @@ +diff -up firefox-55.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-55.0.2/js/src/jit/AtomicOperations.h +--- firefox-55.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky 2017-07-31 18:20:47.000000000 +0200 ++++ firefox-55.0.2/js/src/jit/AtomicOperations.h 2017-08-29 11:53:27.790497321 +0200 +@@ -348,7 +348,7 @@ AtomicOperations::isLockfree(int32_t siz + # elif defined(__sh__) + # include "jit/none/AtomicOperations-feeling-lucky.h" + # else +-# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always ++# include "jit/none/AtomicOperations-feeling-lucky.h" + # endif + #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) + # include "jit/x86-shared/AtomicOperations-x86-shared.h" -- cgit From 5bd5ea4597297a40785f39801d177a18748bf929 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 29 Aug 2017 14:14:06 +0200 Subject: Fixing s390 jit patch --- build-jit-atomic-always-lucky.patch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'build-jit-atomic-always-lucky.patch') diff --git a/build-jit-atomic-always-lucky.patch b/build-jit-atomic-always-lucky.patch index ad8af85..d6812b6 100644 --- a/build-jit-atomic-always-lucky.patch +++ b/build-jit-atomic-always-lucky.patch @@ -1,6 +1,6 @@ diff -up firefox-55.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-55.0.2/js/src/jit/AtomicOperations.h --- firefox-55.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky 2017-07-31 18:20:47.000000000 +0200 -+++ firefox-55.0.2/js/src/jit/AtomicOperations.h 2017-08-29 11:53:27.790497321 +0200 ++++ firefox-55.0.2/js/src/jit/AtomicOperations.h 2017-08-29 12:59:52.870926044 +0200 @@ -348,7 +348,7 @@ AtomicOperations::isLockfree(int32_t siz # elif defined(__sh__) # include "jit/none/AtomicOperations-feeling-lucky.h" @@ -10,3 +10,21 @@ diff -up firefox-55.0.2/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-5 # endif #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) # include "jit/x86-shared/AtomicOperations-x86-shared.h" +diff -up firefox-55.0.2/js/src/jit/none/AtomicOperations-feeling-lucky.h.jit-atomic-lucky firefox-55.0.2/js/src/jit/none/AtomicOperations-feeling-lucky.h +--- firefox-55.0.2/js/src/jit/none/AtomicOperations-feeling-lucky.h.jit-atomic-lucky 2017-08-29 14:10:52.665031524 +0200 ++++ firefox-55.0.2/js/src/jit/none/AtomicOperations-feeling-lucky.h 2017-08-29 14:09:40.756060235 +0200 +@@ -60,6 +60,14 @@ + # define GNUC_COMPATIBLE + #endif + ++#ifdef __s390__ ++# define GNUC_COMPATIBLE ++#endif ++ ++#ifdef __s390x__ ++# define GNUC_COMPATIBLE ++#endif ++ + // The default implementation tactic for gcc/clang is to use the newer + // __atomic intrinsics added for use in C++11 . Where that + // isn't available, we use GCC's older __sync functions instead. -- cgit