|
1 |
| -From 7a48e7c758761495f446ddd8eea8bc30208e69e9 Mon Sep 17 00:00:00 2001 |
| 1 | +From bb256de5a47f34814c4eddcb349c6f4963ceb3d0 Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Nick Desaulniers <ndesaulniers@google.com>
|
3 |
| -Date: Mon, 10 Dec 2018 14:31:32 -0800 |
4 |
| -Subject: [PATCH] ARM: VDSO: Drop implicit common-page-size linker flag |
| 3 | +Date: Wed, 24 Apr 2019 19:37:46 +0100 |
| 4 | +Subject: [PATCH] ARM: 8860/1: VDSO: Drop implicit common-page-size linker flag |
5 | 5 |
|
6 | 6 | GNU linker's -z common-page-size's default value is based on the target
|
7 | 7 | architecture. arch/arm/vdso/Makefile sets it to the architecture
|
8 | 8 | default, which is implicit and redundant. Drop it.
|
9 | 9 |
|
10 | 10 | Link: https://lkml.kernel.org/r/20181206191231.192355-1-ndesaulniers@google.com
|
| 11 | + |
11 | 12 | Acked-by: Arnd Bergmann <arnd@arndb.de>
|
12 | 13 | Acked-by: Nathan Lynch <nathanl@linux.ibm.com>
|
13 | 14 | Suggested-by: Nathan Chancellor <natechancellor@gmail.com>
|
14 | 15 | Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
|
15 |
| -(am from https://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=8860/1) |
| 16 | +Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
16 | 17 | Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
|
17 | 18 | ---
|
18 | 19 | arch/arm/vdso/Makefile | 3 +--
|
19 | 20 | 1 file changed, 1 insertion(+), 2 deletions(-)
|
20 | 21 |
|
21 | 22 | diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile
|
22 |
| -index fadf554d9391..db1754438267 100644 |
| 23 | +index 1f5ec9741e6d..ca85df247775 100644 |
23 | 24 | --- a/arch/arm/vdso/Makefile
|
24 | 25 | +++ b/arch/arm/vdso/Makefile
|
25 |
| -@@ -11,8 +11,7 @@ ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector |
26 |
| - ccflags-y += -DDISABLE_BRANCH_PROFILING |
| 26 | +@@ -12,8 +12,7 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING |
27 | 27 |
|
28 |
| - ldflags-y = -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ |
| 28 | + ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8 |
| 29 | + ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ |
29 | 30 | - -z max-page-size=4096 -z common-page-size=4096 \
|
30 |
| -- -nostdlib -shared \ |
31 |
| -+ -z max-page-size=4096 -nostdlib -shared \ |
| 31 | +- -nostdlib -shared $(ldflags-y) \ |
| 32 | ++ -z max-page-size=4096 -nostdlib -shared $(ldflags-y) \ |
32 | 33 | $(call ld-option, --hash-style=sysv) \
|
33 | 34 | $(call ld-option, --build-id) \
|
34 | 35 | -T
|
35 | 36 | --
|
36 |
| -2.22.0.rc3 |
| 37 | +2.22.0 |
37 | 38 |
|
0 commit comments