From: Huang, Tao Date: Fri, 20 May 2016 07:19:12 +0000 (+0800) Subject: rk: force enable asm goto on android gcc X-Git-Tag: firefly_0821_release~2626 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b16fac932cd8fa6461a6a650ace148a9ebd3f0f5;p=firefly-linux-kernel-4.4.55.git rk: force enable asm goto on android gcc It seems than android gcc can't pass gcc-goto.sh check, but asm goto work. So let's active it. Change-Id: I75310af8cf3746a5c110daa564e96eeb1d7f1070 Signed-off-by: Huang, Tao --- diff --git a/Makefile b/Makefile index 55b42efbad87..f038afe11040 100644 --- a/Makefile +++ b/Makefile @@ -786,6 +786,11 @@ KBUILD_ARFLAGS := $(call ar-option,D) ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO +else ifneq ($(findstring aarch64-linux-android, $(CROSS_COMPILE)),) +# It seems than android gcc can't pass gcc-goto.sh check, but asm goto work. +# So let's active it. + KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO endif include scripts/Makefile.kasan