5 files changed, 8 insertions, 10 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8d243aa..f756214 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-29  Tristan Gingold  <gingold@adacore.com>
+
+	* config/tc-mep.c (md_pseudo_table): Remove dwarf2 debug pseudo
+	as they are already defined in obj-elf.c
+	* config/tc-m32c.c (md_pseudo_table): Ditto.
+	* config/tc-spu.c (md_pseudo_table): Ditto.
+	* config/tc-avr.c (md_pseudo_table): Ditto.
+
 2009-10-29  Alan Modra  <amodra@bigpond.net.au>
 
 	* doc/as.texinfo (Set): Delete incorrect HPPA para.
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index 81a34cb..9d14f64 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -241,9 +241,6 @@ static void avr_set_arch (int);
 const pseudo_typeS md_pseudo_table[] =
 {
   {"arch", avr_set_arch,	0},
-  {"file", (void (*) (int)) dwarf2_directive_file, 0},
-  {"loc", dwarf2_directive_loc, 0},
-  {"loc_mark_labels", dwarf2_directive_loc_mark_labels, 0},
   { NULL,	NULL,		0}
 };
 
diff --git a/gas/config/tc-m32c.c b/gas/config/tc-m32c.c
index 3afca23..cae3302 100644
--- a/gas/config/tc-m32c.c
+++ b/gas/config/tc-m32c.c
@@ -159,9 +159,6 @@ const pseudo_typeS md_pseudo_table[] =
   { "bss",	s_bss, 		0},
   { "3byte",	cons,		3 },
   { "word",	cons,		4 },
-  {"file",	(void (*) (int)) dwarf2_directive_file, 0},
-  {"loc",	dwarf2_directive_loc, 0},
-  {"loc_mark_labels", dwarf2_directive_loc_mark_labels, 0},
   { NULL, 	NULL, 		0 }
 };
 
diff --git a/gas/config/tc-mep.c b/gas/config/tc-mep.c
index 852e2d8..ae2463e 100644
--- a/gas/config/tc-mep.c
+++ b/gas/config/tc-mep.c
@@ -80,8 +80,6 @@ static void mep_noregerr (int);
 const pseudo_typeS md_pseudo_table[] =
 {
   { "word",	cons,	                        4 },
-  { "file",	(void (*) (int)) dwarf2_directive_file,   	0 },
-  { "loc",	dwarf2_directive_loc,   	0 },
   { "vliw", 	mep_switch_to_vliw_mode,	0 },
   { "core", 	mep_switch_to_core_mode,	0 },
   { "vtext", 	mep_s_vtext,             	0 },
diff --git a/gas/config/tc-spu.c b/gas/config/tc-spu.c
index 0d94f32..d80c621 100644
--- a/gas/config/tc-spu.c
+++ b/gas/config/tc-spu.c
@@ -101,8 +101,6 @@ const pseudo_typeS md_pseudo_table[] =
   /* Likewise for eqv.  */
   {"eqv", NULL, 0},
   {".eqv", s_set, -1},
-  {"file", (void (*) (int)) dwarf2_directive_file, 0 }, 
-  {"loc", dwarf2_directive_loc, 0}, 
   {0,0,0}
 };