Skip to content

Commit cb7f9fc

Browse files
committed
Merge tag 'kbuild-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux
Pull Kbuild fixes from Nathan Chancellor: - Formally adopt Kconfig in MAINTAINERS - Fix install-extmod-build for more O= paths - Align end of .modinfo to fix Authenticode calculation in EDK2 - Restore dynamic check for '-fsanitize=kernel-memory' in CONFIG_HAVE_KMSAN_COMPILER to ensure backend target has support for it - Initialize locale in menuconfig and nconfig to fix UTF-8 terminals that may not support VT100 ACS by default like PuTTY * tag 'kbuild-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux: kconfig/nconf: Initialize the default locale at startup kconfig/mconf: Initialize the default locale at startup KMSAN: Restore dynamic check for '-fsanitize=kernel-memory' kbuild: align modinfo section for Secureboot Authenticode EDK2 compat kbuild: install-extmod-build: Fix when given dir outside the build dir MAINTAINERS: Update Kconfig section
2 parents ba36dd5 + 43c2931 commit cb7f9fc

File tree

6 files changed

+13
-4
lines changed

6 files changed

+13
-4
lines changed

MAINTAINERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13425,9 +13425,12 @@ F: mm/kasan/
1342513425
F: scripts/Makefile.kasan
1342613426

1342713427
KCONFIG
13428+
M: Nathan Chancellor <nathan@kernel.org>
13429+
M: Nicolas Schier <nsc@kernel.org>
1342813430
L: linux-kbuild@vger.kernel.org
13429-
S: Orphan
13431+
S: Odd Fixes
1343013432
Q: https://patchwork.kernel.org/project/linux-kbuild/list/
13433+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git
1343113434
F: Documentation/kbuild/kconfig*
1343213435
F: scripts/Kconfig.include
1343313436
F: scripts/kconfig/

include/asm-generic/vmlinux.lds.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG)
832832

833833
/* Required sections not related to debugging. */
834834
#define ELF_DETAILS \
835-
.modinfo : { *(.modinfo) } \
835+
.modinfo : { *(.modinfo) . = ALIGN(8); } \
836836
.comment 0 : { *(.comment) } \
837837
.symtab 0 : { *(.symtab) } \
838838
.strtab 0 : { *(.strtab) } \

lib/Kconfig.kmsan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ config HAVE_ARCH_KMSAN
33
bool
44

55
config HAVE_KMSAN_COMPILER
6-
def_bool CC_IS_CLANG
6+
def_bool $(cc-option,-fsanitize=kernel-memory)
77

88
config KMSAN
99
bool "KMSAN: detector of uninitialized values use"

scripts/kconfig/mconf.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <errno.h>
1313
#include <fcntl.h>
1414
#include <limits.h>
15+
#include <locale.h>
1516
#include <stdarg.h>
1617
#include <stdlib.h>
1718
#include <string.h>
@@ -931,6 +932,8 @@ int main(int ac, char **av)
931932

932933
signal(SIGINT, sig_handler);
933934

935+
setlocale(LC_ALL, "");
936+
934937
if (ac > 1 && strcmp(av[1], "-s") == 0) {
935938
silent = 1;
936939
/* Silence conf_read() until the real callback is set up */

scripts/kconfig/nconf.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#ifndef _GNU_SOURCE
88
#define _GNU_SOURCE
99
#endif
10+
#include <locale.h>
1011
#include <string.h>
1112
#include <strings.h>
1213
#include <stdlib.h>
@@ -1478,6 +1479,8 @@ int main(int ac, char **av)
14781479
int lines, columns;
14791480
char *mode;
14801481

1482+
setlocale(LC_ALL, "");
1483+
14811484
if (ac > 1 && strcmp(av[1], "-s") == 0) {
14821485
/* Silence conf_read() until the real callback is set up */
14831486
conf_set_message_callback(NULL);

scripts/package/install-extmod-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ "${CC}" != "${HOSTCC}" ]; then
6363
# Clear VPATH and srcroot because the source files reside in the output
6464
# directory.
6565
# shellcheck disable=SC2016 # $(MAKE) and $(build) will be expanded by Make
66-
"${MAKE}" run-command KBUILD_RUN_COMMAND='+$(MAKE) HOSTCC='"${CC}"' VPATH= srcroot=. $(build)='"$(realpath --relative-base=. "${destdir}")"/scripts
66+
"${MAKE}" run-command KBUILD_RUN_COMMAND='+$(MAKE) HOSTCC='"${CC}"' VPATH= srcroot=. $(build)='"$(realpath --relative-to=. "${destdir}")"/scripts
6767

6868
rm -f "${destdir}/scripts/Kbuild"
6969
fi

0 commit comments

Comments
 (0)