diff options
| author | Ben Cheng <bccheng@google.com> | 2013-09-17 09:35:14 -0700 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2013-09-17 09:35:14 -0700 |
| commit | 670b8d2251cdd8d0854916774958cfdc263d07d8 (patch) | |
| tree | c3890ca850137d4ceba63304b48613f22d89e41c | |
| parent | 840975df32147fdf0797734d805d332e462ddcac (diff) | |
| download | build-670b8d2251cdd8d0854916774958cfdc263d07d8.zip build-670b8d2251cdd8d0854916774958cfdc263d07d8.tar.gz build-670b8d2251cdd8d0854916774958cfdc263d07d8.tar.bz2 | |
Switch ARM platform toolchain to GCC 4.8.
Change-Id: If08cfb2b9d86c08d3b658470440242b0af4d9916
| -rw-r--r-- | CleanSpec.mk | 6 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index a424cb7..5adb42d 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -200,6 +200,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DMService.apk) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/SprintDM.apk) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/omadm) +# GCC 4.8 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.o) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 8d012f3..5fdcce8 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -35,7 +35,7 @@ TARGET_ARCH_VARIANT := armv5te endif ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -TARGET_GCC_VERSION := 4.7 +TARGET_GCC_VERSION := 4.8 else TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif @@ -114,7 +114,7 @@ TARGET_GLOBAL_CFLAGS += \ # into no-op in some builds while mesg is defined earlier. So we explicitly # disable "-Wunused-but-set-variable" here. ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8, $(TARGET_GCC_VERSION)),) -TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \ +TARGET_GLOBAL_CFLAGS += -fno-builtin-sin \ -fno-strict-volatile-bitfields endif |