PKGBUILDs/community/nodejs/0001-arm-fixes.patch

53 lines
1.8 KiB
Diff
Raw Normal View History

2017-01-06 02:49:41 +00:00
From e5071421ad33702cdc2502fc0ce734c0968d8ad6 Mon Sep 17 00:00:00 2001
2015-09-17 00:01:46 +00:00
From: Kevin Mihelich <kevin@archlinuxarm.org>
2015-10-14 03:02:05 +00:00
Date: Tue, 13 Oct 2015 20:45:53 -0600
2015-09-17 00:01:46 +00:00
Subject: [PATCH] arm fixes
---
2016-11-01 18:39:48 +00:00
configure | 5 ++++-
deps/v8/gypfiles/toolchain.gypi | 4 ++--
2015-10-14 03:02:05 +00:00
2 files changed, 6 insertions(+), 3 deletions(-)
2015-09-17 00:01:46 +00:00
diff --git a/configure b/configure
2017-01-06 02:49:41 +00:00
index d926cec..f3fad3e 100755
2015-09-17 00:01:46 +00:00
--- a/configure
+++ b/configure
2017-01-06 02:49:41 +00:00
@@ -738,8 +738,11 @@ def configure_arm(o):
2015-09-17 00:01:46 +00:00
if is_arch_armv7():
2015-10-14 03:02:05 +00:00
arm_fpu = 'vfpv3'
2015-09-17 00:01:46 +00:00
o['variables']['arm_version'] = '7'
+ elif is_arch_armv6():
+ o['variables']['arm_version'] = '6'
2015-10-14 03:02:05 +00:00
else:
- o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default'
2015-09-17 00:01:46 +00:00
+ o['variables']['arm_fpu'] = ''
+ o['variables']['arm_version'] = '5'
o['variables']['arm_thumb'] = 0 # -marm
o['variables']['arm_float_abi'] = arm_float_abi
2016-11-01 18:39:48 +00:00
diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi
index 95eb1d9..6416a1e 100644
--- a/deps/v8/gypfiles/toolchain.gypi
+++ b/deps/v8/gypfiles/toolchain.gypi
@@ -207,7 +207,7 @@
2015-09-17 00:01:46 +00:00
}],
[ 'arm_version==7 or arm_version=="default"', {
'conditions': [
- [ 'arm_fpu!="default"', {
+ [ 'arm_fpu!="default" and arm_fpu!=""', {
'cflags': ['-mfpu=<(arm_fpu)',],
}],
],
2016-11-01 18:39:48 +00:00
@@ -250,7 +250,7 @@
2015-09-17 00:01:46 +00:00
}],
[ 'arm_version==7 or arm_version=="default"', {
'conditions': [
- [ 'arm_fpu!="default"', {
+ [ 'arm_fpu!="default" and arm_fpu!=""', {
'cflags': ['-mfpu=<(arm_fpu)',],
}],
],
--
2017-01-06 02:49:41 +00:00
2.10.2
2015-09-17 00:01:46 +00:00