Skip to content
This repository was archived by the owner on Apr 13, 2024. It is now read-only.

Commit 3314801

Browse files
Merge pull request #180 from nathanchance/remove-arm-path
patches: llvm-8: arm: Fix conflicts in common-page-size patch
2 parents 45ab584 + 2cfdf72 commit 3314801

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1-
From 7a48e7c758761495f446ddd8eea8bc30208e69e9 Mon Sep 17 00:00:00 2001
1+
From bb256de5a47f34814c4eddcb349c6f4963ceb3d0 Mon Sep 17 00:00:00 2001
22
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
55

66
GNU linker's -z common-page-size's default value is based on the target
77
architecture. arch/arm/vdso/Makefile sets it to the architecture
88
default, which is implicit and redundant. Drop it.
99

1010
Link: https://lkml.kernel.org/r/20181206191231.192355-1-ndesaulniers@google.com
11+
1112
Acked-by: Arnd Bergmann <arnd@arndb.de>
1213
Acked-by: Nathan Lynch <nathanl@linux.ibm.com>
1314
Suggested-by: Nathan Chancellor <natechancellor@gmail.com>
1415
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>
1617
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
1718
---
1819
arch/arm/vdso/Makefile | 3 +--
1920
1 file changed, 1 insertion(+), 2 deletions(-)
2021

2122
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile
22-
index fadf554d9391..db1754438267 100644
23+
index 1f5ec9741e6d..ca85df247775 100644
2324
--- a/arch/arm/vdso/Makefile
2425
+++ 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
2727

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 \
2930
- -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) \
3233
$(call ld-option, --hash-style=sysv) \
3334
$(call ld-option, --build-id) \
3435
-T
3536
--
36-
2.22.0.rc3
37+
2.22.0
3738

0 commit comments

Comments
 (0)