diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 11:30:58 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-08 12:32:21 +0200 |
| commit | 5ccd3bd992cf668b5a6fa1713da7b443a35e2930 (patch) | |
| tree | e55f60946cf658ab396a1a0401833b67e71de196 /arch/arm/vdso | |
| parent | ARM: 8867/1: vdso: pass --be8 to linker if necessary (diff) | |
| parent | ARM: 8863/1: stm32: select ARM errata 814220 (diff) | |
| download | linux-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.tar.xz linux-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.zip | |
Merge branches 'fixes' and 'misc'
Fix up the conflict between "VDSO: Drop implicit common-page-size
linker flag" and "vdso: pass --be8 to linker if necessary"
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/vdso')
| -rw-r--r-- | arch/arm/vdso/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile index 1f5ec9741e6d..ca85df247775 100644 --- a/arch/arm/vdso/Makefile +++ b/arch/arm/vdso/Makefile @@ -12,8 +12,7 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING 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 $(ldflags-y) \ + -z max-page-size=4096 -nostdlib -shared $(ldflags-y) \ $(call ld-option, --hash-style=sysv) \ $(call ld-option, --build-id) \ -T |