Makefile.in (OBJS-common): Remove dwarfout.o.

	* Makefile.in (OBJS-common): Remove dwarfout.o.
	(dwarfout.o): Remove.
	* common.opt: Remove -gdwarf, -gdwarf+.
	* defaults.h (PREFERRED_DEBUGGING_TYPE): Do not check for
	DWARF_DEBUGGING_INFO.
	* dwarf2out.c: Fix typo in comment.
	* dwarfout.c: Remove.
	* opts.c (common_handle_option): Remove OPT_gdwarf, OPT_gdwarf_.
	* toplev.c (process_options): Remove check for
	DWARF_DEBUGGING_INFO.
	* config/elfos.h (DWARF_DEBUGGING_INFO): Do not #define it or
	#undef it.
	* config/netware.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/ptx4.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/vxworks.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/alpha/unicosmk.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/arc/arc.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/i386/sco5.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/i386/x86-64.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/m32r/m32r.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/mcore/mcore-elf.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/sparc/linux64.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/sparc/liteelf.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/sparc/sol26-sld.h (DWARF_DEBUGGING_INFO): Likewise.
	* config/sparc/sp86x-elf.h (DWARF_DEBUGGING_INFO): Likewise.
	* doc/invoke.texi: Do not mention -gdwarf, -gdwarf-1, -gdwarf-1+,
	or -gdwarf+.
	* doc/tm.texi: Likewise.

From-SVN: r74996

gcc/ChangeLog

@@ -21,6 +21,35 @@
 
 2003-12-23  Mark Mitchell  <mark@codesourcery.com>
 
+	* Makefile.in (OBJS-common): Remove dwarfout.o.
+	(dwarfout.o): Remove.
+	* common.opt: Remove -gdwarf, -gdwarf+.
+	* defaults.h (PREFERRED_DEBUGGING_TYPE): Do not check for
+	DWARF_DEBUGGING_INFO.
+	* dwarf2out.c: Fix typo in comment.
+	* dwarfout.c: Remove.
+	* opts.c (common_handle_option): Remove OPT_gdwarf, OPT_gdwarf_.
+	* toplev.c (process_options): Remove check for
+	DWARF_DEBUGGING_INFO.
+	* config/elfos.h (DWARF_DEBUGGING_INFO): Do not #define it or
+	#undef it.
+	* config/netware.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/ptx4.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/vxworks.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/alpha/unicosmk.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/arc/arc.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/i386/sco5.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/i386/x86-64.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/m32r/m32r.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/mcore/mcore-elf.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/sparc/linux64.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/sparc/liteelf.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/sparc/sol26-sld.h (DWARF_DEBUGGING_INFO): Likewise.
+	* config/sparc/sp86x-elf.h (DWARF_DEBUGGING_INFO): Likewise.
+	* doc/invoke.texi: Do not mention -gdwarf, -gdwarf-1, -gdwarf-1+,
+	or -gdwarf+.
+	* doc/tm.texi: Likewise.
+
 	* c-common.c (flag_abi_version): Default to 2.
 	* c-cppbuiltin.c (c_cpp_builtins): Define __GXX_ABI_VERSION
 	uniformly for versions above 2.

gcc/Makefile.in

@@ -852,7 +852,7 @@ OBJS-common = \
  cfgloopanal.o cfgloopmanip.o loop-init.o loop-unswitch.o loop-unroll.o	   \
  cfgrtl.o combine.o conflict.o convert.o coverage.o cse.o cselib.o 	   \
  dbxout.o debug.o df.o diagnostic.o dojump.o doloop.o dominance.o	   \
- dwarf2asm.o dwarf2out.o dwarfout.o emit-rtl.o except.o explow.o	   \
+ dwarf2asm.o dwarf2out.o emit-rtl.o except.o explow.o	                   \
  expmed.o expr.o final.o flow.o fold-const.o function.o gcse.o		   \
  genrtl.o ggc-common.o global.o graph.o gtype-desc.o			   \
  haifa-sched.o hooks.o ifcvt.o insn-attrtab.o insn-emit.o insn-modes.o	   \
@@ -1604,9 +1604,6 @@ sdbout.o : sdbout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_
    flags.h function.h $(EXPR_H) output.h hard-reg-set.h $(REGS_H) real.h \
    insn-config.h xcoffout.h c-pragma.h $(GGC_H) $(TARGET_H) \
    sdbout.h toplev.h $(TM_P_H) except.h debug.h langhooks.h gt-sdbout.h
