diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 236007d301..16bc97ae71 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,39 @@
+2012-05-17  Doug Evans  <dje@google.com>
+
+	* Makefile.in (clean): Remove Fission .dwo and .dwp files.
+	* gdb.ada/Makefile.in (clean): Ditto.
+	* gdb.arch/Makefile.in (clean): Ditto.
+	* gdb.asm/Makefile.in (clean): Ditto.
+	* gdb.base/Makefile.in (clean): Ditto.
+	* gdb.cell/Makefile.in (clean): Ditto.
+	* gdb.cp/Makefile.in (clean): Ditto.
+	* gdb.disasm/Makefile.in (clean): Ditto.
+	* gdb.dwarf2/Makefile.in (clean): Ditto.
+	* gdb.fortran/Makefile.in (clean): Ditto.
+	* gdb.go/Makefile.in (clean): Ditto.
+	* gdb.hp/Makefile.in (clean): Ditto.
+	* gdb.hp/gdb.aCC/Makefile.in (clean): Ditto.
+	* gdb.hp/gdb.base-hp/Makefile.in (clean): Ditto.
+	* gdb.hp/gdb.compat/Makefile.in (clean): Ditto.
+	* gdb.hp/gdb.defects/Makefile.in (clean): Ditto.
+	* gdb.hp/gdb.objdbg/Makefile.in (clean): Ditto.
+	* gdb.java/Makefile.in (clean): Ditto.
+	* gdb.linespec/Makefile.in (clean): Ditto.
+	* gdb.mi/Makefile.in (clean): Ditto.
+	* gdb.modula2/Makefile.in (clean): Ditto.
+	* gdb.multi/Makefile.in (clean): Ditto.
+	* gdb.objc/Makefile.in (clean): Ditto.
+	* gdb.opencl/Makefile.in (clean): Ditto.
+	* gdb.opt/Makefile.in (clean): Ditto.
+	* gdb.pascal/Makefile.in (clean): Ditto.
+	* gdb.python/Makefile.in (clean): Ditto.
+	* gdb.reverse/Makefile.in (clean): Ditto.
+	* gdb.server/Makefile.in (clean): Ditto.
+	* gdb.stabs/Makefile.in (clean): Ditto.
+	* gdb.threads/Makefile.in (clean): Ditto.
+	* gdb.trace/Makefile.in (clean): Ditto.
+	* gdb.xml/Makefile.in (clean): Ditto.
+
 2012-05-16  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/macscp1.c (macscp_expr): Add comment.
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 6711930e40..fab124e0a4 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -215,6 +215,7 @@ subdirs:
 clean mostlyclean:
 	-rm -f *~ core *.o a.out xgdb *.x *.grt bigcore.corefile .gdb_history
 	-rm -f core.* *.tf *.cl *.py tracecommandsscript copy1.txt zzz-gdbscript
+	-rm -f *.dwo *.dwp
 	if [ x"${ALL_SUBDIRS}" != x ] ; then \
 	    for dir in ${ALL_SUBDIRS}; \
 	    do \
diff --git a/gdb/testsuite/gdb.ada/Makefile.in b/gdb/testsuite/gdb.ada/Makefile.in
index 9b8a41736f..d9a3c799aa 100644
--- a/gdb/testsuite/gdb.ada/Makefile.in
+++ b/gdb/testsuite/gdb.ada/Makefile.in
@@ -54,6 +54,8 @@ clean mostlyclean:
 	-find . -name 'b~*.ad[sb]' -print | xargs rm -f
 	-rm -f *~ a.out xgdb *.x *.ci *.tmp
 	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
+	-find . -name '*.dwo' -print | xargs rm -f
+	-find . -name '*.dwp' -print | xargs rm -f
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
 	-rm -f $(MISCELLANEOUS) twice-tmp.c
 
diff --git a/gdb/testsuite/gdb.arch/Makefile.in b/gdb/testsuite/gdb.arch/Makefile.in
index 619f78db2f..e5f8934031 100644
--- a/gdb/testsuite/gdb.arch/Makefile.in
+++ b/gdb/testsuite/gdb.arch/Makefile.in
@@ -11,6 +11,7 @@ all info install-info dvi install uninstall installcheck check:
 clean mostlyclean:
 	-rm -f *~ *.o a.out *.x *.ci *.tmp gcore.test system-gcore
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
+	-rm -f *.dwo *.dwp
 
 distclean maintainer-clean realclean: clean
 	-rm -f *~ core
diff --git a/gdb/testsuite/gdb.asm/Makefile.in b/gdb/testsuite/gdb.asm/Makefile.in
index 3e2162d2fc..f3e6e8b556 100644
--- a/gdb/testsuite/gdb.asm/Makefile.in
+++ b/gdb/testsuite/gdb.asm/Makefile.in
@@ -9,6 +9,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o a.out *.x *.ci *.tmp
+	-rm -f *.dwo *.dwp
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
 	-rm -f $(MISCELLANEOUS)
 
