summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2022-09-19 10:08:28 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-12-07 06:08:21 +0900
commitbb976b658da9cfb23fd6a9395b390cba5ed3278b (patch)
tree9db79a502d67cbfd3a89d1b1ed638fa40337cbf8 /arch/s390
parent99e0c016b59e2267583553d1363b75537b1e516f (diff)
Makefile.compiler: replace cc-ifversion with compiler-specific macros
commit 88b61e3bff93f99712718db785b4aa0c1165f35c upstream. cc-ifversion is GCC specific. Replace it with compiler specific variants. Update the users of cc-ifversion to use these new macros. Link: https://github.com/ClangBuiltLinux/linux/issues/350 Link: https://lore.kernel.org/llvm/CAGG=3QWSAUakO42kubrCap8fp-gm1ERJJAYXTnP1iHk_wrH=BQ@mail.gmail.com/ Suggested-by: Bill Wendling <morbo@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> [nathan: Backport to 5.10 and eliminate instances of cc-ifversion that did not exist upstream when this change was original created] Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 9680c6c9a710..b7d751ece891 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -35,8 +35,8 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
ifdef CONFIG_CC_IS_GCC
- ifeq ($(call cc-ifversion, -ge, 1200, y), y)
- ifeq ($(call cc-ifversion, -lt, 1300, y), y)
+ ifeq ($(call gcc-min-version, 120000), y)
+ ifneq ($(call gcc-min-version, 130000), y)
KBUILD_CFLAGS += $(call cc-disable-warning, array-bounds)
KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, array-bounds)
endif