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

Commit c3974e3f authored by Ben Cheng's avatar Ben Cheng Committed by Android (Google) Code Review
Browse files

Merge "Prepare upcoming GCC 4.8 release."

parents d0f3373f ccd8e608

core/combo/TARGET_linux-arm.mk

+3 −2
Original line number Diff line number Diff line
@@ -113,9 +113,10 @@ TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) 
# We cannot turn it off blindly since the option is not available

# in gcc-4.4.x.  We also want to disable sincos optimization globally

# by turning off the builtin sin function.

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-builtin-sin \

			-fno-strict-volatile-bitfields

			-fno-strict-volatile-bitfields \

			-Wno-unused-parameter -Wno-unused-but-set-parameter

endif



# This is to avoid the dreaded warning compiler message:

core/llvm_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -97,9 +97,11 @@ TARGET_thumb_CLANG_CFLAGS += $(filter-out $(CLANG_CONFIG_UNKNOWN_CFLAGS),$(TARGE 
$(call clang-flags-subst,-march=armv5te,-march=armv5t)

$(call clang-flags-subst,-march=armv5e,-march=armv5)



# clang does not support -Wno-psabi and -Wno-unused-but-set-variable

# clang does not support -Wno-psabi, -Wno-unused-but-set-variable, and

# -Wno-unused-but-set-parameter

$(call clang-flags-subst,-Wno-psabi,)

$(call clang-flags-subst,-Wno-unused-but-set-variable,)

$(call clang-flags-subst,-Wno-unused-but-set-parameter,)



# clang does not support -mcpu=cortex-a15 yet - fall back to armv7-a for now

$(call clang-flags-subst,-mcpu=cortex-a15,-march=armv7-a)

envsetup.sh

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ function set_stuff_for_environment() 
    set_sequence_number



    export ANDROID_BUILD_TOP=$(gettop)

    # With this environment variable new GCC can apply colors to warnings/errors

    export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'

}



function set_sequence_number()