Merge "Prepare upcoming GCC 4.8 release."
This commit is contained in:
commit
750e0c0882
3 changed files with 8 additions and 3 deletions
|
@ -113,9 +113,10 @@ TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
|
||||||
# We cannot turn it off blindly since the option is not available
|
# 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
|
# in gcc-4.4.x. We also want to disable sincos optimization globally
|
||||||
# by turning off the builtin sin function.
|
# 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 \
|
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
|
endif
|
||||||
|
|
||||||
# This is to avoid the dreaded warning compiler message:
|
# This is to avoid the dreaded warning compiler message:
|
||||||
|
|
|
@ -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=armv5te,-march=armv5t)
|
||||||
$(call clang-flags-subst,-march=armv5e,-march=armv5)
|
$(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-psabi,)
|
||||||
$(call clang-flags-subst,-Wno-unused-but-set-variable,)
|
$(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
|
# 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)
|
$(call clang-flags-subst,-mcpu=cortex-a15,-march=armv7-a)
|
||||||
|
|
|
@ -205,6 +205,8 @@ function set_stuff_for_environment()
|
||||||
set_sequence_number
|
set_sequence_number
|
||||||
|
|
||||||
export ANDROID_BUILD_TOP=$(gettop)
|
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()
|
function set_sequence_number()
|
||||||
|
|
Loading…
Reference in a new issue