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

Commit 3c2b2d94 authored by David S. Miller's avatar David S. Miller
Browse files

sparc: Really use linker with LDFLAGS. 



Rather than funneling through CC.

Also, use --hash-style=both just like other VDSO architectures and
glibc do.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5615edcc

arch/sparc/vdso/Makefile

+7 −9
Original line number Diff line number Diff line
@@ -33,10 +33,8 @@ targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so) 


CPPFLAGS_vdso.lds += -P -C



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

			-Wl,--no-undefined \

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

			$(DISABLE_LTO)

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

			-z max-page-size=8192 -z common-page-size=8192



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

	$(call if_changed,vdso)
@@ -74,7 +72,7 @@ $(obj)/%.so: $(obj)/%.so.dbg 
	$(call if_changed,objcopy)



CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)

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

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



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

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

#

quiet_cmd_vdso = VDSO    $@

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

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

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

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

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



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

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

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

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

GCOV_PROFILE := n



#