summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2015-04-23 13:54:52 +0200
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2015-04-23 13:54:52 +0200
commitbd19e3649c3c2b46401f313cc11e40ee00029e84 (patch)
treeeec5dbb72a52b9a0b610fcc3e43645d256e0e83e
parent76d839e64ba87c0941e128a67f44afed86994300 (diff)
downloadgcc-patches-bd19e3649c3c2b46401f313cc11e40ee00029e84.tar.gz
Fix Android crt*.o filenames for aarch64 on gcc 5.1+
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--5.1/0018-use-android-specs-on-aarch64.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/5.1/0018-use-android-specs-on-aarch64.patch b/5.1/0018-use-android-specs-on-aarch64.patch
index 2a8107d..bb7eac5 100644
--- a/5.1/0018-use-android-specs-on-aarch64.patch
+++ b/5.1/0018-use-android-specs-on-aarch64.patch
@@ -1,6 +1,6 @@
--- 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,30 @@
+@@ -22,12 +22,26 @@
#define GCC_AARCH64_LINUX_H
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
@@ -25,14 +25,10 @@
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC \
+ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_STARTFILE_SPEC, ANDROID_STARTFILE_SPEC)
-+
-+#undef ENDFILE_SPEC
-+#define ENDFILE_SPEC \
-+ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
#define CPP_SPEC "%{pthread:-D_REENTRANT}"
-@@ -49,7 +67,8 @@
+@@ -49,7 +63,8 @@
" %{mfix-cortex-a53-835769:--fix-cortex-a53-835769}"
#endif
@@ -42,13 +38,17 @@
CA53_ERR_835769_SPEC
#define GNU_USER_TARGET_MATHFILE_SPEC \
-@@ -64,6 +83,7 @@
+@@ -64,6 +79,11 @@
do \
{ \
GNU_USER_TARGET_OS_CPP_BUILTINS(); \
+ ANDROID_TARGET_OS_CPP_BUILTINS(); \
} \
while (0)
++
++#undef ENDFILE_SPEC
++#define ENDFILE_SPEC \
++ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
--- gcc-5.0/gcc/config.gcc.omv~ 2015-01-03 13:07:48.517754552 +0100
+++ gcc-5.0/gcc/config.gcc 2015-01-03 13:09:02.768126472 +0100