-dwarfout.o : dwarfout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   $(RTL_H) dwarf.h flags.h insn-config.h reload.h output.h toplev.h $(TM_P_H) \
-   debug.h langhooks.h $(TARGET_H)
 dwarf2out.o : dwarf2out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
    $(RTL_H) dwarf2.h debug.h flags.h insn-config.h reload.h output.h $(DIAGNOSTIC_H) real.h \
    hard-reg-set.h $(REGS_H) $(EXPR_H) libfuncs.h toplev.h dwarf2out.h varray.h \

gcc/common.opt

@@ -743,14 +743,6 @@ gcoff
 Common JoinedOrMissing
 Generate debug information in COFF format
 
-gdwarf
-Common JoinedOrMissing
-Generate debug information in DWARF v1 format
-
-gdwarf+
-Common JoinedOrMissing
-Generate debug information in extended DWARF v1 format
-
 gdwarf-2
 Common JoinedOrMissing
 Generate debug information in DWARF v2 format

gcc/config/alpha/unicosmk.h

@@ -480,7 +480,6 @@ ssib_section (void)		\
 #undef SDB_DEBUGGING_INFO
 #undef MIPS_DEBUGGING_INFO
 #undef DBX_DEBUGGING_INFO
-#undef DWARF_DEBUGGING_INFO
 #undef DWARF2_DEBUGGING_INFO
 #undef DWARF2_UNWIND_INFO
 #undef INCOMING_RETURN_ADDR_RTX

gcc/config/arc/arc.h

@@ -1245,7 +1245,6 @@ do { if ((LOG) != 0) fprintf (FILE, "\t.align %d\n", 1 << (LOG)); } while (0)
 
 /* Generate DBX and DWARF debugging information.  */
 #define DBX_DEBUGGING_INFO 1
-#define DWARF_DEBUGGING_INFO 1
 
 /* Prefer STABS (for now).  */
 #undef PREFERRED_DEBUGGING_TYPE

gcc/config/elfos.h

@@ -66,10 +66,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define HANDLE_SYSV_PRAGMA 1
 
-/* System V Release 4 uses DWARF debugging info.  */
-
-#define DWARF_DEBUGGING_INFO 1
-
 /* All ELF targets can support DWARF-2.  */
 
 #define DWARF2_DEBUGGING_INFO 1

gcc/config/i386/sco5.h

@@ -60,7 +60,6 @@ Boston, MA 02111-1307, USA.  */
 #define DBX_REGISTER_NUMBER(n)	svr4_dbx_register_map[n]
 
 #define DWARF2_DEBUGGING_INFO		1
-#define DWARF_DEBUGGING_INFO		1
 #define DBX_DEBUGGING_INFO		1
 
 #undef PREFERRED_DEBUGGING_TYPE

gcc/config/i386/x86-64.h

@@ -68,7 +68,6 @@ Boston, MA 02111-1307, USA.  */
 /* i386 System V Release 4 uses DWARF debugging info.
    x86-64 ABI specifies DWARF2.  */
 
-#undef DWARF_DEBUGGING_INFO
 #define DWARF2_DEBUGGING_INFO 1
 #define DWARF2_UNWIND_INFO 1
 /* Incorrectly autodetected in cross compilation.  */

gcc/config/m32r/m32r.h

@@ -1721,7 +1721,6 @@ extern char m32r_punct_chars[256];
 
 /* Generate DBX and DWARF debugging information.  */
 #define DBX_DEBUGGING_INFO 1
-#define DWARF_DEBUGGING_INFO 1
 #define DWARF2_DEBUGGING_INFO 1
 
 /* Prefer STABS (for now).  */

gcc/config/mcore/mcore-elf.h

@@ -31,9 +31,6 @@ Boston, MA 02111-1307, USA.  */
 #undef  PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
-/* But allow DWARF 1 if the user wants it.  */
-#define DWARF_DEBUGGING_INFO 1
-
 #define EXPORTS_SECTION_ASM_OP	"\t.section .exports"
 
 #define SUBTARGET_EXTRA_SECTIONS in_exports

gcc/config/netware.h

@@ -51,7 +51,6 @@ Boston, MA 02111-1307, USA.  */
 /* set debugging info */
 #define	DBX_DEBUGGING_INFO 1
 #undef	SDB_DEBUGGING_INFO
-#undef	DWARF_DEBUGGING_INFO
 #undef	XCOFF_DEBUGGING_INFO
 #undef	PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG

gcc/config/ptx4.h

