Commit a0c04bd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.11' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Fix RPM package build error caused by an incorrect locale setup

 - Mark modules.weakdep as ghost in RPM package

 - Fix the odd combination of -S and -c in stack protector scripts,
   which is an error with the latest Clang

* tag 'kbuild-fixes-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: Fix '-S -c' in x86 stack protector scripts
  kbuild: rpm-pkg: ghost modules.weakdep file
  kbuild: rpm-pkg: Fix C locale setup
parents 017fa3e8 3415b10a

scripts/gcc-x86_32-has-stack-protector.sh

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
# -mstack-protector-guard-reg, added by

# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81708



echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m32 -O0 -fstack-protector -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard - -o - 2> /dev/null | grep -q "%fs"
 
echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -m32 -O0 -fstack-protector -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard - -o - 2> /dev/null | grep -q "%fs"

scripts/gcc-x86_64-has-stack-protector.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m64 -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 
echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -m64 -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"

scripts/package/kernel.spec

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA 
	echo "/lib/modules/%{KERNELRELEASE}"



	for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \

					devname softdep symbols symbols.bin; do

				devname softdep symbols symbols.bin weakdep; do

		echo "%ghost /lib/modules/%{KERNELRELEASE}/modules.${x}"

	done

scripts/package/mkspec

+1 −1
Original line number Diff line number Diff line
@@ -50,6 +50,6 @@ fi 
cat << EOF



%changelog

* $(LC_ALL=C; date +'%a %b %d %Y') ${name} <${email}>

* $(LC_ALL=C date +'%a %b %d %Y') ${name} <${email}>

- Custom built Linux kernel.

EOF