summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2017-06-03 19:27:36 +0000
committerkwm <kwm@FreeBSD.org>2017-06-03 19:27:36 +0000
commit292d110cf71166c2a0199ff804c5126b32ef4098 (patch)
tree223cd3614bfd1dba359c53ab84852496d8e3c397
parentd11b010028dda196ca1838c5990ebe124e50ebf1 (diff)
downloadFreeBSD-ports-292d110cf71166c2a0199ff804c5126b32ef4098.zip
FreeBSD-ports-292d110cf71166c2a0199ff804c5126b32ef4098.tar.gz
Fix the build on armv6
PR: 214167 Submitted by: mikael.urankar@gmail.com Reported by: Ulrich Grey <usenet@ulrich-grey.de>
-rw-r--r--lang/spidermonkey24/files/patch-assembler_wtf_Platform.h18
-rw-r--r--lang/spidermonkey24/files/patch-vm_NumericConversions.h11
2 files changed, 29 insertions, 0 deletions
diff --git a/lang/spidermonkey24/files/patch-assembler_wtf_Platform.h b/lang/spidermonkey24/files/patch-assembler_wtf_Platform.h
new file mode 100644
index 0000000..033de00
--- /dev/null
+++ b/lang/spidermonkey24/files/patch-assembler_wtf_Platform.h
@@ -0,0 +1,18 @@
+--- assembler/wtf/Platform.h.orig 2016-12-23 16:20:31 UTC
++++ assembler/wtf/Platform.h
+@@ -269,6 +269,7 @@
+ #elif defined(__ARM_ARCH_6__) \
+ || defined(__ARM_ARCH_6J__) \
+ || defined(__ARM_ARCH_6K__) \
++ || defined(__ARM_ARCH_6KZ__) \
+ || defined(__ARM_ARCH_6Z__) \
+ || defined(__ARM_ARCH_6ZK__) \
+ || defined(__ARM_ARCH_6T2__) \
+@@ -306,6 +307,7 @@
+
+ #elif defined(__ARM_ARCH_6J__) \
+ || defined(__ARM_ARCH_6K__) \
++ || defined(__ARM_ARCH_6KZ__) \
+ || defined(__ARM_ARCH_6Z__) \
+ || defined(__ARM_ARCH_6ZK__) \
+ || defined(__ARM_ARCH_6M__)
diff --git a/lang/spidermonkey24/files/patch-vm_NumericConversions.h b/lang/spidermonkey24/files/patch-vm_NumericConversions.h
new file mode 100644
index 0000000..322ee64
--- /dev/null
+++ b/lang/spidermonkey24/files/patch-vm_NumericConversions.h
@@ -0,0 +1,11 @@
+--- vm/NumericConversions.h.orig 2016-12-23 16:23:54 UTC
++++ vm/NumericConversions.h
+@@ -132,7 +132,7 @@ ToIntWidth(double d)
+ inline int32_t
+ ToInt32(double d)
+ {
+-#if defined (__arm__) && defined (__GNUC__)
++#if defined (__arm__) && defined (__GNUC__) && !defined(__clang__)
+ int32_t i;
+ uint32_t tmp0;
+ uint32_t tmp1;
OpenPOWER on IntegriCloud