diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 00bf1c09ceb..70b802755b5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-11-21 John David Anglin + + PR target/9468 + * configure.ac: Ignore --with-dwarf2 option on 32-bit hppa*-*-hpux*. + * configure: Rebuild. + 2010-11-21 Joseph Myers * system.h (strerror): Poison. diff --git a/gcc/configure b/gcc/configure index ec4ba8e7fdd..5d89ebb127d 100755 --- a/gcc/configure +++ b/gcc/configure @@ -6990,7 +6990,25 @@ fi # Check whether --with-dwarf2 was given. if test "${with_dwarf2+set}" = set; then : - withval=$with_dwarf2; dwarf2="$with_dwarf2" + 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 + else dwarf2=no fi @@ -17286,7 +17304,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17289 "configure" +#line 17307 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17392,7 +17410,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17395 "configure" +#line 17413 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 0eb2d8bddee..18997bebc44 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -683,7 +683,24 @@ objc_boehm_gc='') AC_ARG_WITH(dwarf2, [ --with-dwarf2 force the default debug format to be DWARF 2], -dwarf2="$with_dwarf2", +[ + 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=no) AC_ARG_ENABLE(shared,