From 6961669f48aa18168b2d7daa7e2235fbec7cb636 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Thu, 23 Dec 2010 12:08:21 +0000
Subject: [PATCH] configure.ac (gcc_cv_ld_eh_frame_hdr): Only check GNU ld for
--eh-frame-hdr.
* configure.ac (gcc_cv_ld_eh_frame_hdr): Only check GNU ld for
--eh-frame-hdr.
Check for working Sun ld version.
(HAVE_LD_EH_FRAME_HDR): Adapt comment.
(glibc_header_dir): Set only once.
Rename to ...
(target_header_dir): ... this.
Adapt users.
(gcc_cv_target_dl_iterate_frame_hdr): Check on *-*-solaris2*.
(TARGET_DL_ITERATE_PHDR): Define if present.
* configure: Regenerate.
* config.in: Likewise.
* config/t-sol2 (LIB2ADDEH, LIB2ADDEHDEP): Define.
* crtstuff.c (USE_PT_GNU_EH_FRAME): Define for recent Solaris 11
with linker support and dl_iterate_phdr.
* unwind-dw2-fde-glibc.c (USE_PT_GNU_EH_FRAME): Likewise.
(_Unwind_IteratePhdrCallback) [PT_SUNW_UNWIND]: Also accept
PT_SUNW_UNWIND .eh_frame_hdr sections.
[CRT_GET_RFIB_DATA && __i386__ && __sun__ && __svr4__]: Add
load_base to data->dbase.
[CRT_GET_RFIB_DATA && __x86_64__ && __sun__ && __svr4__]: Handle
64-bit Solaris 10+/x86.
* config/sol2-gld.h [TARGET_DL_ITERATE_PHDR && HAVE_LD_EH_FRAME_HDR]
(LINK_EH_SPEC): Define.
From-SVN: r168204
---
gcc/ChangeLog | 27 ++++++++++
gcc/config.in | 5 +-
gcc/config/sol2-gld.h | 5 ++
gcc/config/t-sol2 | 6 +++
gcc/configure | 105 ++++++++++++++++++++++---------------
gcc/configure.ac | 104 +++++++++++++++++++++---------------
gcc/crtstuff.c | 11 +++-
gcc/unwind-dw2-fde-glibc.c | 26 ++++++++-
8 files changed, 202 insertions(+), 87 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b0fedf5799a..c067e6a93c4f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+2010-12-23 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * configure.ac (gcc_cv_ld_eh_frame_hdr): Only check GNU ld for
+ --eh-frame-hdr.
+ Check for working Sun ld version.
+ (HAVE_LD_EH_FRAME_HDR): Adapt comment.
+ (glibc_header_dir): Set only once.
+ Rename to ...
+ (target_header_dir): ... this.
+ Adapt users.
+ (gcc_cv_target_dl_iterate_frame_hdr): Check on *-*-solaris2*.
+ (TARGET_DL_ITERATE_PHDR): Define if present.
+ * configure: Regenerate.
+ * config.in: Likewise.
+ * config/t-sol2 (LIB2ADDEH, LIB2ADDEHDEP): Define.
+ * crtstuff.c (USE_PT_GNU_EH_FRAME): Define for recent Solaris 11
+ with linker support and dl_iterate_phdr.
+ * unwind-dw2-fde-glibc.c (USE_PT_GNU_EH_FRAME): Likewise.
+ (_Unwind_IteratePhdrCallback) [PT_SUNW_UNWIND]: Also accept
+ PT_SUNW_UNWIND .eh_frame_hdr sections.
+ [CRT_GET_RFIB_DATA && __i386__ && __sun__ && __svr4__]: Add
+ load_base to data->dbase.
+ [CRT_GET_RFIB_DATA && __x86_64__ && __sun__ && __svr4__]: Handle
+ 64-bit Solaris 10+/x86.
+ * config/sol2-gld.h [TARGET_DL_ITERATE_PHDR && HAVE_LD_EH_FRAME_HDR]
+ (LINK_EH_SPEC): Define.
+
2010-12-23 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/extend.texi (Function Attributes, Volatiles): Fix typos.
diff --git a/gcc/config.in b/gcc/config.in
index fff7f4d22b1f..f129f3dec4b4 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -1161,7 +1161,7 @@
#endif
-/* Define if your linker supports --eh-frame-hdr option. */
+/* Define if your linker supports .eh_frame_hdr. */
#undef HAVE_LD_EH_FRAME_HDR
/* Define if your linker supports garbage collection of sections in presence
@@ -1686,6 +1686,9 @@
#endif
+/* Define if your target C library provides the `dl_iterate_phdr' function. */
+#undef TARGET_DL_ITERATE_PHDR
+
/* Define if your target C library provides stack protector support */
#ifndef USED_FOR_TARGET
#undef TARGET_LIBC_PROVIDES_SSP
diff --git a/gcc/config/sol2-gld.h b/gcc/config/sol2-gld.h
index cf020f9c1394..5ab1582356a9 100644
--- a/gcc/config/sol2-gld.h
+++ b/gcc/config/sol2-gld.h
@@ -29,3 +29,8 @@ along with GCC; see the file COPYING3. If not see
/* GNU ld needs --export-dynamic to implement -rdynamic. */
#undef RDYNAMIC_SPEC
#define RDYNAMIC_SPEC "--export-dynamic"
+
+/* Solaris 11 build 135+ implements dl_iterate_phdr. */
+#if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+#endif /* HAVE_LD_EH_FRAME && TARGET_DL_ITERATE_PHDR */
diff --git a/gcc/config/t-sol2 b/gcc/config/t-sol2
index ce8840618462..6a76bf1bad81 100644
--- a/gcc/config/t-sol2
+++ b/gcc/config/t-sol2
@@ -28,3 +28,9 @@ sol2.o: $(srcdir)/config/sol2.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
tree.h output.h $(TM_H) $(TM_P_H) $(GGC_H)
$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(srcdir)/config/sol2.c
+
+# Use unwind-dw2-fde-glibc.c. Unless linker support and dl_iterate_phdr
+# are present, automatically falls back to unwind-dw2-fde.c.
+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
+ $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
diff --git a/gcc/configure b/gcc/configure
index 9d76b4197f71..1c95830d58c2 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -25271,10 +25271,21 @@ if test $in_tree_ld = yes ; then
gcc_cv_ld_eh_frame_hdr=yes
fi
elif test x$gcc_cv_ld != x; then
- # Check if linker supports --eh-frame-hdr option
- if $gcc_cv_ld --help 2>/dev/null | grep eh-frame-hdr > /dev/null; then
- gcc_cv_ld_eh_frame_hdr=yes
- fi
+ if echo "$ld_ver" | grep GNU > /dev/null; then
+ # Check if linker supports --eh-frame-hdr option
+ if $gcc_cv_ld --help 2>/dev/null | grep eh-frame-hdr > /dev/null; then
+ gcc_cv_ld_eh_frame_hdr=yes
+ fi
+ else
+ case "$target" in
+ *-*-solaris2*)
+ # Sun ld has various bugs in .eh_frame_hdr support before version 1.2249.
+ if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 2249; then
+ gcc_cv_ld_eh_frame_hdr=yes
+ fi
+ ;;
+ esac
+ fi
fi
if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
@@ -25616,6 +25627,22 @@ _ACEOF
fi
+if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
+ if test "x$with_headers" != x; then
+ target_header_dir=$with_headers
+ elif test "x$with_sysroot" = x; then
+ target_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+ elif test "x$with_build_sysroot" != "x"; then
+ target_header_dir="${with_build_sysroot}/usr/include"
+ elif test "x$with_sysroot" = xyes; then
+ target_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
+ else
+ target_header_dir="${with_sysroot}/usr/include"
+ fi
+else
+ target_header_dir=/usr/include
+fi
+
# Test for stack protector support in target C library.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __stack_chk_fail in target C library" >&5
$as_echo_n "checking __stack_chk_fail in target C library... " >&6; }
@@ -25625,39 +25652,24 @@ else
gcc_cv_libc_provides_ssp=no
case "$target" in
*-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
- if test "x$with_headers" != x; then
- glibc_header_dir=$with_headers
- elif test "x$with_sysroot" = x; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
- elif test "x$with_build_sysroot" != "x"; then
- glibc_header_dir="${with_build_sysroot}/usr/include"
- elif test "x$with_sysroot" = xyes; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
- else
- glibc_header_dir="${with_sysroot}/usr/include"
- fi
- else
- glibc_header_dir=/usr/include
- fi
# glibc 2.4 and later provides __stack_chk_fail and
# either __stack_chk_guard, or TLS access to stack guard canary.
- if test -f $glibc_header_dir/features.h \
+ if test -f $target_header_dir/features.h \
&& $EGREP '^[ ]*#[ ]*define[ ]+__GNU_LIBRARY__[ ]+([1-9][0-9]|[6-9])' \
- $glibc_header_dir/features.h > /dev/null; then
+ $target_header_dir/features.h > /dev/null; then
if $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC__[ ]+([1-9][0-9]|[3-9])' \
- $glibc_header_dir/features.h > /dev/null; then
+ $target_header_dir/features.h > /dev/null; then
gcc_cv_libc_provides_ssp=yes
elif $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC__[ ]+2' \
- $glibc_header_dir/features.h > /dev/null \
+ $target_header_dir/features.h > /dev/null \
&& $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC_MINOR__[ ]+([1-9][0-9]|[4-9])' \
- $glibc_header_dir/features.h > /dev/null; then
+ $target_header_dir/features.h > /dev/null; then
gcc_cv_libc_provides_ssp=yes
elif $EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC__[ ]+1' \
- $glibc_header_dir/features.h > /dev/null && \
- test -f $glibc_header_dir/bits/uClibc_config.h && \
+ $target_header_dir/features.h > /dev/null && \
+ test -f $target_header_dir/bits/uClibc_config.h && \
$EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC_HAS_SSP__[ ]+1' \
- $glibc_header_dir/bits/uClibc_config.h > /dev/null; then
+ $target_header_dir/bits/uClibc_config.h > /dev/null; then
gcc_cv_libc_provides_ssp=yes
fi
fi
@@ -25704,21 +25716,8 @@ if test "${with_long_double_128+set}" = set; then :
withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
else
gcc_cv_target_ldbl128=no
- if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
- if test "x$with_sysroot" = x; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
- elif test "x$with_build_sysroot" != "x"; then
- glibc_header_dir="${with_build_sysroot}/usr/include"
- elif test "x$with_sysroot" = xyes; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
- else
- glibc_header_dir="${with_sysroot}/usr/include"
- fi
- else
- glibc_header_dir=/usr/include
- fi
grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \
- $glibc_header_dir/bits/wordsize.h > /dev/null 2>&1 \
+ $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
&& gcc_cv_target_ldbl128=yes
fi
@@ -25731,6 +25730,30 @@ $as_echo "#define TARGET_DEFAULT_LONG_DOUBLE_128 1" >>confdefs.h
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dl_iterate_phdr in target C library" >&5
+$as_echo_n "checking dl_iterate_phdr in target C library... " >&6; }
+gcc_cv_target_dl_iterate_phdr=unknown
+case "$target" in
+ *-*-solaris2*)
+ # <link.h> needs both a dl_iterate_phdr declaration and support for
+ # compilation with largefile support.
+ if grep dl_iterate_phdr $target_header_dir/link.h > /dev/null 2>&1 \
+ && grep 'large file capable' $target_header_dir/link.h > /dev/null 2>&1; then
+ gcc_cv_target_dl_iterate_phdr=yes
+ else
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
+esac
+
+if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+
+$as_echo "#define TARGET_DL_ITERATE_PHDR 1" >>confdefs.h
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_target_dl_iterate_phdr" >&5
+$as_echo "$gcc_cv_target_dl_iterate_phdr" >&6; }
+
# Find out what GC implementation we want, or may, use.
# Check whether --with-gc was given.
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 166500e3110c..ad8d008837bd 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3930,15 +3930,26 @@ if test $in_tree_ld = yes ; then
gcc_cv_ld_eh_frame_hdr=yes
fi
elif test x$gcc_cv_ld != x; then
- # Check if linker supports --eh-frame-hdr option
- if $gcc_cv_ld --help 2>/dev/null | grep eh-frame-hdr > /dev/null; then
- gcc_cv_ld_eh_frame_hdr=yes
- fi
+ if echo "$ld_ver" | grep GNU > /dev/null; then
+ # Check if linker supports --eh-frame-hdr option
+ if $gcc_cv_ld --help 2>/dev/null | grep eh-frame-hdr > /dev/null; then
+ gcc_cv_ld_eh_frame_hdr=yes
+ fi
+ else
+ case "$target" in
+ *-*-solaris2*)
+ # Sun ld has various bugs in .eh_frame_hdr support before version 1.2249.
+ if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 2249; then
+ gcc_cv_ld_eh_frame_hdr=yes
+ fi
+ ;;
+ esac
+ fi
fi
GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
-[Define if your linker supports --eh-frame-hdr option.])
+[Define if your linker supports .eh_frame_hdr.])
fi
AC_MSG_RESULT($gcc_cv_ld_eh_frame_hdr)
@@ -4219,45 +4230,46 @@ if test x$with_sysroot = x && test x$host = x$target \
[Define to PREFIX/include if cpp should also search that directory.])
fi
+if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
+ if test "x$with_headers" != x; then
+ target_header_dir=$with_headers
+ elif test "x$with_sysroot" = x; then
+ target_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+ elif test "x$with_build_sysroot" != "x"; then
+ target_header_dir="${with_build_sysroot}/usr/include"
+ elif test "x$with_sysroot" = xyes; then
+ target_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
+ else
+ target_header_dir="${with_sysroot}/usr/include"
+ fi
+else
+ target_header_dir=/usr/include
+fi
+
# Test for stack protector support in target C library.
AC_CACHE_CHECK(__stack_chk_fail in target C library,
gcc_cv_libc_provides_ssp,
[gcc_cv_libc_provides_ssp=no
case "$target" in
*-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
- if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
- if test "x$with_headers" != x; then
- glibc_header_dir=$with_headers
- elif test "x$with_sysroot" = x; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
- elif test "x$with_build_sysroot" != "x"; then
- glibc_header_dir="${with_build_sysroot}/usr/include"
- elif test "x$with_sysroot" = xyes; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
- else
- glibc_header_dir="${with_sysroot}/usr/include"
- fi
- else
- glibc_header_dir=/usr/include
- fi
[# glibc 2.4 and later provides __stack_chk_fail and
# either __stack_chk_guard, or TLS access to stack guard canary.
- if test -f $glibc_header_dir/features.h \
+ if test -f $target_header_dir/features.h \
&& $EGREP '^[ ]*#[ ]*define[ ]+__GNU_LIBRARY__[ ]+([1-9][0-9]|[6-9])' \
- $glibc_header_dir/features.h > /dev/null; then
+ $target_header_dir/features.h > /dev/null; then
if $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC__[ ]+([1-9][0-9]|[3-9])' \
- $glibc_header_dir/features.h > /dev/null; then
+ $target_header_dir/features.h > /dev/null; then
gcc_cv_libc_provides_ssp=yes
elif $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC__[ ]+2' \
- $glibc_header_dir/features.h > /dev/null \
+ $target_header_dir/features.h > /dev/null \
&& $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC_MINOR__[ ]+([1-9][0-9]|[4-9])' \
- $glibc_header_dir/features.h > /dev/null; then
+ $target_header_dir/features.h > /dev/null; then
gcc_cv_libc_provides_ssp=yes
elif $EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC__[ ]+1' \
- $glibc_header_dir/features.h > /dev/null && \
- test -f $glibc_header_dir/bits/uClibc_config.h && \
+ $target_header_dir/features.h > /dev/null && \
+ test -f $target_header_dir/bits/uClibc_config.h && \
$EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC_HAS_SSP__[ ]+1' \
- $glibc_header_dir/bits/uClibc_config.h > /dev/null; then
+ $target_header_dir/bits/uClibc_config.h > /dev/null; then
gcc_cv_libc_provides_ssp=yes
fi
fi]
@@ -4293,21 +4305,8 @@ case "$target" in
[ --with-long-double-128 Use 128-bit long double by default.],
gcc_cv_target_ldbl128="$with_long_double_128",
[[gcc_cv_target_ldbl128=no
- if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
- if test "x$with_sysroot" = x; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
- elif test "x$with_build_sysroot" != "x"; then
- glibc_header_dir="${with_build_sysroot}/usr/include"
- elif test "x$with_sysroot" = xyes; then
- glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
- else
- glibc_header_dir="${with_sysroot}/usr/include"
- fi
- else
- glibc_header_dir=/usr/include
- fi
grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \
- $glibc_header_dir/bits/wordsize.h > /dev/null 2>&1 \
+ $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
&& gcc_cv_target_ldbl128=yes
]])
;;
@@ -4317,6 +4316,27 @@ if test x$gcc_cv_target_ldbl128 = xyes; then
[Define if TFmode long double should be the default])
fi
+AC_MSG_CHECKING(dl_iterate_phdr in target C library)
+gcc_cv_target_dl_iterate_phdr=unknown
+case "$target" in
+ *-*-solaris2*)
+ # <link.h> needs both a dl_iterate_phdr declaration and support for
+ # compilation with largefile support.
+ if grep dl_iterate_phdr $target_header_dir/link.h > /dev/null 2>&1 \
+ && grep 'large file capable' $target_header_dir/link.h > /dev/null 2>&1; then
+ gcc_cv_target_dl_iterate_phdr=yes
+ else
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
+esac
+GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
+if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+ AC_DEFINE(TARGET_DL_ITERATE_PHDR, 1,
+[Define if your target C library provides the `dl_iterate_phdr' function.])
+fi
+AC_MSG_RESULT($gcc_cv_target_dl_iterate_phdr)
+
# Find out what GC implementation we want, or may, use.
AC_ARG_WITH(gc,
[ --with-gc={page,zone} choose the garbage collection mechanism to use
diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index 6fc571b2a6f7..b65f490da66f 100644
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -1,7 +1,7 @@
/* Specialized bits of code needed to support construction and
destruction of file-scope objects in C++ code.
Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
Contributed by Ron Guilmette (rfg@monkeys.com).
This file is part of GCC.
@@ -88,6 +88,15 @@ call_ ## FUNC (void) \
# define USE_PT_GNU_EH_FRAME
#endif
+#if defined(OBJECT_FORMAT_ELF) \
+ && !defined(OBJECT_FORMAT_FLAT) \
+ && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \
+ && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
+ && defined(__sun__) && defined(__svr4__)
+#include <link.h>
+# define USE_PT_GNU_EH_FRAME
+#endif
+
#if defined(OBJECT_FORMAT_ELF) \
&& !defined(OBJECT_FORMAT_FLAT) \
&& defined(HAVE_LD_EH_FRAME_HDR) \
diff --git a/gcc/unwind-dw2-fde-glibc.c b/gcc/unwind-dw2-fde-glibc.c
index a762d875c9ed..d8e3c0e934b0 100644
--- a/gcc/unwind-dw2-fde-glibc.c
+++ b/gcc/unwind-dw2-fde-glibc.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010
+ Free Software Foundation, Inc.
Contributed by Jakub Jelinek <jakub@redhat.com>.
This file is part of GCC.
@@ -57,6 +58,12 @@
# define USE_PT_GNU_EH_FRAME
#endif
+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+ && defined(TARGET_DL_ITERATE_PHDR) \
+ && defined(__sun__) && defined(__svr4__)
+# define USE_PT_GNU_EH_FRAME
+#endif
+
#if defined(USE_PT_GNU_EH_FRAME)
#include <link.h>
@@ -256,6 +263,12 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
}
else if (phdr->p_type == PT_GNU_EH_FRAME)
p_eh_frame_hdr = phdr;
+#ifdef PT_SUNW_UNWIND
+ /* Sun ld emits PT_SUNW_UNWIND .eh_frame_hdr sections instead of
+ PT_SUNW_EH_FRAME/PT_GNU_EH_FRAME, so accept them as well. */
+ else if (phdr->p_type == PT_SUNW_UNWIND)
+ p_eh_frame_hdr = phdr;
+#endif
else if (phdr->p_type == PT_DYNAMIC)
p_dynamic = phdr;
}
@@ -305,13 +318,22 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
for (; dyn->d_tag != DT_NULL ; dyn++)
if (dyn->d_tag == DT_PLTGOT)
{
- /* On IA-32, _DYNAMIC is writable and GLIBC has relocated it. */
data->dbase = (void *) dyn->d_un.d_ptr;
+#if defined __linux__
+ /* On IA-32 Linux, _DYNAMIC is writable and GLIBC has
+ relocated it. */
+#elif defined __sun__ && defined __svr4__
+ /* On Solaris 2/x86, we need to do this ourselves. */
+ data->dbase += load_base;
+#endif
break;
}
}
# elif defined __FRV_FDPIC__ && defined __linux__
data->dbase = load_base.got_value;
+# elif defined __x86_64__ && defined __sun__ && defined __svr4__
+ /* While CRT_GET_RFIB_DATA is also defined for 64-bit Solaris 10+/x86, it
+ doesn't apply since it uses DW_EH_PE_pcrel encoding. */
# else
# error What is DW_EH_PE_datarel base on this platform?
# endif
--
GitLab