Skip to contentSkip to conversation

x86: Include thunk_$(BITS).o only if CONFIG_PREEMPTION=y

PATCH New H.J. Lu 1 participant 1 message Dec 28, 2020

Subsystems (2)
lore
Share & tools
lore

H.J. Lu

author
#0 lore raw

PATCH 1/1 x86: Include thunk_$(BITS).o only if CONFIG_PREEMPTION=y

The newer GNU assembler may not generate a symbol table for the empty object file. Since objtool doesn't like empty object files without symbol table and thunk_$(BITS).o doesn't have a symbol table when CONFIG_PREEMPTION isn't enabled, include thunk_$(BITS).o only if CONFIG_PREEMPTION is enabled.

---
 arch/x86/entry/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/entry/Makefile +2 -1
index 08bf95dbc911..83c98dae74a6 100644
@@ -21,12 +21,13 @@ CFLAGS_syscall_64.o		+= $(call cc-option,-Wno-override-init,)
 CFLAGS_syscall_32.o		+= $(call cc-option,-Wno-override-init,)
 CFLAGS_syscall_x32.o		+= $(call cc-option,-Wno-override-init,)
 
-obj-y				:= entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o
+obj-y				:= entry_$(BITS).o syscall_$(BITS).o
 obj-y				+= common.o
 
 obj-y				+= vdso/
 obj-y				+= vsyscall/
 
+obj-$(CONFIG_PREEMPTION)	+= thunk_$(BITS).o
 obj-$(CONFIG_IA32_EMULATION)	+= entry_64_compat.o syscall_32.o
 obj-$(CONFIG_X86_X32_ABI)	+= syscall_x32.o
 
Signature · 1 line
2.29.2