Skip to content

Commit 36bf9da

Browse files
masahir0yKAGA-KOKO
authored andcommitted
x86/build: Remove jump label quirk for GCC older than 4.5.2
Commit cafa001 ("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: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Thomas 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
1 parent e3a5dc0 commit 36bf9da

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

arch/x86/Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,18 +179,6 @@ ifndef CC_HAVE_ASM_GOTO
179179
$(error Compiler lacks asm-goto support.)
180180
endif
181181

182-
#
183-
# Jump labels need '-maccumulate-outgoing-args' for gcc < 4.5.2 to prevent a
184-
# GCC bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226). There's no way
185-
# to test for this bug at compile-time because the test case needs to execute,
186-
# which is a no-go for cross compilers. So check the GCC version instead.
187-
#
188-
ifdef CONFIG_JUMP_LABEL
189-
ifneq ($(ACCUMULATE_OUTGOING_ARGS), 1)
190-
ACCUMULATE_OUTGOING_ARGS = $(call cc-if-fullversion, -lt, 040502, 1)
191-
endif
192-
endif
193-
194182
ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1)
195183
# This compiler flag is not supported by Clang:
196184
KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)

scripts/Kbuild.include

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
153153
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
154154
cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
155155

156-
# cc-if-fullversion
157-
# Usage: EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)
158-
cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4))
159-
160156
# cc-ldoption
161157
# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
162158
cc-ldoption = $(call try-run,\

0 commit comments

Comments
 (0)