diff --git a/gdb/testsuite/gdb.base/Makefile.in b/gdb/testsuite/gdb.base/Makefile.in
index 7ceb121aed..ca4c9a0c8b 100644
--- a/gdb/testsuite/gdb.base/Makefile.in
+++ b/gdb/testsuite/gdb.base/Makefile.in
@@ -30,7 +30,7 @@ EXECUTABLES = a2-run advance all-types annota1 annota1-watch_thread_num \
 	sepsymtab.debug sepsymtab.stripped setshow setvar shmain shreloc \
 	sigall sigaltstack sigbpt sigchld siginfo siginfo-addr \
 	siginfo-infcall siginfo-obj signals signull sigrepeat sigstep \
-	sizeof skip skip-solib solib solib-corrupted solib-display-main
+	sizeof skip skip-solib solib solib-corrupted solib-display-main \
 	solib-nodir solib-overlap-main-0x40000000 solib-symbol-main solib-weak \
 	solib-weak-lib2 solib_sl so-impl-ld so-indr-cl \
 	stack-checking start step-break step-bt step-line step-resume-infcall \
@@ -57,6 +57,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
+	-rm -f *.dwo *.dwp
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
 	-rm -f $(MISCELLANEOUS)
 
diff --git a/gdb/testsuite/gdb.cell/Makefile.in b/gdb/testsuite/gdb.cell/Makefile.in
index 8b6675d31d..7771d61b6c 100644
--- a/gdb/testsuite/gdb.cell/Makefile.in
+++ b/gdb/testsuite/gdb.cell/Makefile.in
@@ -11,6 +11,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o a.out core corefile gcore.test
+	-rm -f *.dwo *.dwp
 	-rm -f $(EXECUTABLES) $(SPU_EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.cp/Makefile.in b/gdb/testsuite/gdb.cp/Makefile.in
index 3b7ef16156..2958e242c9 100644
--- a/gdb/testsuite/gdb.cp/Makefile.in
+++ b/gdb/testsuite/gdb.cp/Makefile.in
@@ -21,6 +21,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core ${EXECUTABLES}
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.disasm/Makefile.in b/gdb/testsuite/gdb.disasm/Makefile.in
index 34492f269d..f4830fa904 100644
--- a/gdb/testsuite/gdb.disasm/Makefile.in
+++ b/gdb/testsuite/gdb.disasm/Makefile.in
@@ -8,6 +8,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *.o *.diff *~ *.bad core h8300s hppa mn10300 sh3
+	-rm -f *.dwo *.dwp
 
 distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log gdb.log gdb.sum
diff --git a/gdb/testsuite/gdb.dwarf2/Makefile.in b/gdb/testsuite/gdb.dwarf2/Makefile.in
index 4a28738499..f89f162da9 100644
--- a/gdb/testsuite/gdb.dwarf2/Makefile.in
+++ b/gdb/testsuite/gdb.dwarf2/Makefile.in
@@ -30,6 +30,7 @@ all info install-info dvi install uninstall installcheck check:
 clean mostlyclean:
 	-rm -f *~ *.o a.out *.x *.ci *.tmp
 	-rm -f core core.coremaker coremaker.core corefile
+	-rm -f *.dwo *.dwp
 	-rm -f $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.fortran/Makefile.in b/gdb/testsuite/gdb.fortran/Makefile.in
index aaa3508950..c78a57afdb 100644
--- a/gdb/testsuite/gdb.fortran/Makefile.in
+++ b/gdb/testsuite/gdb.fortran/Makefile.in
@@ -28,6 +28,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core ${EXECUTABLES}
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.go/Makefile.in b/gdb/testsuite/gdb.go/Makefile.in
index dfce2d662d..6a1a89531f 100644
--- a/gdb/testsuite/gdb.go/Makefile.in
+++ b/gdb/testsuite/gdb.go/Makefile.in
@@ -12,6 +12,7 @@ clean mostlyclean:
 	-find . -name '*.o' -print | xargs rm -f
 	-find . -name '*.ali' -print | xargs rm -f
 	-rm -f *~ a.out
+	-rm -f *.dwo *.dwp
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.hp/Makefile.in b/gdb/testsuite/gdb.hp/Makefile.in
index a2b1b8f7f5..442dc441ae 100644
--- a/gdb/testsuite/gdb.hp/Makefile.in
+++ b/gdb/testsuite/gdb.hp/Makefile.in
@@ -16,6 +16,7 @@ check:
 
 clean mostlyclean:
 	-rm -f *~ core *.o
+	-rm -f *.dwo *.dwp
 	if [ x"${SUBDIRS}" != x ] ; then \
 	    for dir in ${SUBDIRS}; \
 	    do \
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in b/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
index dbfca95886..ff90963a41 100644
--- a/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
@@ -16,6 +16,7 @@ check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in b/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
index 2254ab45e8..633266a002 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
@@ -20,6 +20,7 @@ check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES)
 	-rm -f $(MISCELLANEOUS)
 
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in b/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
index b74fa65ace..10fc8fc478 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
@@ -16,6 +16,7 @@ check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in b/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
index b1a9284f40..feb456eaab 100644
--- a/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
@@ -16,6 +16,7 @@ check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in b/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
index 229f3aea5e..2440cf44cd 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
@@ -17,6 +17,7 @@ check:
 
 clean mostlyclean:
 	-rm -f *~ objdbg*/*.o objdbg*/*.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.java/Makefile.in b/gdb/testsuite/gdb.java/Makefile.in
