From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Wed, 21 Jun 2017 16:41:53 +0000 (+0200)
Subject: FTBFS s390x: Use jit/none/AtomicOperations-sparc.h on s390x
X-Git-Tag: archive/raspbian/1%60.5.1-1+rpi1~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db8ffaca6ed10bfba0b8de404819b67f10b188bb;p=thunderbird.git

FTBFS s390x: Use jit/none/AtomicOperations-sparc.h on s390x

s390x needs also to use the atomic operation instructions that are also
used on sparc as they are generic enough.

Gbp-Pq: Topic porting-s390x
Gbp-Pq: Name FTBFS-s390x-Use-jit-none-AtomicOperations-sparc.h-on-s390.patch
---

diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h
index a8970b0d37..1cf22bfc10 100644
--- a/js/src/jit/AtomicOperations.h
+++ b/js/src/jit/AtomicOperations.h
@@ -364,6 +364,9 @@ AtomicOperations::isLockfreeJS(int32_t size)
 #elif defined(__aarch64__)
 # if defined(__clang__) || defined(__GNUC__)
 #  include "jit/arm64/AtomicOperations-arm64.h"
+# elif defined(__s390__)
+  // The sparc file is more or less generic and works on s390x.
+#  include "jit/none/AtomicOperations-sparc.h"
 # else
 #  error "No AtomicOperations support for this platform+compiler combination"
 # endif