Switch armv7 setting to arm_version==7.

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

BUG=chromium:234135

Review URL: https://breakpad.appspot.com/844002/


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1246 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
mark@chromium.org 2013-12-08 19:28:36 +00:00
parent 616400ed2f
commit 186f1cb206

View file

@ -123,10 +123,10 @@
# Python version. # Python version.
'python_ver%': '2.5', 'python_ver%': '2.5',
# Set ARM-v7 compilation flags # Determine ARM compilation flags.
'armv7%': 0, 'arm_version%': 7,
# Set Neon compilation flags (only meaningful if armv7==1). # Set Neon compilation flags (only meaningful if arm_version==7).
'arm_neon%': 1, 'arm_neon%': 1,
# The system root for cross-compiles. Default: none. # The system root for cross-compiles. Default: none.
@ -148,7 +148,7 @@
'fastbuild%': '<(fastbuild)', 'fastbuild%': '<(fastbuild)',
'linux_fpic%': '<(linux_fpic)', 'linux_fpic%': '<(linux_fpic)',
'python_ver%': '<(python_ver)', 'python_ver%': '<(python_ver)',
'armv7%': '<(armv7)', 'arm_version%': '<(arm_version)',
'arm_neon%': '<(arm_neon)', 'arm_neon%': '<(arm_neon)',
'sysroot%': '<(sysroot)', 'sysroot%': '<(sysroot)',
'disable_sse2%': '<(disable_sse2)', 'disable_sse2%': '<(disable_sse2)',
@ -254,7 +254,7 @@
# Set Thumb compilation flags. # Set Thumb compilation flags.
'arm_thumb%': 0, 'arm_thumb%': 0,
# Set ARM fpu compilation flags (only meaningful if armv7==1 and # Set ARM fpu compilation flags (only meaningful if arm_version==7 and
# arm_neon==0). # arm_neon==0).
'arm_fpu%': 'vfpv3', 'arm_fpu%': 'vfpv3',
@ -980,7 +980,7 @@
'-Wa,-mimplicit-it=thumb', '-Wa,-mimplicit-it=thumb',
] ]
}], }],
['armv7==1', { ['arm_version==7', {
'cflags': [ 'cflags': [
'-march=armv7-a', '-march=armv7-a',
'-mtune=cortex-a8', '-mtune=cortex-a8',