Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40c03e85 authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman
Browse files

Revert "x86: vdso: Use $LD instead of $CC to link" 



This reverts commit 94c0c4f0.

The commit message in the 4.9 stable tree did not have a reference to
the upstream commit id.

Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ca6c34ad

arch/x86/entry/vdso/Makefile

+13 −9
Original line number Diff line number Diff line
@@ -47,8 +47,10 @@ targets += $(vdso_img_sodbg) 


export CPPFLAGS_vdso.lds += -P -C



VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \

			-z max-page-size=4096 -z common-page-size=4096

VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \

			-Wl,--no-undefined \

			-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \

			$(DISABLE_LTO)



$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE

	$(call if_changed,vdso)
@@ -94,8 +96,10 @@ CFLAGS_REMOVE_vvar.o = -pg 
#



CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds)

VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \

			   -z max-page-size=4096 -z common-page-size=4096

VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \

			   -Wl,-soname=linux-vdso.so.1 \

			   -Wl,-z,max-page-size=4096 \

			   -Wl,-z,common-page-size=4096



# 64-bit objects to re-brand as x32

vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y))
@@ -123,7 +127,7 @@ $(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE 
	$(call if_changed,vdso)



CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)

VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1

VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-m,elf_i386 -Wl,-soname=linux-gate.so.1



# This makes sure the $(obj) subdirectory exists even though vdso32/

# is not a kbuild sub-make subdirectory.
@@ -161,13 +165,13 @@ $(obj)/vdso32.so.dbg: FORCE \ 
# The DSO images are built using a special linker script.

#

quiet_cmd_vdso = VDSO    $@

      cmd_vdso = $(LD) -nostdlib -o $@ \

      cmd_vdso = $(CC) -nostdlib -o $@ \

		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \

		       -T $(filter %.lds,$^) $(filter %.o,$^) && \

		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \

		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'



VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \

	$(call ld-option, --build-id) -Bsymbolic

VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \

	$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)

GCOV_PROFILE := n



#