Merge tag 'kbuild-fixes-v5.2' of... (5bdd9ad8) · Commits · 戴 / test

Documentation/kbuild/makefiles.txt

+0 −14

Original line number	Diff line number	Diff line
		@@ -437,20 +437,6 @@ more details, with real examples.
		The second argument is optional, and if supplied will be used
		if first argument is not supported.

		cc-ldoption
		cc-ldoption is used to check if $(CC) when used to link object files
		supports the given option. An optional second option may be
		specified if first option are not supported.

		Example:
		#arch/x86/kernel/Makefile
		vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)

		In the above example, vsyscall-flags will be assigned the option
		-Wl$(comma)--hash-style=sysv if it is supported by $(CC).
		The second argument is optional, and if supplied will be used
		if first argument is not supported.

		as-instr
		as-instr checks if the assembler reports a specific instruction
		and then outputs either option1 or option2

+0 −5

Original line number	Diff line number	Diff line
		@@ -138,11 +138,6 @@ cc-disable-warning = $(call try-run,\
		# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
		cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) \|\| echo $(4))

		# cc-ldoption
		# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
		cc-ldoption = $(call try-run,\
		$(CC) $(1) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))

		# ld-option
		# Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y)
		ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3))

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,10 +6,10 @@ set -e
		# Check uniqueness of module names
		check_same_name_modules()
		{
		for m in $(sed 's:.*/::' modules.order modules.builtin \| sort \| uniq -d)
		for m in $(sed 's:.*/::' modules.order \| sort \| uniq -d)
		do
		echo "warning: same basename if the following are built as modules:" >&2
		sed "/\/$m/!d;s:^kernel/: :" modules.order modules.builtin >&2
		echo "warning: same module names found:" >&2
		sed -n "/\/$m/s:^kernel/: :p" modules.order >&2
		done
		}