Move .file and .loc pseudo ops into obj-elf.c

19 files changed, 4 insertions, 60 deletions

diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index ac836d7..18cf50d 100644
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -25,6 +25,7 @@
 #include "subsegs.h"
 #include "obstack.h"
 #include "struc-symbol.h"
+#include "dwarf2dbg.h"
 
 #ifndef ECOFF_DEBUGGING
 #define ECOFF_DEBUGGING 0
@@ -126,6 +127,9 @@ static const pseudo_typeS elf_pseudo_table[] =
   {"2byte", cons, 2},
   {"4byte", cons, 4},
   {"8byte", cons, 8},
+  /* These are used for dwarf2.  */
+  { "file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
+  { "loc",  dwarf2_directive_loc,  0 },
 
   /* We need to trap the section changing calls to handle .previous.  */
   {"data", obj_elf_data, 0},
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 01709e9..67121b2 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -94,8 +94,6 @@ const pseudo_typeS md_pseudo_table[] = {
   { "option", arc_option, 0 },
   { "cpu", arc_option, 0 },
   { "block", s_space, 0 },
-  { "file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  { "loc", dwarf2_directive_loc, 0 },
   { "extcondcode", arc_extoper, 0 },
   { "extcoreregister", arc_extoper, 1 },
   { "extauxregister", arc_extoper, 2 },
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 484acb5..85b2b05 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -2345,8 +2345,6 @@ const pseudo_typeS md_pseudo_table[] =
 #ifdef OBJ_ELF
   { "word",        s_arm_elf_cons, 4 },
   { "long",        s_arm_elf_cons, 4 },
-  { "file",        (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  { "loc",         dwarf2_directive_loc,  0 },
 #else
   { "word",        cons, 4},
 #endif
diff --git a/gas/config/tc-frv.c b/gas/config/tc-frv.c
index f4b5bbd..2b8d3ea 100644
--- a/gas/config/tc-frv.c
+++ b/gas/config/tc-frv.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include "as.h"
-#include "dwarf2dbg.h"
 #include "subsegs.h"     
 #include "symcat.h"
 #include "opcodes/frv-desc.h"
@@ -185,8 +184,6 @@ const pseudo_typeS md_pseudo_table[] =
   { "eflags",	frv_set_flags,		0 },
   { "word",	cons,			4 },
   { "picptr",	frv_pic_ptr,		4 },
-  { "file",	(void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  { "loc",	dwarf2_directive_loc,	0 },
   { NULL, 	NULL,			0 }
 };
 
diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index 280a7f6..9319033 100644
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -151,11 +151,6 @@ const pseudo_typeS md_pseudo_table[] =
   {"sbranch", sbranch, L_8},
   {"lbranch", sbranch, L_16},
 
-#ifdef BFD_ASSEMBLER
-  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  {"loc", dwarf2_directive_loc, 0 },
-#endif
-
   {"int", pint, 0},
   {"data.b", cons, 1},
   {"data.w", cons, 2},
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 0a3382e..3212ead 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -670,9 +670,6 @@ const pseudo_typeS md_pseudo_table[] =
   {"equ", pa_equ, 0},
   {"exit", pa_exit, 0},
   {"export", pa_export, 0},
-#ifdef OBJ_ELF
-  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-#endif
   {"fill", pa_fill, 0},
   {"float", pa_float_cons, 'f'},
   {"half", pa_cons, 2},
@@ -682,9 +679,6 @@ const pseudo_typeS md_pseudo_table[] =
   {"lcomm", pa_lcomm, 0},
   {"leave", pa_leave, 0},
   {"level", pa_level, 0},
-#ifdef OBJ_ELF
-  {"loc", dwarf2_directive_loc, 0 },
-#endif
   {"long", pa_cons, 4},
   {"lsym", pa_lsym, 0},
 #ifdef OBJ_SOM
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 9be19b9..eb77131 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -4874,8 +4874,6 @@ const pseudo_typeS md_pseudo_table[] =
     { "body", dot_body, 0 },
     { "prologue", dot_prologue, 0 },
     { "endp", dot_endp, 0 },
-    { "file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-    { "loc", dwarf2_directive_loc, 0 },
 
     { "fframe", dot_fframe, 0 },
     { "vframe", dot_vframe, 0 },
diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
index 10f9895..6aef335 100644
--- a/gas/config/tc-ip2k.c
+++ b/gas/config/tc-ip2k.c
@@ -22,7 +22,6 @@
 #include <ctype.h>
 
 #include "as.h"
-#include "dwarf2dbg.h"
 #include "subsegs.h"     
 #include "symcat.h"
 #include "opcodes/ip2k-desc.h"
@@ -66,8 +65,6 @@ static void ip2k_elf_section_rtn (int);
 /* The target specific pseudo-ops which we support.  */
 const pseudo_typeS md_pseudo_table[] =
 {
-    { "file",	(void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-    { "loc",	dwarf2_directive_loc,	0 },
     { "text",   ip2k_elf_section_text,  0 },
     { "sect",   ip2k_elf_section_rtn,   0 },
     { NULL, 	NULL,			0 }
diff --git a/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c
index 58aa5c9..806b802 100644
--- a/gas/config/tc-iq2000.c
+++ b/gas/config/tc-iq2000.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include "as.h"
 #include "safe-ctype.h"
-#include "dwarf2dbg.h"
 #include "subsegs.h"     
 #include "symcat.h"
 #include "opcodes/iq2000-desc.h"
@@ -103,8 +102,6 @@ const pseudo_typeS md_pseudo_table[] =
 {
     { "align",  s_align_bytes,           0 },
     { "word",   cons,                    4 },
-    { "file",	dwarf2_directive_file,	 0 },
-    { "loc",	dwarf2_directive_loc,	 0 },
     { "rdata",  s_change_sec, 		'r'},
     { "sdata",  s_change_sec, 		's'},
     { "set",	s_iq2000_set,		 0 },
diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
index ec349b6..3740419 100644
--- a/gas/config/tc-m68hc11.c
+++ b/gas/config/tc-m68hc11.c
@@ -268,10 +268,6 @@ const pseudo_typeS md_pseudo_table[] = {
   {"fcc", stringer, 1},
   {"rmb", s_space, 0},
 
-  /* Dwarf2 support for Gcc.  */
-  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0},
-  {"loc", dwarf2_directive_loc, 0},
-
   /* Motorola ALIS.  */
   {"xrefb", s_ignore, 0}, /* Same as xref  */
 
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 0caf694..d913dc6 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -554,12 +554,6 @@ const pseudo_typeS md_pseudo_table[] =
   {"extend", float_cons, 'x'},
   {"ldouble", float_cons, 'x'},
 
-#ifdef OBJ_ELF
-  /* Dwarf2 support for Gcc.  */
-  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0},
-  {"loc", dwarf2_directive_loc, 0},
-#endif
-
   /* The following pseudo-ops are supported for MRI compatibility.  */
   {"chip", s_chip, 0},
   {"comline", s_space, 1},
diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
index c6ce34f..7483159 100644
--- a/gas/config/tc-mmix.c
+++ b/gas/config/tc-mmix.c
@@ -343,10 +343,6 @@ const pseudo_typeS md_pseudo_table[] =
    /* Support " .local $45" syntax.  */
    {"local", mmix_s_local, 1},
 
-   /* Support DWARF2 debugging info.  */
-   {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0},
-   {"loc", dwarf2_directive_loc, 0},
-
    {NULL, 0, 0}
  };
 
diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
index c011bfb..5595c76 100644
--- a/gas/config/tc-mn10300.c
+++ b/gas/config/tc-mn10300.c
@@ -125,8 +125,6 @@ size_t md_longopts_size = sizeof (md_longopts);
 /* The target specific pseudo-ops which we support.  */
 const pseudo_typeS md_pseudo_table[] =
 {
-  { "file",     (void (*) PARAMS ((int))) dwarf2_directive_file,  0 },
-  { "loc",      dwarf2_directive_loc,   0 },
   { "am30",	set_arch_mach,		AM30 },
   { "am33",	set_arch_mach,		AM33 },
   { "mn10300",	set_arch_mach,		MN103 },
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 6b62e6b..93739e0 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -237,8 +237,6 @@ const pseudo_typeS md_pseudo_table[] =
   { "rdata",	ppc_elf_rdata,	0 },
   { "rodata",	ppc_elf_rdata,	0 },
   { "lcomm",	ppc_elf_lcomm,	0 },
-  { "file",	(void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  { "loc",	dwarf2_directive_loc, 0 },
 #endif
 
 #ifdef TE_PE
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 8c58ce3..506ae2f 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -136,10 +136,6 @@ const pseudo_typeS md_pseudo_table[] =
   {"2byte", s_uacons, 2},
   {"4byte", s_uacons, 4},
   {"8byte", s_uacons, 8},
-#ifdef BFD_ASSEMBLER
-  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  {"loc", dwarf2_directive_loc, 0 },
-#endif
 #ifdef HAVE_SH64
   {"mode", s_sh64_mode, 0 },
 
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 49a50e7..3156883 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -161,8 +161,6 @@ const pseudo_typeS md_pseudo_table[] =
   {"uaword", s_uacons, 4},
   {"uaxword", s_uacons, 8},
 #ifdef OBJ_ELF
-  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0},
-  {"loc", dwarf2_directive_loc, 0},
   /* These are specific to sparc/svr4.  */
   {"2byte", s_uacons, 2},
   {"4byte", s_uacons, 4},
diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c
index 13e4900..59b68e1 100644
--- a/gas/config/tc-v850.c
+++ b/gas/config/tc-v850.c
@@ -539,8 +539,6 @@ const pseudo_typeS md_pseudo_table[] =
   { "call_table_data",	v850_seg,		CALL_TABLE_DATA_SECTION	},
   { "call_table_text",	v850_seg,		CALL_TABLE_TEXT_SECTION	},
   { "v850e",		set_machine,		bfd_mach_v850e		},
-  { "file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  { "loc",		dwarf2_directive_loc,	0			},
   { "longcall",         v850_longcode,          1                       },
   { "longjump",         v850_longcode,          2                       },
   { NULL,		NULL,			0			}
diff --git a/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c
index c899860..df98920 100644
--- a/gas/config/tc-xstormy16.c
+++ b/gas/config/tc-xstormy16.c
@@ -25,7 +25,6 @@
 #include "opcodes/xstormy16-desc.h"
 #include "opcodes/xstormy16-opc.h"
 #include "cgen.h"
-#include "dwarf2dbg.h"
 
 /* Structure to hold all of the different components describing
    an individual instruction.  */
@@ -85,8 +84,6 @@ md_show_usage (stream)
 const pseudo_typeS md_pseudo_table[] =
 {
   { "word",	cons,		4 },
-  { "file",     (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-  { "loc",      dwarf2_directive_loc,  0 },
   { NULL, 	NULL, 		0 }
 };
 
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 32a04be..b4ea9e8 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -27,7 +27,6 @@
 #include "subsegs.h"
 #include "xtensa-relax.h"
 #include "xtensa-istack.h"
-#include "dwarf2dbg.h"
 #include "struc-symbol.h"
 #include "xtensa-config.h"
 
@@ -1115,8 +1114,6 @@ const pseudo_typeS md_pseudo_table[] =
   {"word", cons, 4},
   {"begin", xtensa_begin_directive, 0},
   {"end", xtensa_end_directive, 0},
-  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0},
-  {"loc", dwarf2_directive_loc, 0},
   {"literal", xtensa_literal_pseudo, 0},
   {NULL, 0, 0},
 };
@@ -4078,8 +4075,6 @@ xg_emit_insn (t_insn, record_fix)
 
   xtensa_insnbuf_to_chars (isa, insnbuf, f);
 
-  /* dwarf2_emit_insn (byte_count); */
-
   /* Now spit out the opcode fixup.... */
   if (!has_fixup)
     return !ok;