am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang"

* commit '1e9b11f4b15982896a85cc70c25f6632395b4e29':
  Allow -mcpu=cortex-a15 for clang
This commit is contained in:
Chih-hung Hsieh 2015-03-27 23:26:15 +00:00 committed by Android Git Automerger
commit 29b415aa77

View file

@ -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