Skip to content

Commit ab30c7f

Browse files
committed
Merge tag 'kbuild-fixes-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada: - Fix CONFIG_TRIM_UNUSED_KSYMS build for ppc64 - Use pkg-config for scripts/sign-file.c CFLAGS * tag 'kbuild-fixes-v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: scripts: set proper OpenSSL include dir also for sign-file sparc: remove wrong comment from arch/sparc/include/asm/Kbuild kbuild: fix CONFIG_TRIM_UNUSED_KSYMS build for ppc64
2 parents c553021 + fe968c4 commit ab30c7f

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

arch/sparc/include/asm/Kbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
# User exported sparc header files
3-
42
generated-y += syscall_table_32.h
53
generated-y += syscall_table_64.h
64
generated-y += syscall_table_c32.h

scripts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
1717

1818
HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
1919
HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
20+
HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS)
2021
HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)
2122
HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
2223
HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)

scripts/gen_autoksyms.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ EOT
4343
sed 's/ko$/mod/' $modlist |
4444
xargs -n1 sed -n -e '2{s/ /\n/g;/^$/!p;}' -- |
4545
cat - "$ksym_wl" |
46+
# Remove the dot prefix for ppc64; symbol names with a dot (.) hold entry
47+
# point addresses.
48+
sed -e 's/^\.//' |
4649
sort -u |
4750
sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file"
4851

0 commit comments

Comments
 (0)