diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-09-18 00:14:44 +0200 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-09-18 00:15:41 +0200 |
| commit | 008eaabb15c2fcef3a35c53600cf8719185b1c22 (patch) | |
| tree | b2a67f949f100d12c8e3a2dd5ee2bef4766e6ee3 | |
| parent | da8e15c6f4db50687dea3cd6ccad17becf1c1d22 (diff) | |
| download | gcc-patches-008eaabb15c2fcef3a35c53600cf8719185b1c22.tar.gz | |
Adapt patches to work with Linaro GCC snapshot 5.2-2015.09
Change-Id: I04eb435075f9ba162efd5c3f7b56a75683e73af8
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | 5.2/0018-use-android-specs-on-aarch64.patch | 5 | ||||
| -rw-r--r-- | 5.2/0019-aarch64-bionic-linker-path.patch | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/5.2/0018-use-android-specs-on-aarch64.patch b/5.2/0018-use-android-specs-on-aarch64.patch index 59f1b81..a09fbc1 100644 --- a/5.2/0018-use-android-specs-on-aarch64.patch +++ b/5.2/0018-use-android-specs-on-aarch64.patch @@ -1,11 +1,14 @@ --- gcc-5.0/gcc/config/aarch64/aarch64-linux.h.omv~ 2015-01-03 13:09:08.974824478 +0100 +++ gcc-5.0/gcc/config/aarch64/aarch64-linux.h 2015-01-03 13:14:47.643252366 +0100 -@@ -22,12 +22,26 @@ +@@ -22,15 +22,29 @@ #define GCC_AARCH64_LINUX_H #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" +#define BIONIC_DYNAMIC_LINKER "/system/bin/linker64" + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" + #undef ASAN_CC1_SPEC #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" diff --git a/5.2/0019-aarch64-bionic-linker-path.patch b/5.2/0019-aarch64-bionic-linker-path.patch index 1e0ea5a..c4fb252 100644 --- a/5.2/0019-aarch64-bionic-linker-path.patch +++ b/5.2/0019-aarch64-bionic-linker-path.patch @@ -7,4 +7,4 @@ +#undef BIONIC_DYNAMIC_LINKER #define BIONIC_DYNAMIC_LINKER "/system/bin/linker64" - #undef ASAN_CC1_SPEC + #undef MUSL_DYNAMIC_LINKER |