Revert last change.

From-SVN: r167019

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd5fd5be53dc43341970c341d696c7c26b31fb3c..c2ad2a33cf55036c3e31a4f25d444c5237594d7b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -5,12 +5,6 @@
        * tree-emutls.c (get_emutls_init_templ_addr, new_emutls_decl): Do not
        finalize external decls.
 
-2010-11-21  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-
-       PR target/9468
-       * configure.ac: Ignore --with-dwarf2 option on 32-bit hppa*-*-hpux*.
-       * configure: Rebuild.
-
 2010-11-21  Joseph Myers  <joseph@codesourcery.com>
 
        * system.h (strerror): Poison.

diff --git a/gcc/configure b/gcc/configure
index 5d89ebb127d9d5065994d513fc18dad4ebb98d5b..ec4ba8e7fdde9af4fa606cd38ef83b214dd6dffa 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -6990,25 +6990,7 @@ fi
 
 # Check whether --with-dwarf2 was given.
 if test "${with_dwarf2+set}" = set; then :
-  withval=$with_dwarf2;
-  case $target in
-    hppa*-*-hpux*)
-      case $target in
-       hppa*64*-*-*)
-          dwarf2="$with_dwarf2"
-         ;;
-       *)
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dwarf2 debug format is not supported for this target, ignored" >&5
-$as_echo "$as_me: WARNING: dwarf2 debug format is not supported for this target, ignored" >&2;}
-         dwarf2=no
-         ;;
-      esac
-      ;;
-    *)
-      dwarf2="$with_dwarf2"
-      ;;
-  esac
-
+  withval=$with_dwarf2; dwarf2="$with_dwarf2"
 else
   dwarf2=no
 fi
@@ -17304,7 +17286,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17307 "configure"
+#line 17289 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17410,7 +17392,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17413 "configure"
+#line 17395 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 18997bebc44d9855bcd576c78335dbfc4a2f5624..0eb2d8bddee79bde16fe3a3563aafd237ee5c68b 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -683,24 +683,7 @@ objc_boehm_gc='')
 
 AC_ARG_WITH(dwarf2,
 [  --with-dwarf2           force the default debug format to be DWARF 2],
-[
-  case $target in
-    hppa*-*-hpux*)
-      case $target in
-       hppa*64*-*-*)
-          dwarf2="$with_dwarf2"
-         ;;
-       *)
-         AC_MSG_WARN([dwarf2 debug format is not supported for this target, ignored])
-         dwarf2=no
-         ;;
-      esac
-      ;;
-    *)
-      dwarf2="$with_dwarf2"
-      ;;
-  esac
-],
+dwarf2="$with_dwarf2",
 dwarf2=no)
 
 AC_ARG_ENABLE(shared,