diff options
| author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2013-12-08 19:28:36 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2013-12-08 19:28:36 +0000 |
| commit | 186f1cb206e5f9d6f1896d43f0d9586528edaf54 (patch) | |
| tree | aa862d925a9b5b26c0704a6d3cd1a72b9292be27 /src/client/windows/build | |
| parent | Add include guards and avoid redefinition of false/true in convert_UTF. (diff) | |
| download | breakpad-186f1cb206e5f9d6f1896d43f0d9586528edaf54.tar.xz | |
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
Diffstat (limited to 'src/client/windows/build')
| -rw-r--r-- | src/client/windows/build/common.gypi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client/windows/build/common.gypi b/src/client/windows/build/common.gypi index 60a24582..eac64d25 100644 --- a/src/client/windows/build/common.gypi +++ b/src/client/windows/build/common.gypi @@ -123,10 +123,10 @@ # Python version. 'python_ver%': '2.5', - # Set ARM-v7 compilation flags - 'armv7%': 0, + # Determine ARM compilation flags. + '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, # The system root for cross-compiles. Default: none. @@ -148,7 +148,7 @@ 'fastbuild%': '<(fastbuild)', 'linux_fpic%': '<(linux_fpic)', 'python_ver%': '<(python_ver)', - 'armv7%': '<(armv7)', + 'arm_version%': '<(arm_version)', 'arm_neon%': '<(arm_neon)', 'sysroot%': '<(sysroot)', 'disable_sse2%': '<(disable_sse2)', @@ -254,7 +254,7 @@ # Set Thumb compilation flags. '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_fpu%': 'vfpv3', @@ -980,7 +980,7 @@ '-Wa,-mimplicit-it=thumb', ] }], - ['armv7==1', { + ['arm_version==7', { 'cflags': [ '-march=armv7-a', '-mtune=cortex-a8', |