Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f78b47b authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Switch AOSP X86/MIPS compiler to gcc4.8"

parents de9b1835 8baaca5f

core/combo/TARGET_linux-mips.mk

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ TARGET_ARCH_VARIANT := mips32r2-fp 
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
@@ -99,7 +99,7 @@ TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) 
# This warning causes dalvik not to build with gcc 4.6+ and -Werror.

# We cannot turn it off blindly since the option is not available

# in gcc-4.4.x.

ifneq ($(filter 4.6 4.6.% 4.7 4.7.%, $(TARGET_GCC_VERSION)),)

ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8, $(TARGET_GCC_VERSION)),)

TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable \

                        -fno-strict-volatile-bitfields

endif

core/combo/TARGET_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ TARGET_ARCH_VARIANT := x86 
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