aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-12-12 15:00:42 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-12-12 15:00:43 -0800
commit92da119a900b1f73fb7f23fbe1c044a237986741 (patch)
tree7bd4f9da05d9dcc4eff08e8305feaa29a5c5799b /gcc-4.6
parent1e4edc8addf7fc21d821e64cc81d85315561bcd9 (diff)
parente42abc641966570528522d61ba625e926e979ac7 (diff)
downloadtoolchain_gcc-92da119a900b1f73fb7f23fbe1c044a237986741.zip
toolchain_gcc-92da119a900b1f73fb7f23fbe1c044a237986741.tar.gz
toolchain_gcc-92da119a900b1f73fb7f23fbe1c044a237986741.tar.bz2
Merge "Fix ARM GCC 4.6/4.7 fail to links code using 64-bit atomic built-in"
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/gcc/config/arm/linux-atomic-64bit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc-4.6/gcc/config/arm/linux-atomic-64bit.c b/gcc-4.6/gcc/config/arm/linux-atomic-64bit.c
index af94c7f..90e2ac0 100644
--- a/gcc-4.6/gcc/config/arm/linux-atomic-64bit.c
+++ b/gcc-4.6/gcc/config/arm/linux-atomic-64bit.c
@@ -56,7 +56,11 @@ static void __check_for_sync8_kernelhelper (void)
for the user - I'm not sure I can rely on much else being
available at this point, so do the same as generic-morestack.c
write () and abort (). */
+#if !defined(__ANDROID__)
__write (2 /* stderr. */, err, sizeof (err));
+#else
+ write (2 /* stderr. */, err, sizeof (err));
+#endif
abort ();
}
};