@@ -33,7 +33,6 @@ Boston, MA 02111-1307, USA.
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
-#undef DWARF_DEBUGGING_INFO
 #define DWARF2_DEBUGGING_INFO 1
 
 /* Cpp, assembler, linker, library, and startfile spec's.  */

gcc/config/sparc/linux64.h

@@ -265,10 +265,6 @@ Boston, MA 02111-1307, USA.  */
 #undef DBX_REGISTER_NUMBER
 #define DBX_REGISTER_NUMBER(REGNO) (REGNO)
 
-/* System V Release 4 uses DWARF debugging info.  Buf DWARF1 doesn't do
-   64-bit anything, so we use DWARF2.  */
-
-#undef DWARF_DEBUGGING_INFO
 #define DWARF2_DEBUGGING_INFO 1
 #define DBX_DEBUGGING_INFO 1
 

gcc/config/sparc/liteelf.h

@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Default to dwarf2 in ELF.  */
 
-#define DWARF_DEBUGGING_INFO 1
 #define DWARF2_DEBUGGING_INFO 1
 
 #undef PREFERRED_DEBUGGING_TYPE

gcc/config/sparc/sol26-sld.h

-/* Up through Solaris 2.6, the system linker does not work with DWARF
-   or DWARF2, since it does not have working support for relocations
-   to unaligned data.  */
+/* Up through Solaris 2.6, the system linker does not work with DWARF2
+   since it does not have working support for relocations to unaligned
+   data.  */
 
-#undef DWARF_DEBUGGING_INFO
 #undef DWARF2_DEBUGGING_INFO

gcc/config/sparc/sp86x-elf.h

@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Default to dwarf2 in ELF.  */
 
-#define DWARF_DEBUGGING_INFO 1
 #define DWARF2_DEBUGGING_INFO 1
 
 #undef PREFERRED_DEBUGGING_TYPE

gcc/config/vxworks.h

@@ -62,4 +62,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Only supported debug format is Dwarf2.  */
 #undef DBX_DEBUGGING_INFO
-#undef DWARF_DEBUGGING_INFO

gcc/defaults.h

