1
0
Fork 0

Kbuild fixes for v5.2

- remove unused cc-ldoption
 
  - do not check the name uniquness of builtin modules to avoid
    false positives
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJc4z7tAAoJED2LAQed4NsGBhYP/020sGIlv8sqoB0SrAhyqo3z
 C8jKBQpTeyM2Y0lDYIfQMv2Rz/HpSoAiPndBgJpLV+hO2IdCH0V/hzCENuBwwSnd
 Sl+P4ZAH55u1al/b2ZvFZ0C2bWYLmztdIXhleqyXL6xsyi8FL7gMjXVZBKur5p0R
 4GxSB+BmFTvqw5C8AYjgeZPZlZ83skWXf7BCH0wZuPmyxkB8DokjLpx9hTk2F2cP
 aCEOQyVSZrKQQsBvLh/90jGc4thUVpEdojVwGtmL9bNZfHnApCpeYHl1xUyOoRaZ
 LZro7sDb7FZrMvOQDdnteDfCWXbK2PR3Lx4PHZqfpPOPJ/8enijzW4tcC1D/4sE/
 9UKOG3p7kJsRYA6KtMuDM8gznvAwYqUw4o3OHAnrS2sevKxVgZ5anKAgNNx2fuMN
 VBPjRhAB0IRaiJ+VtoQ7cPFkPusMcVablfPG/ST6TKCBrPHUl9LkI7FTfkRIKY/4
 SAjd60UxJ+f5fbbezBSJ09kwe2fiyL7sQ2Q+XWPS1axu3p5Bv+Hpl4pmSRliIlTE
 ACynzab8mgiKf464C6Q1vGqNFBnOraxadidwxWsr+sxhIiXjEjYBfvEpx1EDCKr3
 Ay/KNO+J9c6Vi9w/tRzuBHylj+hW92oGAy7EUVoRHTOz0HhfGlnRYsOyuz72auxk
 ziydYe+H/hdUnhfoi3rP
 =8Y8m
 -----END PGP SIGNATURE-----

Merge tag 'kbuild-fixes-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - remove unused cc-ldoption

 - do not check the name uniquness of builtin modules to avoid false
   positives

* tag 'kbuild-fixes-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: do not check name uniqueness of builtin modules
  kbuild: drop support for cc-ldoption
hifive-unleashed-5.2
Linus Torvalds 2019-05-20 17:22:17 -07:00
commit 5bdd9ad875
3 changed files with 3 additions and 22 deletions

View File

@ -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

View File

@ -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))

View File

@ -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
}