index cc0b5752f8..0b0ae1a783 100644
--- a/gdb/testsuite/gdb.java/Makefile.in
+++ b/gdb/testsuite/gdb.java/Makefile.in
@@ -16,6 +16,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *.o ${OBJS}  *.class *.exe *~ core jmain jmisc jnpe jprint
+	-rm -f *.dwo *.dwp
 
 distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log gdb.log gdb.sum
diff --git a/gdb/testsuite/gdb.linespec/Makefile.in b/gdb/testsuite/gdb.linespec/Makefile.in
index 2658a241ce..18eadbe0d8 100644
--- a/gdb/testsuite/gdb.linespec/Makefile.in
+++ b/gdb/testsuite/gdb.linespec/Makefile.in
@@ -8,6 +8,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.mi/Makefile.in b/gdb/testsuite/gdb.mi/Makefile.in
index dc1f1a3fa9..3f9bbb7df6 100644
--- a/gdb/testsuite/gdb.mi/Makefile.in
+++ b/gdb/testsuite/gdb.mi/Makefile.in
@@ -23,6 +23,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *.ci *.o $(OBJS) $(PROGS) *~ core
+	-rm -f *.dwo *.dwp
 	-rm -f $(MISCELLANEOUS)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.modula2/Makefile.in b/gdb/testsuite/gdb.modula2/Makefile.in
index 5afce56eff..19b5f10aa1 100644
--- a/gdb/testsuite/gdb.modula2/Makefile.in
+++ b/gdb/testsuite/gdb.modula2/Makefile.in
@@ -27,6 +27,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core ${EXECUTABLES}
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.multi/Makefile.in b/gdb/testsuite/gdb.multi/Makefile.in
index 812ed13f66..fe26baec7b 100644
--- a/gdb/testsuite/gdb.multi/Makefile.in
+++ b/gdb/testsuite/gdb.multi/Makefile.in
@@ -8,6 +8,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.objc/Makefile.in b/gdb/testsuite/gdb.objc/Makefile.in
index 4d20c48182..c9ed32bc67 100644
--- a/gdb/testsuite/gdb.objc/Makefile.in
+++ b/gdb/testsuite/gdb.objc/Makefile.in
@@ -16,6 +16,7 @@ check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core ${EXECUTABLES}
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.opencl/Makefile.in b/gdb/testsuite/gdb.opencl/Makefile.in
index cb025ce6c7..decf413c2e 100644
--- a/gdb/testsuite/gdb.opencl/Makefile.in
+++ b/gdb/testsuite/gdb.opencl/Makefile.in
@@ -8,6 +8,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o a.out core corefile gcore.test
+	-rm -f *.dwo *.dwp
 	-rm -f $(EXECUTABLES)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.opt/Makefile.in b/gdb/testsuite/gdb.opt/Makefile.in
index 669e53b99f..76b305ecee 100644
--- a/gdb/testsuite/gdb.opt/Makefile.in
+++ b/gdb/testsuite/gdb.opt/Makefile.in
@@ -14,6 +14,7 @@ clean mostlyclean:
 	-find . -name 'b~*.ad[sb]' -print | xargs rm -f
 	-rm -f *~ a.out xgdb *.x *.ci *.tmp
 	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
+	-rm -f *.dwo *.dwp
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
 	-rm -f $(MISCELLANEOUS) twice-tmp.c
 
diff --git a/gdb/testsuite/gdb.pascal/Makefile.in b/gdb/testsuite/gdb.pascal/Makefile.in
index 0427a8f339..d9ad90059e 100644
--- a/gdb/testsuite/gdb.pascal/Makefile.in
+++ b/gdb/testsuite/gdb.pascal/Makefile.in
@@ -14,6 +14,7 @@ clean mostlyclean:
 	-find . -name 'b~*.ad[sb]' -print | xargs rm -f
 	-rm -f *~ a.out xgdb *.x *.ci *.tmp
 	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
