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=
'-Wl,--icf=safe',
],
}],
- ['target_arch=="arm" and armv7==1', {
+ ['target_arch=="arm" and arm_version==7', {
'cflags': [
'-march=armv7-a',
'-mtune=cortex-a8',
'-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',
],
}],
],
# Default ARM variable settings.
- 'armv7%': 'default',
+ 'arm_version%': 'default',
'arm_neon%': 0,
'arm_fpu%': 'vfpv3',
'arm_float_abi%': 'default',
'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',],
}, {
# armcompiler=="no"
'conditions': [
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7 or arm_version=="default"', {
'defines': [
'CAN_USE_ARMV7_INSTRUCTIONS=1',
],
'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',],
}, {
# armcompiler=="no"
'conditions': [
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7 or arm_version=="default"', {
'defines': [
'CAN_USE_ARMV7_INSTRUCTIONS=1',
],