mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 01:51:18 +00:00
1612c382ff
- an old(er) binutils build fix, - a new-GCC build fix, - and a kexec boot environment fix. Signed-off-by: Ingo Molnar <mingo@kernel.org> -----BEGIN PGP SIGNATURE----- iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmLuv4URHG1pbmdvQGtl cm5lbC5vcmcACgkQEnMQ0APhK1it3A//fGfrzHGtjHraiBy0H1Erlz0dUa4q/r6v xPQVFYteGwL/Ynv2rOJreiEXNhv9pRv0cXXNS5iWh8IcP8IUNw6rfYmgr1aDpXdq WkbJvwouX6JSo3g/CMekKd+Mf7NgA4O1OO65E80c4WJnxgd0AYvr6IxJRLR7X0C7 HwU6p6PmP/RHWT5T170z6sgun+6QdDEYSwFYOhxawL+BJaKEBYnQ0LLQgJazhe7z uVxONQA9OdWBwMzvZygbOuTzc990jCHRPYgvYQhSZ8CUPuVzaa7IB9KUXh6lu93d a7nqM3GlWTowBULY6Xq7gWJaJ7jsVWXjqo8SWVlb6YwoLR9dgGSW5bCGV0rOA6o3 yPjQhIQ9H4NOx126wPcCRBh3osGFjqlWUXVw7W51aNgd7hCvlbpWWmREeI/Pm1Ew WBjQqpf4l0S+0On5FEFaF7swAG3b6KSNSKw7WBmpmTNt5eWOot0EtnjGW75ATpxM +j2fj/1MIZ/Zp+wYaNK/+abM4sXHhYvU9gpPdJslRr+r2AVjy9gCZ/0zuUIVytwC gOdV9KhqzlXPJCTm+py7fBt2qM2P5rKT2HBQYiJwIquB2njI0kjUBOJWXsGQ/F/y hGd6WY8uDuwzzg5JtyfwE6fPGovxL5GCc4w9CYz0DbP0txPYuhMOdkHtAYLyraAj wtdalMt3cT8= =EM/G -----END PGP SIGNATURE----- Merge tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Ingo Molnar: - build fix for old(er) binutils - build fix for new GCC - kexec boot environment fix * tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/entry: Build thunk_$(BITS) only if CONFIG_PREEMPTION=y x86/numa: Use cpumask_available instead of hardcoded NULL check x86/bus_lock: Don't assume the init value of DEBUGCTLMSR.BUS_LOCK_DETECT to be zero
51 lines
1.3 KiB
Makefile
51 lines
1.3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
#
|
|
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
BITS := 32
|
|
else
|
|
BITS := 64
|
|
endif
|
|
|
|
obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \
|
|
ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \
|
|
stub_$(BITS).o stub_segv.o \
|
|
sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \
|
|
mem_$(BITS).o subarch.o os-$(OS)/
|
|
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
|
|
obj-y += checksum_32.o syscalls_32.o
|
|
obj-$(CONFIG_ELF_CORE) += elfcore.o
|
|
|
|
subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
|
|
subarch-y += ../lib/cmpxchg8b_emu.o ../lib/atomic64_386_32.o
|
|
subarch-y += ../kernel/sys_ia32.o
|
|
|
|
else
|
|
|
|
obj-y += syscalls_64.o vdso/
|
|
|
|
subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o \
|
|
../lib/memmove_64.o ../lib/memset_64.o
|
|
subarch-$(CONFIG_PREEMPTION) += ../entry/thunk_64.o
|
|
|
|
endif
|
|
|
|
subarch-$(CONFIG_MODULES) += ../kernel/module.o
|
|
|
|
USER_OBJS := bugs_$(BITS).o ptrace_user.o fault.o
|
|
|
|
$(obj)/user-offsets.s: c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) \
|
|
-Iarch/x86/include/generated
|
|
targets += user-offsets.s
|
|
|
|
include/generated/user_constants.h: $(obj)/user-offsets.s FORCE
|
|
$(call filechk,offsets,__USER_CONSTANT_H__)
|
|
|
|
UNPROFILE_OBJS := stub_segv.o
|
|
CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING)
|
|
|
|
include arch/um/scripts/Makefile.rules
|