diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-26 11:06:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-26 11:06:14 +0100 |
| commit | 29cd85557d8b8b3d068b5c29fdd9a0fa9ca7ef7a (patch) | |
| tree | 3f048414d5cb54d3c88af9de7dd4426f66d93ddb /arch/x86/Makefile | |
| parent | c2cfc23f79676a9857a5a48911011bd56e23fd46 (diff) | |
| parent | d206a76d7d2726f3b096037f2079ce0bd3ba329b (diff) | |
Merge tag 'v6.8-rc6' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Makefile')
| -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..da8f3caf2781 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 |