Skip to content

Commit 133d9c5

Browse files
committed
Merge tag 'x86_vdso_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 vdso updates from Borislav Petkov: "Remove -nostdlib compiler flag now that the vDSO uses the linker instead of the compiler driver to link files" * tag 'x86_vdso_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/purgatory: Remove -nostdlib compiler flag x86/vdso: Remove -nostdlib compiler flag
2 parents 3c6d405 + 9102fa3 commit 133d9c5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/entry/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ $(obj)/vdso32.so.dbg: $(obj)/vdso32/vdso32.lds $(vobjs32) FORCE
172172
# The DSO images are built using a special linker script.
173173
#
174174
quiet_cmd_vdso = VDSO $@
175-
cmd_vdso = $(LD) -nostdlib -o $@ \
175+
cmd_vdso = $(LD) -o $@ \
176176
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
177177
-T $(filter %.lds,$^) $(filter %.o,$^) && \
178178
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'

arch/x86/purgatory/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ CFLAGS_sha256.o := -D__DISABLE_EXPORTS
1616

1717
# When linking purgatory.ro with -r unresolved symbols are not checked,
1818
# also link a purgatory.chk binary without -r to check for unresolved symbols.
19-
PURGATORY_LDFLAGS := -e purgatory_start -nostdlib -z nodefaultlib
19+
PURGATORY_LDFLAGS := -e purgatory_start -z nodefaultlib
2020
LDFLAGS_purgatory.ro := -r $(PURGATORY_LDFLAGS)
2121
LDFLAGS_purgatory.chk := $(PURGATORY_LDFLAGS)
2222
targets += purgatory.ro purgatory.chk

0 commit comments

Comments
 (0)