mirror of https://github.com/OpenIPC/firmware.git
126 lines
5.0 KiB
Diff
126 lines
5.0 KiB
Diff
diff -drupN a/scripts/Kbuild.include b/scripts/Kbuild.include
|
|
--- a/scripts/Kbuild.include 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/scripts/Kbuild.include 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -109,6 +109,11 @@ as-option = $(call try-run,\
|
|
as-instr = $(call try-run,\
|
|
printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
|
|
|
|
+# __cc-option
|
|
+# Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586)
|
|
+__cc-option = $(call try-run,\
|
|
+ $(1) -Werror $(2) $(3) -c -x c /dev/null -o "$$TMP",$(3),$(4))
|
|
+
|
|
# Do not attempt to build with gcc plugins during cc-option tests.
|
|
# (And this uses delayed resolution so the flags will be up to date.)
|
|
CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
|
|
@@ -116,13 +121,18 @@ CC_OPTION_CFLAGS = $(filter-out $(GCC_PL
|
|
# cc-option
|
|
# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
|
|
|
|
-cc-option = $(call try-run,\
|
|
- $(CC) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))
|
|
+cc-option = $(call __cc-option, $(CC),\
|
|
+ $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS),$(1),$(2))
|
|
+
|
|
+# hostcc-option
|
|
+# Usage: cflags-y += $(call hostcc-option,-march=winchip-c6,-march=i586)
|
|
+hostcc-option = $(call __cc-option, $(HOSTCC),\
|
|
+ $(HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2))
|
|
|
|
# cc-option-yn
|
|
# Usage: flag := $(call cc-option-yn,-march=winchip-c6)
|
|
cc-option-yn = $(call try-run,\
|
|
- $(CC) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
|
|
+ $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
|
|
|
|
# cc-option-align
|
|
# Prefix align with either -falign or -malign
|
|
@@ -132,12 +142,43 @@ cc-option-align = $(subst -functions=0,,
|
|
# cc-disable-warning
|
|
# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
|
|
cc-disable-warning = $(call try-run,\
|
|
- $(CC) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
|
|
+ $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
|
|
|
|
# cc-name
|
|
# Expands to either gcc or clang
|
|
cc-name = $(shell $(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
|
|
|
|
+# __cc-version
|
|
+# Returns compiler version
|
|
+__cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/$(cc-name)-version.sh $(CC))
|
|
+
|
|
+# __cc-fullversion
|
|
+# Returns full compiler version
|
|
+__cc-fullversion = $(shell $(CONFIG_SHELL) \
|
|
+ $(srctree)/scripts/$(cc-name)-version.sh -p $(CC))
|
|
+
|
|
+# __cc-ifversion
|
|
+# Matches compiler name and version
|
|
+# Usage: EXTRA_CFLAGS += $(call cc-if-name-version, gcc, -lt, 0402, -O1)
|
|
+__cc-ifversion = $(shell [ $(cc-name) = $(1) ] && [ $(__cc-version) $(2) $(3) ] && echo $(4) || echo $(5))
|
|
+
|
|
+# __cc-if-fullversion
|
|
+# Matches compiler name and full version
|
|
+# Usage: EXTRA_CFLAGS += $(call cc-if-name-fullversion, gcc, -lt, 040502, -O1)
|
|
+__cc-if-fullversion = $(shell [ $(cc-name) = $(1) ] && [ $(__cc-fullversion) $(2) $(3) ] && echo $(4) || echo $(5))
|
|
+
|
|
+# gcc-ifversion
|
|
+gcc-ifversion = $(call __cc-ifversion, gcc, $(1), $(2), $(3), $(4))
|
|
+
|
|
+# gcc-if-fullversion
|
|
+gcc-if-fullversion = (call __cc-if-fullversion, gcc, $(1), $(2), $(3), $(4))
|
|
+
|
|
+# clang-ifversion
|
|
+clang-ifversion = $(call __cc-ifversion, clang, $(1), $(2), $(3), $(4))
|
|
+
|
|
+# clang-if-fullversion
|
|
+clang-if-fullversion = (call __cc-if-fullversion, clang, $(1), $(2), $(3), $(4))
|
|
+
|
|
# cc-version
|
|
cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
|
|
|
|
@@ -145,9 +186,9 @@ cc-version = $(shell $(CONFIG_SHELL) $(s
|
|
cc-fullversion = $(shell $(CONFIG_SHELL) \
|
|
$(srctree)/scripts/gcc-version.sh -p $(CC))
|
|
|
|
-# cc-ifversion
|
|
-# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
|
|
-cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
|
|
+# backward compatibility
|
|
+cc-ifversion = $(gcc-ifversion)
|
|
+cc-if-fullversion = $(gcc-if-fullversion)
|
|
|
|
# cc-ldoption
|
|
# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
|
|
@@ -164,6 +205,10 @@ ld-option = $(call try-run,\
|
|
# Important: no spaces around options
|
|
ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2))
|
|
|
|
+# ld-name
|
|
+# Expands to either bfd or gold
|
|
+ld-name = $(shell $(LD) -v 2>&1 | grep -q "GNU gold" && echo gold || echo bfd)
|
|
+
|
|
# ld-version
|
|
# Note this is mainly for HJ Lu's 3 number binutil versions
|
|
ld-version = $(shell $(LD) --version | $(srctree)/scripts/ld-version.sh)
|
|
@@ -172,6 +217,18 @@ ld-version = $(shell $(LD) --version | $
|
|
# Usage: $(call ld-ifversion, -ge, 22252, y)
|
|
ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3) || echo $(4))
|
|
|
|
+# __ld-ifversion
|
|
+# Usage: $(call __ld-ifversion, gold, -ge, 112000000, y)
|
|
+__ld-ifversion = $(shell [ $(ld-name) = $(1) ] && [ $(ld-version) $(2) $(3) ] && echo $(4) || echo $(5))
|
|
+
|
|
+# bfd-ifversion
|
|
+# Usage: $(call bfd-ifversion, -ge, 227000000, y)
|
|
+bfd-ifversion = $(call __ld-ifversion, bfd, $(1), $(2), $(3), $(4))
|
|
+
|
|
+# gold-ifversion
|
|
+# Usage: $(call gold-ifversion, -ge, 112000000, y)
|
|
+gold-ifversion = $(call __ld-ifversion, gold, $(1), $(2), $(3), $(4))
|
|
+
|
|
######
|
|
|
|
###
|