@@ -485,7 +485,7 @@ do { fputs (integer_asm_op (POINTER_SIZE / UNITS_PER_WORD, TRUE), FILE); \
    PREFERRED_DEBUGGING_TYPE to choose a format in a system-dependent way.
 
    This is one long line cause VAXC can't handle a \-newline.  */
-#if 1 < (defined (DBX_DEBUGGING_INFO) + defined (SDB_DEBUGGING_INFO) + defined (DWARF_DEBUGGING_INFO) + defined (DWARF2_DEBUGGING_INFO) + defined (XCOFF_DEBUGGING_INFO) + defined (VMS_DEBUGGING_INFO))
+#if 1 < (defined (DBX_DEBUGGING_INFO) + defined (SDB_DEBUGGING_INFO) + defined (DWARF2_DEBUGGING_INFO) + defined (XCOFF_DEBUGGING_INFO) + defined (VMS_DEBUGGING_INFO))
 #ifndef PREFERRED_DEBUGGING_TYPE
 You Lose!  You must define PREFERRED_DEBUGGING_TYPE!
 #endif /* no PREFERRED_DEBUGGING_TYPE */

gcc/doc/invoke.texi

@@ -252,7 +252,7 @@ in the following sections.
 -feliminate-unused-debug-symbols -fmem-report -fprofile-arcs @gol
 -frandom-seed=@var{string} -fsched-verbose=@var{n} @gol
 -ftest-coverage  -ftime-report @gol
--g  -g@var{level}  -gcoff  -gdwarf  -gdwarf-1  -gdwarf-1+  -gdwarf-2 @gol
+-g  -g@var{level}  -gcoff -gdwarf-2 @gol
 -ggdb  -gstabs  -gstabs+  -gvms  -gxcoff  -gxcoff+ @gol
 -p  -pg  -print-file-name=@var{library}  -print-libgcc-file-name @gol
 -print-multi-directory  -print-multi-lib @gol
@@ -3025,8 +3025,7 @@ makes debugging work better in GDB but will probably make other debuggers
 crash or
 refuse to read the program.  If you want to control for certain whether
 to generate the extra information, use @option{-gstabs+}, @option{-gstabs},
-@option{-gxcoff+}, @option{-gxcoff}, @option{-gdwarf-1+}, @option{-gdwarf-1},
-or @option{-gvms} (see below).
+@option{-gxcoff+}, @option{-gxcoff}, or @option{-gvms} (see below).
 
 Unlike most other C compilers, GCC allows you to use @option{-g} with
 @option{-O}.  The shortcuts taken by optimized code may occasionally
@@ -3088,23 +3087,6 @@ use of these extensions is likely to make other debuggers crash or
 refuse to read the program, and may cause assemblers other than the GNU
 assembler (GAS) to fail with an error.
 
-@item -gdwarf
-@opindex gdwarf
-Produce debugging information in DWARF version 1 format (if that is
-supported).  This is the format used by SDB on most System V Release 4
-systems.
-
-This option is deprecated.
-
-@item -gdwarf+
-@opindex gdwarf+
-Produce debugging information in DWARF version 1 format (if that is
-supported), using GNU extensions understood only by the GNU debugger
-(GDB)@.  The use of these extensions is likely to make other debuggers
-crash or refuse to read the program.
-
-This option is deprecated.
-
 @item -gdwarf-2
 @opindex gdwarf-2
 Produce debugging information in DWARF version 2 format (if that is
@@ -3134,9 +3116,9 @@ present in the program.  Some debuggers support macro expansion when
 you use @option{-g3}.
 
 Note that in order to avoid confusion between DWARF1 debug level 2,
-and DWARF2, neither @option{-gdwarf} nor @option{-gdwarf-2} accept
-a concatenated debug level.  Instead use an additional @option{-g@var{level}}
-option to change the debug level for DWARF1 or DWARF2.
+and DWARF2 @option{-gdwarf-2} does not accept a concatenated debug
+level.  Instead use an additional @option{-g@var{level}} option to
+change the debug level for DWARF2.
 
 @item -feliminate-dwarf2-dups
 @opindex feliminate-dwarf2-dups

gcc/doc/tm.texi

@@ -7693,8 +7693,7 @@ defined, GCC uses @code{DBX_DEBUG}.
 
 The value of this macro only affects the default debugging output; the
 user can always get a specific type of output by using @option{-gstabs},
-@option{-gcoff}, @option{-gdwarf-1}, @option{-gdwarf-2}, @option{-gxcoff},
-or @option{-gvms}.
+@option{-gcoff}, @option{-gdwarf-2}, @option{-gxcoff}, or @option{-gvms}.
 @end defmac
 
 @node DBX Options
@@ -7970,11 +7969,6 @@ Define this macro if GCC should produce COFF-style debugging output
 for SDB in response to the @option{-g} option.
 @end defmac
 
-@defmac DWARF_DEBUGGING_INFO
-Define this macro if GCC should produce dwarf format debugging output
-in response to the @option{-g} option.
-@end defmac
-
 @defmac DWARF2_DEBUGGING_INFO
 Define this macro if GCC should produce dwarf version 2 format
 debugging output in response to the @option{-g} option.

gcc/dwarf2out.c

@@ -3872,7 +3872,7 @@ static int maybe_emit_file (int);
 
 /* Definitions of defaults for formats and names of various special
    (artificial) labels which may be generated within this file (when the -g
-   options is used and DWARF_DEBUGGING_INFO is in effect.
+   options is used and DWARF2_DEBUGGING_INFO is in effect.
    If necessary, these may be overridden from within the tm.h file, but
    typically, overriding these defaults is unnecessary.  */
 

gcc/opts.c

@@ -1459,19 +1459,6 @@ common_handle_option (size_t scode, const char *arg,
       set_debug_level (SDB_DEBUG, false, arg);
       break;
 
-    case OPT_gdwarf:
-      if (*arg)
-	{
-	  error ("use -gdwarf -gN for DWARF v1 level N, "
-		 "and -gdwarf-2 for DWARF v2" );
-	  break;
-	}
-
-      /* Fall through.  */
-    case OPT_gdwarf_:
-      set_debug_level (DWARF_DEBUG, code == OPT_gdwarf_, arg);
-      break;
-
     case OPT_gdwarf_2:
       set_debug_level (DWARF2_DEBUG, false, arg);
       break;

gcc/toplev.c

@@ -4352,10 +4352,6 @@ process_options (void)
   else if (write_symbols == SDB_DEBUG)
     debug_hooks = &sdb_debug_hooks;
 #endif
-#ifdef DWARF_DEBUGGING_INFO
-  else if (write_symbols == DWARF_DEBUG)
-    debug_hooks = &dwarf_debug_hooks;
-#endif
 #ifdef DWARF2_DEBUGGING_INFO
   else if (write_symbols == DWARF2_DEBUG)
     debug_hooks = &dwarf2_debug_hooks;