From 801134f9eaf0dd8db0d70250305097e762d20dac Mon Sep 17 00:00:00 2001
From: Richard Lowe <richlowe@richlowe.net>
Date: Wed, 5 Mar 2014 04:12:52 +0000
Subject: [PATCH 03/34] gcc: enable the .eh_frame based unwinder
---
gcc/configure | 9 ++++++---
gcc/configure.ac | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/gcc/configure b/gcc/configure
index 8fe9c91fd7c..c20dfc771ea 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -23445,11 +23445,12 @@ if test $in_tree_ld != yes ; then
# numbers can be used in ld.so.1 feature checks even if a different
# linker is configured.
ld_ver=`$gcc_cv_ld -V 2>&1`
- if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then
- ld_vers=`echo $ld_ver | sed -n \
- -e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'`
+ if echo "$ld_ver" | $EGREP 'Solaris Link Editors|Solaris ELF Utilities' > /dev/null; then
+ ld_vers=`echo $ld_ver | /bin/sed -n \
+ -E 's,^.*: (5|1[0-9])\.[0-9][0-9]*-([0-9]\.[0-9][0-9]*).*$,\2,p'`
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
+ ld_vers_isillumos=`echo "$ld_ver" | grep '(illumos)'`
fi
;;
esac
@@ -28833,6 +28834,8 @@ elif test x$gcc_cv_ld != x; then
# Sun ld has various bugs in .eh_frame_hdr support before version 1.2251.
if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 2251; then
gcc_cv_ld_eh_frame_hdr=yes
+ elif test "$ld_vers_minor" -ge 1735 && test -n "$ld_vers_isillumos"; then
+ gcc_cv_ld_eh_frame_hdr=yes
fi
;;
esac
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 84dceb8074a..ddbab71370d 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2852,11 +2852,12 @@ if test $in_tree_ld != yes ; then
# numbers can be used in ld.so.1 feature checks even if a different
# linker is configured.
ld_ver=`$gcc_cv_ld -V 2>&1`
- if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then
- ld_vers=`echo $ld_ver | sed -n \
- -e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'`
+ if echo "$ld_ver" | $EGREP 'Solaris Link Editors|Solaris ELF Utilities' > /dev/null; then
+ ld_vers=`echo $ld_ver | /bin/sed -n \
+ -E 's,^.*: (5|1[0-9])\.[0-9][0-9]*-([0-9]\.[0-9][0-9]*).*$,\2,p'`
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
+ ld_vers_isillumos=`echo "$ld_ver" | grep '(illumos)'`
fi
;;
esac
@@ -5367,6 +5368,8 @@ elif test x$gcc_cv_ld != x; then
# Sun ld has various bugs in .eh_frame_hdr support before version 1.2251.
if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 2251; then
gcc_cv_ld_eh_frame_hdr=yes
+ elif test "$ld_vers_minor" -ge 1735 && test -n "$ld_vers_isillumos"; then
+ gcc_cv_ld_eh_frame_hdr=yes
fi
;;
esac
--
2.31.1