aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9
diff options
context:
space:
mode:
authorRong Xu <xur@google.com>2014-10-31 21:12:19 -0700
committerRong Xu <xur@google.com>2014-10-31 22:28:11 -0700
commit39dbe572beead93798002c03b4897afaf018cd04 (patch)
treecb0e824708c3a895358a60fd5516484c080b177e /gcc-4.9
parent29098ff058814235fb39d00b7496b7f8345ed3eb (diff)
downloadtoolchain_gcc-39dbe572beead93798002c03b4897afaf018cd04.tar.gz
toolchain_gcc-39dbe572beead93798002c03b4897afaf018cd04.tar.bz2
toolchain_gcc-39dbe572beead93798002c03b4897afaf018cd04.zip
[4.9] Android fix for Cortex-A53 erratum 835769 workaround
Android does not use the LINK_SPEC in aarch64-linux.h. Rather, it picks up LINUX_TARGET_LINK_SPEC. Move the SPEC change in r216979 to LINUX_TRAGET_LINK_SPEC. Change-Id: I6c39522efcfe067a8a66397954b386f5d104dc02
Diffstat (limited to 'gcc-4.9')
-rw-r--r--gcc-4.9/gcc/config/aarch64/aarch64-linux.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc-4.9/gcc/config/aarch64/aarch64-linux.h b/gcc-4.9/gcc/config/aarch64/aarch64-linux.h
index 09ae1cfc0..b77becd23 100644
--- a/gcc-4.9/gcc/config/aarch64/aarch64-linux.h
+++ b/gcc-4.9/gcc/config/aarch64/aarch64-linux.h
@@ -30,7 +30,7 @@
#define CPP_SPEC "%{pthread:-D_REENTRANT}"
-#define LINUX_TARGET_LINK_SPEC "%{h*} \
+#define LINUX_TARGET_LINK_SPEC0 "%{h*} \
%{static:-Bstatic} \
%{shared:-shared} \
%{symbolic:-Bsymbolic} \
@@ -48,8 +48,9 @@
" %{mfix-cortex-a53-835769:--fix-cortex-a53-835769}"
#endif
-#define LINK_SPEC LINUX_TARGET_LINK_SPEC \
- CA53_ERR_835769_SPEC
+#define LINUX_TARGET_LINK_SPEC LINUX_TARGET_LINK_SPEC0 CA53_ERR_835769_SPEC
+
+#define LINK_SPEC LINUX_TARGET_LINK_SPEC
#define TARGET_OS_CPP_BUILTINS() \
do \