Trying to fix jit build on s390x - by using atomic lucky

This commit is contained in:
Jan Horak 2017-08-29 13:01:25 +02:00
parent 33ac49112b
commit 49bb7a96a2
3 changed files with 20 additions and 16 deletions

View File

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

View File

@ -67,11 +67,11 @@
%global nspr_version 4.10.10 %global nspr_version 4.10.10
# NSS/NSPR quite often ends in build override, so as requirement the version # NSS/NSPR quite often ends in build override, so as requirement the version
# we're building against could bring us some broken dependencies from time to time. # we're building against could bring us some broken dependencies from time to time.
%global nspr_build_version %{nspr_version}
#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) #%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
%global nspr_build_version %{nspr_version}
%global nss_version 3.29.3 %global nss_version 3.29.3
%global nss_build_version %{nss_version}
#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) #%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
%global nss_build_version %{nss_version}
%endif %endif
%if %{?system_sqlite} %if %{?system_sqlite}
@ -137,6 +137,9 @@ Patch33: build-ppc-s390-dom.patch
Patch34: build-cubeb-pulse-arm.patch Patch34: build-cubeb-pulse-arm.patch
Patch35: build-ppc-jit.patch Patch35: build-ppc-jit.patch
Patch36: build-missing-xlocale-h.patch Patch36: build-missing-xlocale-h.patch
# Always feel lucky for unsupported platforms:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
Patch37: build-jit-atomic-always-lucky.patch
# Fedora specific patches # Fedora specific patches
# Unable to install addons from https pages # Unable to install addons from https pages
@ -151,7 +154,6 @@ Patch226: rhbz-1354671.patch
Patch229: firefox-nss-version.patch Patch229: firefox-nss-version.patch
# Upstream patches # Upstream patches
Patch304: mozilla-1253216.patch
Patch402: mozilla-1196777.patch Patch402: mozilla-1196777.patch
Patch406: mozilla-256180.patch Patch406: mozilla-256180.patch
Patch407: mozilla-1348576.patch Patch407: mozilla-1348576.patch
@ -207,6 +209,7 @@ BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: yasm BuildRequires: yasm
Requires: mozilla-filesystem Requires: mozilla-filesystem
Requires: p11-kit-trust
%if %{?system_nss} %if %{?system_nss}
Requires: nspr >= %{nspr_build_version} Requires: nspr >= %{nspr_build_version}
Requires: nss >= %{nss_build_version} Requires: nss >= %{nss_build_version}
@ -316,6 +319,7 @@ This package contains results of tests executed during build.
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
%patch35 -p1 -b .ppc-jit %patch35 -p1 -b .ppc-jit
%endif %endif
%patch37 -p1 -b .jit-atomic-lucky
%patch3 -p1 -b .arm %patch3 -p1 -b .arm
@ -333,7 +337,6 @@ This package contains results of tests executed during build.
%patch226 -p1 -b .1354671 %patch226 -p1 -b .1354671
%endif %endif
%patch304 -p1 -b .1253216
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777
%patch406 -p1 -b .256180 %patch406 -p1 -b .256180
%ifarch %{arm} %ifarch %{arm}
@ -854,6 +857,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/libfreeblpriv3.chk %{mozappdir}/libfreeblpriv3.chk
%{mozappdir}/libnssdbm3.chk %{mozappdir}/libnssdbm3.chk
%{mozappdir}/libsoftokn3.chk %{mozappdir}/libsoftokn3.chk
%exclude %{mozappdir}/libnssckbi.so
%endif %endif
#--------------------------------------------------------------------- #---------------------------------------------------------------------

View File

@ -1,12 +0,0 @@
diff -up firefox-55.0/js/src/jit/AtomicOperations.h.1253216 firefox-55.0/js/src/jit/AtomicOperations.h
--- firefox-55.0/js/src/jit/AtomicOperations.h.1253216 2017-08-02 11:00:24.115991657 +0200
+++ firefox-55.0/js/src/jit/AtomicOperations.h 2017-08-02 11:01:17.373817096 +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-ppc.h"
# endif
#elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
# include "jit/x86-shared/AtomicOperations-x86-shared.h"