Revision: 18297
Author: [email protected]
Date: Wed Dec 11 11:58:07 2013 UTC
Log: Switch armv7 setting to arm_version==7 in v8 gyp files
BUG=chromium:234135
LOG=Y
[email protected]
Review URL: https://codereview.chromium.org/98543008
Patch from Mostyn Bramley-Moore <[email protected]>.
http://code.google.com/p/v8/source/detail?r=18297
Modified:
/branches/bleeding_edge/Makefile
/branches/bleeding_edge/build/android.gypi
/branches/bleeding_edge/build/standalone.gypi
/branches/bleeding_edge/build/toolchain.gypi
=======================================
--- /branches/bleeding_edge/Makefile Thu Dec 5 12:37:24 2013 UTC
+++ /branches/bleeding_edge/Makefile Wed Dec 11 11:58:07 2013 UTC
@@ -138,12 +138,17 @@
GYPFLAGS += -Dv8_deprecation_warnings=1
endif
# arm specific flags.
-# armv7=false/true
+# arm_version=<number | "default">
+ifneq ($(strip $(arm_version)),)
+ GYPFLAGS += -Darm_version=$(arm_version)
+else
+# Deprecated (use arm_version instead): armv7=false/true
ifeq ($(armv7), false)
- GYPFLAGS += -Darmv7=0
+ GYPFLAGS += -Darm_version=6
else
ifeq ($(armv7), true)
- GYPFLAGS += -Darmv7=1
+ GYPFLAGS += -Darm_version=7
+endif
endif
endif
# vfp2=off. Deprecated, use armfpu=
=======================================
--- /branches/bleeding_edge/build/android.gypi Wed Jun 12 08:05:43 2013 UTC
+++ /branches/bleeding_edge/build/android.gypi Wed Dec 11 11:58:07 2013 UTC
@@ -146,7 +146,7 @@
'-Wl,--icf=safe',
],
}],
- ['target_arch=="arm" and armv7==1', {
+ ['target_arch=="arm" and arm_version==7', {
'cflags': [
'-march=armv7-a',
'-mtune=cortex-a8',
@@ -164,12 +164,12 @@
'-I<(android_stlport_include)',
],
'conditions': [
- ['target_arch=="arm" and armv7==1', {
+ ['target_arch=="arm" and arm_version==7', {
'ldflags': [
'-L<(android_stlport_libs)/armeabi-v7a',
],
}],
- ['target_arch=="arm" and armv7==0', {
+ ['target_arch=="arm" and arm_version < 7', {
'ldflags': [
'-L<(android_stlport_libs)/armeabi',
],
=======================================
--- /branches/bleeding_edge/build/standalone.gypi Mon Dec 2 15:29:31 2013
UTC
+++ /branches/bleeding_edge/build/standalone.gypi Wed Dec 11 11:58:07 2013
UTC
@@ -117,7 +117,7 @@
}],
],
# Default ARM variable settings.
- 'armv7%': 'default',
+ 'arm_version%': 'default',
'arm_neon%': 0,
'arm_fpu%': 'vfpv3',
'arm_float_abi%': 'default',
=======================================
--- /branches/bleeding_edge/build/toolchain.gypi Mon Nov 18 14:32:30 2013
UTC
+++ /branches/bleeding_edge/build/toolchain.gypi Wed Dec 11 11:58:07 2013
UTC
@@ -92,10 +92,10 @@
'conditions': [
['armcompiler=="yes"', {
'conditions': [
- [ 'armv7==1', {
+ [ 'arm_version==7', {
'cflags': ['-march=armv7-a',],
}],
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7 or arm_version=="default"', {
'conditions': [
[ 'arm_neon==1', {
'cflags': ['-mfpu=neon',],
@@ -127,7 +127,7 @@
}, {
# armcompiler=="no"
'conditions': [
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7 or arm_version=="default"', {
'defines': [
'CAN_USE_ARMV7_INSTRUCTIONS=1',
],
@@ -180,10 +180,10 @@
'conditions': [
['armcompiler=="yes"', {
'conditions': [
- [ 'armv7==1', {
+ [ 'arm_version==7', {
'cflags': ['-march=armv7-a',],
}],
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7 or arm_version=="default"', {
'conditions': [
[ 'arm_neon==1', {
'cflags': ['-mfpu=neon',],
@@ -215,7 +215,7 @@
}, {
# armcompiler=="no"
'conditions': [
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7 or arm_version=="default"', {
'defines': [
'CAN_USE_ARMV7_INSTRUCTIONS=1',
],
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
