Commit 36bf9da2 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Thomas Gleixner
Browse files

x86/build: Remove jump label quirk for GCC older than 4.5.2 



Commit cafa0010 ("Raise the minimum required gcc version to 4.6")
bumped the minimum GCC version to 4.6 for all architectures.

Remove the workaround code.

It was the only user of cc-if-fullversion.  Remove the macro as well.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: linux-kbuild@vger.kernel.org
Link: https://lkml.kernel.org/r/1535348714-25457-1-git-send-email-yamada.masahiro@socionext.com
parent e3a5dc08

arch/x86/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -179,18 +179,6 @@ ifndef CC_HAVE_ASM_GOTO 
  $(error Compiler lacks asm-goto support.)

endif



#

# Jump labels need '-maccumulate-outgoing-args' for gcc < 4.5.2 to prevent a

# GCC bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226).  There's no way

# to test for this bug at compile-time because the test case needs to execute,

# which is a no-go for cross compilers.  So check the GCC version instead.

#

ifdef CONFIG_JUMP_LABEL

  ifneq ($(ACCUMULATE_OUTGOING_ARGS), 1)

	ACCUMULATE_OUTGOING_ARGS = $(call cc-if-fullversion, -lt, 040502, 1)

  endif

endif



ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1)

	# This compiler flag is not supported by Clang:

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

scripts/Kbuild.include

+0 −4
Original line number Diff line number Diff line
@@ -153,10 +153,6 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ 
# Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)

cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))



# cc-if-fullversion

# Usage:  EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)

cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4))



# cc-ldoption

# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)

cc-ldoption = $(call try-run,\

CRA Git | Maintained and supported by SUSTech CRA and CCSE