aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@nrc-cnrc.gc.ca>2008-03-04 23:30:47 +0000
committerJohn David Anglin <danglin@gcc.gnu.org>2008-03-04 23:30:47 +0000
commit399fe3e123e8b63aa049c9eba29bd93f0fe544d2 (patch)
tree10bca34846e5b90e8d43be8fd37ad78d0c931db6
parente918a58a835bf5e8c36ffff29d619fa778c2a347 (diff)
downloadgcc-399fe3e123e8b63aa049c9eba29bd93f0fe544d2.zip
gcc-399fe3e123e8b63aa049c9eba29bd93f0fe544d2.tar.gz
gcc-399fe3e123e8b63aa049c9eba29bd93f0fe544d2.tar.bz2
re PR target/35222 (EH output contains procedure label without P' selector)
PR target/35222 * configure.ac (CONFIG_SJLJ_EXCEPTIONS): Force SJLJ exceptions on hpux10. * configure: Rebuilt. From-SVN: r132876
-rw-r--r--gcc/ChangeLog7
-rwxr-xr-xgcc/configure24
-rw-r--r--gcc/configure.ac26
3 files changed, 53 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a536011..2efa4be 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-04 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
+
+ PR target/35222
+ * configure.ac (CONFIG_SJLJ_EXCEPTIONS): Force SJLJ exceptions
+ on hpux10.
+ * configure: Rebuilt.
+
2008-03-04 Rafael Espindola <espindola@google.com>
* fold-const.c (tree_simple_nonnegative_warnv_p): New.
diff --git a/gcc/configure b/gcc/configure
index ea8549a..454e71a 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -12200,13 +12200,35 @@ objext='.o'
# Check whether --enable-sjlj-exceptions or --disable-sjlj-exceptions was given.
if test "${enable_sjlj_exceptions+set}" = set; then
enableval="$enable_sjlj_exceptions"
+ case $target in
+ *-*-hpux10*)
+ if test $enableval != yes; then
+ { echo "$as_me:$LINENO: WARNING: dwarf2 exceptions not supported, sjlj exceptions forced" >&5
+echo "$as_me: WARNING: dwarf2 exceptions not supported, sjlj exceptions forced" >&2;}
+ enableval=yes
+ fi
+ ;;
+esac
+force_sjlj_exceptions=yes
+else
+ case $target in
+ *-*-hpux10*)
+ force_sjlj_exceptions=yes
+ enableval=yes
+ ;;
+ *)
+ force_sjlj_exceptions=no
+ ;;
+esac
+fi;
+if test $force_sjlj_exceptions = yes; then
sjlj=`if test $enableval = yes; then echo 1; else echo 0; fi`
cat >>confdefs.h <<_ACEOF
#define CONFIG_SJLJ_EXCEPTIONS $sjlj
_ACEOF
-fi;
+fi
# For platforms with the unwind ABI which includes an unwind library,
# libunwind, we can choose to use the system libunwind.
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 118d9b2..2b3b4ea 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1163,9 +1163,29 @@ AC_SUBST(objext)
AC_ARG_ENABLE(sjlj-exceptions,
[ --enable-sjlj-exceptions
arrange to use setjmp/longjmp exception handling],
-[sjlj=`if test $enableval = yes; then echo 1; else echo 0; fi`
-AC_DEFINE_UNQUOTED(CONFIG_SJLJ_EXCEPTIONS, $sjlj,
- [Define 0/1 to force the choice for exception handling model.])])
+[case $target in
+ *-*-hpux10*)
+ if test $enableval != yes; then
+ AC_MSG_WARN([dwarf2 exceptions not supported, sjlj exceptions forced])
+ enableval=yes
+ fi
+ ;;
+esac
+force_sjlj_exceptions=yes],
+[case $target in
+ *-*-hpux10*)
+ force_sjlj_exceptions=yes
+ enableval=yes
+ ;;
+ *)
+ force_sjlj_exceptions=no
+ ;;
+esac])
+if test $force_sjlj_exceptions = yes; then
+ sjlj=`if test $enableval = yes; then echo 1; else echo 0; fi`
+ AC_DEFINE_UNQUOTED(CONFIG_SJLJ_EXCEPTIONS, $sjlj,
+ [Define 0/1 to force the choice for exception handling model.])
+fi
# For platforms with the unwind ABI which includes an unwind library,
# libunwind, we can choose to use the system libunwind.