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

Commit a4c33bbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fix from Russell King:
 "Just one ARM fix this time around for Jason Donenfeld, fixing a
  problem with the VDSO generation on big endian"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8867/1: vdso: pass --be8 to linker if necessary
parents 0728f6c3 c5d0e49e

arch/arm/vdso/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -10,9 +10,10 @@ obj-vdso := $(addprefix $(obj)/, $(obj-vdso)) 
ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector

ccflags-y += -DDISABLE_BRANCH_PROFILING



ldflags-y = -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \

ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8

ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \

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

	    -nostdlib -shared \

	    -nostdlib -shared $(ldflags-y) \

	    $(call ld-option, --hash-style=sysv) \

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

	    -T