diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2016-01-15 17:33:43 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2016-01-15 19:45:41 +0000 |
| commit | ea54a9767ba4ffa60ad1b98c8427ba51585459fa (patch) | |
| tree | 8858b343f10d3eec0f56391c9e21d2cb184de374 | |
| parent | 305560c428ec2bb7d2cf80b363c906566e4f6e6c (diff) | |
| download | gcc-patches-ea54a9767ba4ffa60ad1b98c8427ba51585459fa.tar.gz | |
Rebase to 5.3-2016.01
Change-Id: I182261ba30de03a4260ecf455596c7f437c32c68
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | 5.3/0018-use-android-specs-on-aarch64.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/5.3/0018-use-android-specs-on-aarch64.patch b/5.3/0018-use-android-specs-on-aarch64.patch index 0464f0a..a7cc5b6 100644 --- a/5.3/0018-use-android-specs-on-aarch64.patch +++ b/5.3/0018-use-android-specs-on-aarch64.patch @@ -1,31 +1,31 @@ --- 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,27 @@ - #define GCC_AARCH64_LINUX_H +@@ -26,11 +26,27 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" +#undef BIONIC_DYNAMIC_LINKER +#define BIONIC_DYNAMIC_LINKER "/system/bin/linker64" - ++ #undef ASAN_CC1_SPEC #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" #undef CC1_SPEC -#define CC1_SPEC GNU_USER_TARGET_CC1_SPEC ASAN_CC1_SPEC -+#define CC1_SPEC LINUX_OR_ANDROID_CC(GNU_USER_TARGET_CC1_SPEC, \ ++#define CC1_SPEC LINUX_OR_ANDROID_CC(GNU_USER_TARGET_CC1_SPEC, \ + GNU_USER_TARGET_CC1_SPEC " " ANDROID_CC1_SPEC("-fPIC")) ASAN_CC1_SPEC + +#define CC1PLUS_SPEC \ -+ LINUX_OR_ANDROID_CC ("", ANDROID_CC1PLUS_SPEC) ++ LINUX_OR_ANDROID_CC ("", ANDROID_CC1PLUS_SPEC) + +#undef LIB_SPEC +#define LIB_SPEC \ -+ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC, \ ++ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC, \ + GNU_USER_TARGET_NO_PTHREADS_LIB_SPEC " " ANDROID_LIB_SPEC) + +#undef STARTFILE_SPEC +#define STARTFILE_SPEC \ -+ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_STARTFILE_SPEC, ANDROID_STARTFILE_SPEC) ++ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_STARTFILE_SPEC, ANDROID_STARTFILE_SPEC) #define CPP_SPEC "%{pthread:-D_REENTRANT}" |