diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-27 01:45:14 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-08-30 05:37:08 -0400 |
| commit | 36bf9da2913054c218337d8cd7cb11bddc1fafb0 (patch) | |
| tree | b6263f320a758aeb5b6817d3ffcffe186235b0be | |
| parent | e3a5dc08715abba646324fd8456282bd77798e9c (diff) | |
x86/build: Remove jump label quirk for GCC older than 4.5.2
Commit cafa0010cd51 ("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
| -rw-r--r-- | arch/x86/Makefile | 12 | ||||
| -rw-r--r-- | scripts/Kbuild.include | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 94859241bc3e..8fc8f94ef5f5 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
| @@ -179,18 +179,6 @@ ifndef CC_HAVE_ASM_GOTO | |||
| 179 | $(error Compiler lacks asm-goto support.) | 179 | $(error Compiler lacks asm-goto support.) |
| 180 | endif | 180 | endif |
| 181 | 181 | ||
| 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 | |||
| 194 | ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1) | 182 | ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1) |
| 195 | # This compiler flag is not supported by Clang: | 183 | # This compiler flag is not supported by Clang: |
| 196 | KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,) | 184 | KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,) |
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index c75413d05a63..ce53639a864a 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
| @@ -153,10 +153,6 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ | |||
| 153 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) | 153 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) |
| 154 | cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4)) | 154 | cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4)) |
| 155 | 155 | ||
| 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 | |||
| 160 | # cc-ldoption | 156 | # cc-ldoption |
| 161 | # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) | 157 | # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) |
| 162 | cc-ldoption = $(call try-run,\ | 158 | cc-ldoption = $(call try-run,\ |