configure.in: Correct --help text for --with-dwarf2.

	* configure.in: Correct --help text for --with-dwarf2.
	Put tm-dwarf2.h after other tm files, if it's requested.
	* configure: Regenerate.
	* config/tm-dwarf2.h: #undef PREFERRED_DEBUGGING_TYPE before
	defining it.

From-SVN: r31883

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b6602c38a87e7a4ec5ed69954e62b07f05b6cc6..cca6d23a1e3929a7b6dff4c98c5895313068008a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-09  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * configure.in: Correct --help text for --with-dwarf2.
+       Put tm-dwarf2.h after other tm files, if it's requested.
+       * configure: Regenerate.
+       * config/tm-dwarf2.h: #undef PREFERRED_DEBUGGING_TYPE before
+       defining it.
+
 2000-02-09  Zack Weinberg  <zack@wolery.cumb.org>
 
        * cpplib.h: Provide HASHNODE typedef and forward decl of

diff --git a/gcc/config/tm-dwarf2.h b/gcc/config/tm-dwarf2.h
index a580964ba1ab060356bd0cba9cef21d552f1aaf7..d08646eccf89bf847a39426bf7d0737978004af4 100644 (file)
--- a/gcc/config/tm-dwarf2.h
+++ b/gcc/config/tm-dwarf2.h
@@ -1,4 +1,4 @@
 /* Enable Dwarf2 debugging and make it the default */
 #define  DWARF2_DEBUGGING_INFO 1
+#undef  PREFERRED_DEBUGGING_TYPE
 #define  PREFERRED_DEBUGGING_TYPE  DWARF2_DEBUG
-

diff --git a/gcc/configure b/gcc/configure
index 50094d038731067e17687580702f721272c95a3b..2065a7f40c71572c2bbbbbd256499722e17eb791 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -58,7 +58,7 @@ ac_help="$ac_help
   --enable-objc-gc       enable the use of Boehm's garbage collector with
                          the GNU Objective-C runtime."
 ac_help="$ac_help
-  --enable-dwarf2        enable DWARF2 debugging as default."
+  --with-dwarf2          force the default debug format to be DWARF2."
 ac_help="$ac_help
   --enable-nls            use Native Language Support (disabled by default)"
 ac_help="$ac_help
@@ -6447,7 +6447,7 @@ then tmake_file=$cpu_type/t-$cpu_type
 fi
 
 if test x"$dwarf2" = xyes
-then tm_file="tm-dwarf2.h $tm_file"
+then tm_file="$tm_file tm-dwarf2.h"
 fi
 
 if test x$float_format = x

diff --git a/gcc/configure.in b/gcc/configure.in
index e2b9535fa32ffd3dbe5c3ac76b53ee37ec062b30..415fff30f2f2e10fee8287a3f9d65e000f88a4a2 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -295,7 +295,7 @@ fi,
 objc_boehm_gc='')
 
 AC_ARG_WITH(dwarf2,
-[  --enable-dwarf2       enable DWARF2 debugging as default.],
+[  --with-dwarf2         force the default debug format to be DWARF2.],
 dwarf2="$with_dwarf2",
 dwarf2=no)
 
@@ -3844,7 +3844,7 @@ then tmake_file=$cpu_type/t-$cpu_type
 fi
 
 if test x"$dwarf2" = xyes
-then tm_file="tm-dwarf2.h $tm_file"
+then tm_file="$tm_file tm-dwarf2.h"
 fi
 
 if test x$float_format = x