Reviewers: Jakob,
Message:
@Jakob: does this look OK to you?
(Are try jobs supposed to work for v8 patches? I'm confused why this patch
fails to apply, the logs say that build/android.gypi doesn't exist, but it
does
in my checkout).
Description:
switch armv7 setting to arm_version=7 in v8 gyp files
BUG=234135
Please review this at https://codereview.chromium.org/98543008/
SVN Base: git://github.com/v8/v8.git@master
Affected files (+8, -12 lines):
M build/android.gypi
M build/standalone.gypi
M build/toolchain.gypi
Index: build/android.gypi
diff --git a/build/android.gypi b/build/android.gypi
index
ca097255bbb5ce4deb018d5d95743af22af67b7c..aeb0eab7eb4a6427dba678a0b510495e0f136967
100644
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -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',
],
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index
1f91f9eb2560246d9ce7ccfaea634915c250ff46..028ae4c16ecdc1bcd7314b9b130f49b6fd5f4f9b
100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -117,7 +117,7 @@
}],
],
# Default ARM variable settings.
- 'armv7%': 'default',
+ 'arm_version%': '7',
'arm_neon%': 0,
'arm_fpu%': 'vfpv3',
'arm_float_abi%': 'default',
Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index
99f357a965a743863ce6c53bb77f8e137d6f8582..f902fd4d63e9a7dfb03e9ac9781e24bf072d5195
100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -92,10 +92,8 @@
'conditions': [
['armcompiler=="yes"', {
'conditions': [
- [ 'armv7==1', {
+ [ 'arm_version==7', {
'cflags': ['-march=armv7-a',],
- }],
- [ 'armv7==1 or armv7=="default"', {
'conditions': [
[ 'arm_neon==1', {
'cflags': ['-mfpu=neon',],
@@ -127,7 +125,7 @@
}, {
# armcompiler=="no"
'conditions': [
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7', {
'defines': [
'CAN_USE_ARMV7_INSTRUCTIONS=1',
],
@@ -180,10 +178,8 @@
'conditions': [
['armcompiler=="yes"', {
'conditions': [
- [ 'armv7==1', {
+ [ 'arm_version==7', {
'cflags': ['-march=armv7-a',],
- }],
- [ 'armv7==1 or armv7=="default"', {
'conditions': [
[ 'arm_neon==1', {
'cflags': ['-mfpu=neon',],
@@ -215,7 +211,7 @@
}, {
# armcompiler=="no"
'conditions': [
- [ 'armv7==1 or armv7=="default"', {
+ [ 'arm_version==7', {
'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.
