diff options
| author | Chih-hung Hsieh <chh@google.com> | 2015-03-27 23:49:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 23:49:27 +0000 |
| commit | cdac639599b8e40e1882a8469827a398fcd74f4f (patch) | |
| tree | fce80c9441a432ca2bc62fc77c9299b41656977b /core/clang | |
| parent | cd9ecc02586d42364b9741c0d5bda0a926993d30 (diff) | |
| parent | 29b415aa7781b27fc4948307acc5961cd702dac2 (diff) | |
| download | build-cdac639599b8e40e1882a8469827a398fcd74f4f.zip build-cdac639599b8e40e1882a8469827a398fcd74f4f.tar.gz build-cdac639599b8e40e1882a8469827a398fcd74f4f.tar.bz2 | |
am 29b415aa: am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"
* commit '29b415aa7781b27fc4948307acc5961cd702dac2':
Allow -mcpu=cortex-a15 for clang
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/arm.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/clang/arm.mk b/core/clang/arm.mk index f76a182..bf31f51 100644 --- a/core/clang/arm.mk +++ b/core/clang/arm.mk @@ -40,6 +40,5 @@ CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \ define subst-clang-incompatible-arm-flags $(subst -march=armv5te,-march=armv5t,\ $(subst -march=armv5e,-march=armv5,\ - $(subst -mcpu=cortex-a15,-march=armv7-a,\ - $(1)))) + $(1))) endef |