diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-01 11:57:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-01 11:57:42 -0800 |
| commit | a412682659b3832ac6f1a301e1c147027926f605 (patch) | |
| tree | 47d55181c537bc9a3b119d1d02b662bc2c1eac4d /arch/x86 | |
| parent | cfdf0c09a68b6026c0b214b484f1dab60b8b78ba (diff) | |
| parent | bfef491df67022c56aab3b831044f8d259f9441f (diff) | |
| download | linux-stable-a412682659b3832ac6f1a301e1c147027926f605.tar.gz linux-stable-a412682659b3832ac6f1a301e1c147027926f605.tar.bz2 linux-stable-a412682659b3832ac6f1a301e1c147027926f605.zip | |
Merge tag 'kbuild-fixes-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Fix UML build with clang-18 and newer
- Avoid using the alias attribute in host programs
- Replace tabs with spaces when followed by conditionals for future GNU
Make versions
- Fix rpm-pkg for the systemd-provided kernel-install tool
- Fix the undefined behavior in Kconfig for a 'int' symbol used in a
conditional
* tag 'kbuild-fixes-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: initialize sym->curr.tri to 'no' for all symbol types again
kbuild: rpm-pkg: simplify installkernel %post
kbuild: Replace tabs with spaces when followed by conditionals
modpost: avoid using the alias attribute
kbuild: fix W= flags in the help message
modpost: Add '.ltext' and '.ltext.*' to TEXT_SECTIONS
um: Fix adding '-no-pie' for clang
kbuild: defconf: use SRCARCH to find merged configs
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1a068de12a56..2264db14a25d 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -112,13 +112,13 @@ ifeq ($(CONFIG_X86_32),y) # temporary until string.h is fixed KBUILD_CFLAGS += -ffreestanding - ifeq ($(CONFIG_STACKPROTECTOR),y) - ifeq ($(CONFIG_SMP),y) + ifeq ($(CONFIG_STACKPROTECTOR),y) + ifeq ($(CONFIG_SMP),y) KBUILD_CFLAGS += -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard - else + else KBUILD_CFLAGS += -mstack-protector-guard=global - endif - endif + endif + endif else BITS := 64 UTS_MACHINE := x86_64 |