+	-rm -f *.dwo *.dwp
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
 	-rm -f $(MISCELLANEOUS) twice-tmp.c
 
diff --git a/gdb/testsuite/gdb.python/Makefile.in b/gdb/testsuite/gdb.python/Makefile.in
index 511df95dec..4e286b539d 100644
--- a/gdb/testsuite/gdb.python/Makefile.in
+++ b/gdb/testsuite/gdb.python/Makefile.in
@@ -15,6 +15,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *~ *.o *.ci
+	-rm -f *.dwo *.dwp
 	-rm -f core $(EXECUTABLES) $(MISCELLANEOUS)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.reverse/Makefile.in b/gdb/testsuite/gdb.reverse/Makefile.in
index f5c4ff62a2..adaf7dda27 100644
--- a/gdb/testsuite/gdb.reverse/Makefile.in
+++ b/gdb/testsuite/gdb.reverse/Makefile.in
@@ -13,6 +13,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	rm -f *~ *.o *.x *.ci *.sl a.out core
+	rm -f *.dwo *.dwp
 	rm -f $(EXECUTABLES) $(MISCELLANEOUS)
 
 distclean maintainer-clean realclean: clean
diff --git a/gdb/testsuite/gdb.server/Makefile.in b/gdb/testsuite/gdb.server/Makefile.in
index eb1981e4c8..8d9a867529 100644
--- a/gdb/testsuite/gdb.server/Makefile.in
+++ b/gdb/testsuite/gdb.server/Makefile.in
@@ -14,6 +14,7 @@ clean mostlyclean:
 	-find . -name 'b~*.ad[sb]' -print | xargs rm -f
 	-rm -f *~ a.out xgdb *.x *.ci *.tmp
 	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
+	-rm -f *.dwo *.dwp
 	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
 	-rm -f $(MISCELLANEOUS) twice-tmp.c
 
diff --git a/gdb/testsuite/gdb.stabs/Makefile.in b/gdb/testsuite/gdb.stabs/Makefile.in
index 7d5755c6c7..f1a591352f 100644
--- a/gdb/testsuite/gdb.stabs/Makefile.in
+++ b/gdb/testsuite/gdb.stabs/Makefile.in
@@ -8,6 +8,7 @@ all:
 
 clean mostlyclean:
 	-rm -f *.o *~ core tmp.c tmp.s weird.s errs exclfwd gdb11479
+	-rm -f *.dwo *.dwp
 
 distclean maintainer-clean realclean: clean
 	-rm -f Makefile gdb.log gdb.sum
diff --git a/gdb/testsuite/gdb.threads/Makefile.in b/gdb/testsuite/gdb.threads/Makefile.in
index 79e4c4c879..8f9f867455 100644
--- a/gdb/testsuite/gdb.threads/Makefile.in
+++ b/gdb/testsuite/gdb.threads/Makefile.in
@@ -19,6 +19,7 @@ all info install-info dvi install uninstall installcheck check:
 clean mostlyclean:
 	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp core core.* $(EXECUTABLES) \
 	 *.core gcore.test
+	-rm -f *.dwo *.dwp
 
 distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log config.h gdb.log gdb.sum
diff --git a/gdb/testsuite/gdb.trace/Makefile.in b/gdb/testsuite/gdb.trace/Makefile.in
index 8398a75737..8a7d523da2 100644
--- a/gdb/testsuite/gdb.trace/Makefile.in
+++ b/gdb/testsuite/gdb.trace/Makefile.in
@@ -13,6 +13,7 @@ all info install-info dvi install uninstall installcheck check:
 clean mostlyclean:
 	-rm -f actions circ collection
 	-rm -f *.o *.diff *~ *.bad core sh3 hppa mn10300 $(PROGS)
+	-rm -f *.dwo *.dwp
 
 distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log gdb.log gdb.sum
diff --git a/gdb/testsuite/gdb.xml/Makefile.in b/gdb/testsuite/gdb.xml/Makefile.in
index 7143134d63..b8383ca364 100644
--- a/gdb/testsuite/gdb.xml/Makefile.in
+++ b/gdb/testsuite/gdb.xml/Makefile.in
@@ -8,6 +8,7 @@ all info install-info dvi install uninstall installcheck check:
 
 clean mostlyclean:
 	-rm -f *.ci *.o $(OBJS) $(PROGS) *~ core
+	-rm -f *.dwo *.dwp
 
 distclean maintainer-clean realclean: clean
 	-rm -f Makefile gdb.log gdb.sum