tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
fork
Configure Feed
Select the types of activity you want to include in your feed.
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 vdso update from Thomas Gleixner:
"Use LD to link the VDSO libs instead of indirecting trough CC which
causes build failures with Clang"
* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: vdso: Use $LD instead of $CC to link
+9
-13
+9
-13
arch/x86/entry/vdso/Makefile
+9
-13
arch/x86/entry/vdso/Makefile
···
46
46
47
47
CPPFLAGS_vdso.lds += -P -C
48
48
49
-
VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
50
-
-Wl,--no-undefined \
51
-
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \
52
-
$(DISABLE_LTO)
49
+
VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \
50
+
-z max-page-size=4096 -z common-page-size=4096
53
51
54
52
$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
55
53
$(call if_changed,vdso)
···
91
93
#
92
94
93
95
CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds)
94
-
VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \
95
-
-Wl,-soname=linux-vdso.so.1 \
96
-
-Wl,-z,max-page-size=4096 \
97
-
-Wl,-z,common-page-size=4096
96
+
VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \
97
+
-z max-page-size=4096 -z common-page-size=4096
98
98
99
99
# x32-rebranded versions
100
100
vobjx32s-y := $(vobjs-y:.o=-x32.o)
···
117
121
$(call if_changed,vdso)
118
122
119
123
CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
120
-
VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-m,elf_i386 -Wl,-soname=linux-gate.so.1
124
+
VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1
121
125
122
126
targets += vdso32/vdso32.lds
123
127
targets += vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o
···
151
155
# The DSO images are built using a special linker script.
152
156
#
153
157
quiet_cmd_vdso = VDSO $@
154
-
cmd_vdso = $(CC) -nostdlib -o $@ \
158
+
cmd_vdso = $(LD) -nostdlib -o $@ \
155
159
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
156
-
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
160
+
-T $(filter %.lds,$^) $(filter %.o,$^) && \
157
161
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
158
162
159
-
VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \
160
-
$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
163
+
VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
164
+
$(call ld-option, --build-id) -Bsymbolic
161
165
GCOV_PROFILE := n
162
166
163
167
#