aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-09-12 13:44:20 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-09-12 13:44:20 -0700
commit345faeab3b756e0b0f83f891f985f54c56b9bd9d (patch)
treed7f7c9f18406d7e25ec3d4ea1b53e92d66b29035 /gcc-4.6
parent5d8cb1af30dc348b89a0dfc4a00ef6ab0b466d66 (diff)
parent1b319a8d2eab9b0a8861db78f90959ff3db175eb (diff)
downloadtoolchain_gcc-345faeab3b756e0b0f83f891f985f54c56b9bd9d.tar.gz
toolchain_gcc-345faeab3b756e0b0f83f891f985f54c56b9bd9d.tar.bz2
toolchain_gcc-345faeab3b756e0b0f83f891f985f54c56b9bd9d.zip
Merge "Backport from trunk r186788: Define USE_PT_GNU_EH_FRAME."
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/gcc/unwind-dw2-fde-glibc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/gcc-4.6/gcc/unwind-dw2-fde-glibc.c b/gcc-4.6/gcc/unwind-dw2-fde-glibc.c
index d8e3c0e93..d400da40e 100644
--- a/gcc-4.6/gcc/unwind-dw2-fde-glibc.c
+++ b/gcc-4.6/gcc/unwind-dw2-fde-glibc.c
@@ -53,6 +53,11 @@
#endif
#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+ && defined(__BIONIC__)
+# define USE_PT_GNU_EH_FRAME
+#endif
+
+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
&& defined(__FreeBSD__) && __FreeBSD__ >= 7
# define ElfW __ElfN
# define USE_PT_GNU_EH_FRAME