summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-21 11:11:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-21 11:11:30 -0700
commita4c33bbb660b89fc7f21957386fb3a0b38e43f98 (patch)
tree6305b323314d5e3d0768878b0a4a2cf5cd67a2b4
parent0728f6c3cab107f0aab2c8ded1292dd2cc41a228 (diff)
parentc5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d (diff)
downloadlwn-a4c33bbb660b89fc7f21957386fb3a0b38e43f98.tar.gz
lwn-a4c33bbb660b89fc7f21957386fb3a0b38e43f98.zip
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
-rw-r--r--arch/arm/vdso/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile
index fadf554d9391..1f5ec9741e6d 100644
--- a/arch/arm/vdso/Makefile
+++ b/arch/arm/vdso/Makefile
@@ -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