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

Commit d9e69500 authored by Alistair Strachan's avatar Alistair Strachan
Browse files

Revert "x86: Force asm-goto" 



This reverts commit e501ce95.

This change broke building the x86_64 kernel with clang. The kernel
still builds and works fine without asm-goto support. Revert this
change to unblock testing clang kernels on cuttlefish.

Bug: 120440614
Change-Id: Ib32498acc0596264f8cd15de0b603579dd643dd7
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>
parent 084a9b8f

Makefile

+6 −7
Original line number Diff line number Diff line
@@ -508,13 +508,6 @@ export RETPOLINE_VDSO_CFLAGS 
KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

  CC_HAVE_ASM_GOTO := 1

  KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

  KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif



# The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.

# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.

# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
@@ -674,6 +667,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \ 
# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)



# check for 'asm goto'

ifeq ($(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif



include scripts/Makefile.kcov

include scripts/Makefile.gcc-plugins

arch/x86/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -175,10 +175,6 @@ ifdef CONFIG_FUNCTION_GRAPH_TRACER 
  endif

endif



ifndef CC_HAVE_ASM_GOTO

  $(error Compiler lacks asm-goto support.)

endif



ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1)

	# This compiler flag is not supported by Clang:

	KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)