diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7a79430cdb..31e590509d5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-05  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* config.gcc [hppa[12]*-*-hpux10*, hppa[12]*-*-hpux11*]:  Ignore
+	--with-dwarf2 option.
+
 2010-12-03  Jan Hubicka  <jh@suse.cz>
 
 	* lto-streamer-in.c (input_cfg): Fix pasto.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index d41cf11e1d2..da4c6897330 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1065,6 +1065,10 @@ hppa[12]*-*-hpux10*)
 	fi
 	use_collect2=yes
 	gas=yes
+	if test "x$with_dwarf2" != x; then
+		echo "Warning: dwarf2 debug format is not supported for this targe, --with-dwarf2 ignored" 1>&2
+		dwarf2=no
+	fi
 	;;
 hppa*64*-*-hpux11*)
 	target_cpu_default="MASK_PA_11|MASK_PA_20"
@@ -1153,6 +1157,10 @@ hppa[12]*-*-hpux11*)
 		tm_file="${tm_file} hpux-stdint.h"
 		;;
 	esac
+	if test "x$with_dwarf2" != x; then
+		echo "Warning: dwarf2 debug format is not supported for this targe, --with-dwarf2 ignored" 1>&2
+		dwarf2=no
+	fi
 	;;
 i[34567]86-*-darwin*)
 	need_64bit_hwint=yes