AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Switch armv7 setting to arm_version==7 in v8 gyp files

Browse Source 
BUG=chromium:234135
LOG=Y
R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/98543008

Patch from Mostyn Bramley-Moore <mostynb@opera.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18297 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2013-12-11 11:58:07 +00:00
parent 5bc64b9fa5
commit 7967a195c7
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -138,12 +138,17 @@ ifeq ($(deprecationwarnings), on)
GYPFLAGS += -Dv8_deprecation_warnings=1 GYPFLAGS += -Dv8_deprecation_warnings=1
endif endif
# arm specific flags. # 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) ifeq ($(armv7), false)
GYPFLAGS += -Darmv7=0 GYPFLAGS += -Darm_version=6
else else
ifeq ($(armv7), true) ifeq ($(armv7), true)
GYPFLAGS += -Darmv7=1 GYPFLAGS += -Darm_version=7
endif
endif endif
endif endif
# vfp2=off. Deprecated, use armfpu= # vfp2=off. Deprecated, use armfpu=

6
build/android.gypi
View File

@ -146,7 +146,7 @@
'-Wl,--icf=safe', '-Wl,--icf=safe',
], ],
}], }],
['target_arch=="arm" and armv7==1', { ['target_arch=="arm" and arm_version==7', {
'cflags': [ 'cflags': [
'-march=armv7-a', '-march=armv7-a',
'-mtune=cortex-a8', '-mtune=cortex-a8',
@ -164,12 +164,12 @@
'-I<(android_stlport_include)', '-I<(android_stlport_include)',
], ],
'conditions': [ 'conditions': [
['target_arch=="arm" and armv7==1', { ['target_arch=="arm" and arm_version==7', {
'ldflags': [ 'ldflags': [
'-L<(android_stlport_libs)/armeabi-v7a', '-L<(android_stlport_libs)/armeabi-v7a',
], ],
}], }],
['target_arch=="arm" and armv7==0', { ['target_arch=="arm" and arm_version < 7', {
'ldflags': [ 'ldflags': [
'-L<(android_stlport_libs)/armeabi', '-L<(android_stlport_libs)/armeabi',
], ],

2
build/standalone.gypi
View File

@ -117,7 +117,7 @@
}], }],
], ],
# Default ARM variable settings. # Default ARM variable settings.
'armv7%': 'default', 'arm_version%': 'default',
'arm_neon%': 0, 'arm_neon%': 0,
'arm_fpu%': 'vfpv3', 'arm_fpu%': 'vfpv3',
'arm_float_abi%': 'default', 'arm_float_abi%': 'default',

12
build/toolchain.gypi
View File

@ -92,10 +92,10 @@
'conditions': [ 'conditions': [
['armcompiler=="yes"', { ['armcompiler=="yes"', {
'conditions': [ 'conditions': [
[ 'armv7==1', { [ 'arm_version==7', {
'cflags': ['-march=armv7-a',], 'cflags': ['-march=armv7-a',],
}], }],
[ 'armv7==1 or armv7=="default"', { [ 'arm_version==7 or arm_version=="default"', {
'conditions': [ 'conditions': [
[ 'arm_neon==1', { [ 'arm_neon==1', {
'cflags': ['-mfpu=neon',], 'cflags': ['-mfpu=neon',],
@ -127,7 +127,7 @@
}, { }, {
# armcompiler=="no" # armcompiler=="no"
'conditions': [ 'conditions': [
[ 'armv7==1 or armv7=="default"', { [ 'arm_version==7 or arm_version=="default"', {
'defines': [ 'defines': [
'CAN_USE_ARMV7_INSTRUCTIONS=1', 'CAN_USE_ARMV7_INSTRUCTIONS=1',
], ],
@ -180,10 +180,10 @@
'conditions': [ 'conditions': [
['armcompiler=="yes"', { ['armcompiler=="yes"', {
'conditions': [ 'conditions': [
[ 'armv7==1', { [ 'arm_version==7', {
'cflags': ['-march=armv7-a',], 'cflags': ['-march=armv7-a',],
}], }],
[ 'armv7==1 or armv7=="default"', { [ 'arm_version==7 or arm_version=="default"', {
'conditions': [ 'conditions': [
[ 'arm_neon==1', { [ 'arm_neon==1', {
'cflags': ['-mfpu=neon',], 'cflags': ['-mfpu=neon',],
@ -215,7 +215,7 @@
}, { }, {
# armcompiler=="no" # armcompiler=="no"
'conditions': [ 'conditions': [
[ 'armv7==1 or armv7=="default"', { [ 'arm_version==7 or arm_version=="default"', {
'defines': [ 'defines': [
'CAN_USE_ARMV7_INSTRUCTIONS=1', 'CAN_USE_ARMV7_INSTRUCTIONS=1',
], ],