diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-14 17:31:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-14 17:31:40 -0800 |
| commit | b2bbff7cbaa24dbe0973b46fa78a73e1c9393c92 (patch) | |
| tree | 917c6681882c2027eb7a602c67c63d29be2f2085 /core/combo/TARGET_linux-arm.mk | |
| parent | 14a2d978df6969973c264c2e5a8591fcd18b7896 (diff) | |
| parent | ea852f6ed3e9f251eaef4f041fbc0b09229ac924 (diff) | |
| download | build-b2bbff7cbaa24dbe0973b46fa78a73e1c9393c92.zip build-b2bbff7cbaa24dbe0973b46fa78a73e1c9393c92.tar.gz build-b2bbff7cbaa24dbe0973b46fa78a73e1c9393c92.tar.bz2 | |
am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
Remove more always-true ARCH_ARM_HAVE_ flags.
Diffstat (limited to 'core/combo/TARGET_linux-arm.mk')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 278d5ee..172ed00 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -73,18 +73,11 @@ TARGET_arm_CFLAGS := -O2 \ -fstrict-aliasing \ -funswitch-loops -# Modules can choose to compile some source as thumb. As -# non-thumb enabled targets are supported, this is treated -# as a 'hint'. If thumb is not enabled, these files are just -# compiled as ARM. -ifeq ($(ARCH_ARM_HAVE_THUMB_SUPPORT),true) +# Modules can choose to compile some source as thumb. TARGET_thumb_CFLAGS := -mthumb \ -Os \ -fomit-frame-pointer \ -fno-strict-aliasing -else -TARGET_thumb_CFLAGS := $(TARGET_arm_CFLAGS) -endif # Set FORCE_ARM_DEBUGGING to "true" in your buildspec.mk # or in your environment to force a full arm build, even for @@ -144,15 +137,7 @@ TARGET_GLOBAL_LDFLAGS += \ -Wl,--icf=safe \ $(arch_variant_ldflags) -# We only need thumb interworking in cases where thumb support -# is available in the architecture, and just to be sure, (and -# since sometimes thumb-interwork appears to be default), we -# specifically disable when thumb support is unavailable. -ifeq ($(ARCH_ARM_HAVE_THUMB_SUPPORT),true) TARGET_GLOBAL_CFLAGS += -mthumb-interwork -else -TARGET_GLOBAL_CFLAGS += -mno-thumb-interwork -endif TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden |