Synced repos to: 60642
diff --git a/binutils/binutils-2.21/COPYING b/COPYING
similarity index 100%
rename from binutils/binutils-2.21/COPYING
rename to COPYING
diff --git a/binutils/binutils-2.21/COPYING.LIB b/COPYING.LIB
similarity index 100%
rename from binutils/binutils-2.21/COPYING.LIB
rename to COPYING.LIB
diff --git a/binutils/binutils-2.21/COPYING3 b/COPYING3
similarity index 100%
rename from binutils/binutils-2.21/COPYING3
rename to COPYING3
diff --git a/binutils/binutils-2.21/COPYING3.LIB b/COPYING3.LIB
similarity index 100%
rename from binutils/binutils-2.21/COPYING3.LIB
rename to COPYING3.LIB
diff --git a/binutils/binutils-2.21/ChangeLog b/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/ChangeLog
rename to ChangeLog
diff --git a/binutils/binutils-2.21/MAINTAINERS b/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/MAINTAINERS
rename to MAINTAINERS
diff --git a/binutils/binutils-2.21/Makefile.def b/Makefile.def
similarity index 100%
rename from binutils/binutils-2.21/Makefile.def
rename to Makefile.def
diff --git a/binutils/binutils-2.21/Makefile.in b/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/Makefile.in
rename to Makefile.in
diff --git a/binutils/binutils-2.21/Makefile.tpl b/Makefile.tpl
similarity index 100%
rename from binutils/binutils-2.21/Makefile.tpl
rename to Makefile.tpl
diff --git a/binutils/binutils-2.21/README b/README
similarity index 100%
rename from binutils/binutils-2.21/README
rename to README
diff --git a/binutils/binutils-2.21/README-maintainer-mode b/README-maintainer-mode
similarity index 100%
rename from binutils/binutils-2.21/README-maintainer-mode
rename to README-maintainer-mode
diff --git a/binutils/binutils-2.21/bfd/COPYING b/bfd/COPYING
similarity index 100%
rename from binutils/binutils-2.21/bfd/COPYING
rename to bfd/COPYING
diff --git a/binutils/binutils-2.21/bfd/ChangeLog b/bfd/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog
rename to bfd/ChangeLog
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-0001 b/bfd/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-0001
rename to bfd/ChangeLog-0001
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-0203 b/bfd/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-0203
rename to bfd/ChangeLog-0203
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2004 b/bfd/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2004
rename to bfd/ChangeLog-2004
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2005 b/bfd/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2005
rename to bfd/ChangeLog-2005
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2006 b/bfd/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2006
rename to bfd/ChangeLog-2006
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2007 b/bfd/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2007
rename to bfd/ChangeLog-2007
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2008 b/bfd/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2008
rename to bfd/ChangeLog-2008
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-2009 b/bfd/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-2009
rename to bfd/ChangeLog-2009
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9193 b/bfd/ChangeLog-9193
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9193
rename to bfd/ChangeLog-9193
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9495 b/bfd/ChangeLog-9495
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9495
rename to bfd/ChangeLog-9495
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9697 b/bfd/ChangeLog-9697
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9697
rename to bfd/ChangeLog-9697
diff --git a/binutils/binutils-2.21/bfd/ChangeLog-9899 b/bfd/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/bfd/ChangeLog-9899
rename to bfd/ChangeLog-9899
diff --git a/binutils/binutils-2.21/bfd/MAINTAINERS b/bfd/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/bfd/MAINTAINERS
rename to bfd/MAINTAINERS
diff --git a/binutils/binutils-2.21/bfd/Makefile.am b/bfd/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/bfd/Makefile.am
rename to bfd/Makefile.am
diff --git a/binutils/binutils-2.21/bfd/Makefile.in b/bfd/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/Makefile.in
rename to bfd/Makefile.in
diff --git a/binutils/binutils-2.21/bfd/PORTING b/bfd/PORTING
similarity index 100%
rename from binutils/binutils-2.21/bfd/PORTING
rename to bfd/PORTING
diff --git a/binutils/binutils-2.21/bfd/README b/bfd/README
similarity index 100%
rename from binutils/binutils-2.21/bfd/README
rename to bfd/README
diff --git a/binutils/binutils-2.21/bfd/TODO b/bfd/TODO
similarity index 100%
rename from binutils/binutils-2.21/bfd/TODO
rename to bfd/TODO
diff --git a/binutils/binutils-2.21/bfd/acinclude.m4 b/bfd/acinclude.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/acinclude.m4
rename to bfd/acinclude.m4
diff --git a/binutils/binutils-2.21/bfd/aclocal.m4 b/bfd/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/aclocal.m4
rename to bfd/aclocal.m4
diff --git a/binutils/binutils-2.21/bfd/aix386-core.c b/bfd/aix386-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aix386-core.c
rename to bfd/aix386-core.c
diff --git a/binutils/binutils-2.21/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aix5ppc-core.c
rename to bfd/aix5ppc-core.c
diff --git a/binutils/binutils-2.21/bfd/aout-adobe.c b/bfd/aout-adobe.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-adobe.c
rename to bfd/aout-adobe.c
diff --git a/binutils/binutils-2.21/bfd/aout-arm.c b/bfd/aout-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-arm.c
rename to bfd/aout-arm.c
diff --git a/binutils/binutils-2.21/bfd/aout-cris.c b/bfd/aout-cris.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-cris.c
rename to bfd/aout-cris.c
diff --git a/binutils/binutils-2.21/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-ns32k.c
rename to bfd/aout-ns32k.c
diff --git a/binutils/binutils-2.21/bfd/aout-sparcle.c b/bfd/aout-sparcle.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-sparcle.c
rename to bfd/aout-sparcle.c
diff --git a/binutils/binutils-2.21/bfd/aout-target.h b/bfd/aout-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-target.h
rename to bfd/aout-target.h
diff --git a/binutils/binutils-2.21/bfd/aout-tic30.c b/bfd/aout-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout-tic30.c
rename to bfd/aout-tic30.c
diff --git a/binutils/binutils-2.21/bfd/aout0.c b/bfd/aout0.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout0.c
rename to bfd/aout0.c
diff --git a/binutils/binutils-2.21/bfd/aout32.c b/bfd/aout32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout32.c
rename to bfd/aout32.c
diff --git a/binutils/binutils-2.21/bfd/aout64.c b/bfd/aout64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/aout64.c
rename to bfd/aout64.c
diff --git a/binutils/binutils-2.21/bfd/aoutf1.h b/bfd/aoutf1.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/aoutf1.h
rename to bfd/aoutf1.h
diff --git a/binutils/binutils-2.21/bfd/aoutx.h b/bfd/aoutx.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/aoutx.h
rename to bfd/aoutx.h
diff --git a/binutils/binutils-2.21/bfd/archive.c b/bfd/archive.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/archive.c
rename to bfd/archive.c
diff --git a/binutils/binutils-2.21/bfd/archive64.c b/bfd/archive64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/archive64.c
rename to bfd/archive64.c
diff --git a/binutils/binutils-2.21/bfd/archures.c b/bfd/archures.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/archures.c
rename to bfd/archures.c
diff --git a/binutils/binutils-2.21/bfd/armnetbsd.c b/bfd/armnetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/armnetbsd.c
rename to bfd/armnetbsd.c
diff --git a/binutils/binutils-2.21/bfd/bfd-in.h b/bfd/bfd-in.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd-in.h
rename to bfd/bfd-in.h
diff --git a/binutils/binutils-2.21/bfd/bfd-in2.h b/bfd/bfd-in2.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd-in2.h
rename to bfd/bfd-in2.h
diff --git a/binutils/binutils-2.21/bfd/bfd.c b/bfd/bfd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd.c
rename to bfd/bfd.c
diff --git a/binutils/binutils-2.21/bfd/bfd.m4 b/bfd/bfd.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfd.m4
rename to bfd/bfd.m4
diff --git a/binutils/binutils-2.21/bfd/bfdio.c b/bfd/bfdio.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfdio.c
rename to bfd/bfdio.c
diff --git a/binutils/binutils-2.21/bfd/bfdwin.c b/bfd/bfdwin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bfdwin.c
rename to bfd/bfdwin.c
diff --git a/binutils/binutils-2.21/bfd/binary.c b/bfd/binary.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/binary.c
rename to bfd/binary.c
diff --git a/binutils/binutils-2.21/bfd/bout.c b/bfd/bout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/bout.c
rename to bfd/bout.c
diff --git a/binutils/binutils-2.21/bfd/cache.c b/bfd/cache.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cache.c
rename to bfd/cache.c
diff --git a/binutils/binutils-2.21/bfd/cf-i386lynx.c b/bfd/cf-i386lynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cf-i386lynx.c
rename to bfd/cf-i386lynx.c
diff --git a/binutils/binutils-2.21/bfd/cf-sparclynx.c b/bfd/cf-sparclynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cf-sparclynx.c
rename to bfd/cf-sparclynx.c
diff --git a/binutils/binutils-2.21/bfd/cisco-core.c b/bfd/cisco-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cisco-core.c
rename to bfd/cisco-core.c
diff --git a/binutils/binutils-2.21/bfd/coff-alpha.c b/bfd/coff-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-alpha.c
rename to bfd/coff-alpha.c
diff --git a/binutils/binutils-2.21/bfd/coff-apollo.c b/bfd/coff-apollo.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-apollo.c
rename to bfd/coff-apollo.c
diff --git a/binutils/binutils-2.21/bfd/coff-arm.c b/bfd/coff-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-arm.c
rename to bfd/coff-arm.c
diff --git a/binutils/binutils-2.21/bfd/coff-aux.c b/bfd/coff-aux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-aux.c
rename to bfd/coff-aux.c
diff --git a/binutils/binutils-2.21/bfd/coff-go32.c b/bfd/coff-go32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-go32.c
rename to bfd/coff-go32.c
diff --git a/binutils/binutils-2.21/bfd/coff-h8300.c b/bfd/coff-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-h8300.c
rename to bfd/coff-h8300.c
diff --git a/binutils/binutils-2.21/bfd/coff-h8500.c b/bfd/coff-h8500.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-h8500.c
rename to bfd/coff-h8500.c
diff --git a/binutils/binutils-2.21/bfd/coff-i386.c b/bfd/coff-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-i386.c
rename to bfd/coff-i386.c
diff --git a/binutils/binutils-2.21/bfd/coff-i860.c b/bfd/coff-i860.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-i860.c
rename to bfd/coff-i860.c
diff --git a/binutils/binutils-2.21/bfd/coff-i960.c b/bfd/coff-i960.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-i960.c
rename to bfd/coff-i960.c
diff --git a/binutils/binutils-2.21/bfd/coff-ia64.c b/bfd/coff-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-ia64.c
rename to bfd/coff-ia64.c
diff --git a/binutils/binutils-2.21/bfd/coff-m68k.c b/bfd/coff-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-m68k.c
rename to bfd/coff-m68k.c
diff --git a/binutils/binutils-2.21/bfd/coff-m88k.c b/bfd/coff-m88k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-m88k.c
rename to bfd/coff-m88k.c
diff --git a/binutils/binutils-2.21/bfd/coff-mcore.c b/bfd/coff-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-mcore.c
rename to bfd/coff-mcore.c
diff --git a/binutils/binutils-2.21/bfd/coff-mips.c b/bfd/coff-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-mips.c
rename to bfd/coff-mips.c
diff --git a/binutils/binutils-2.21/bfd/coff-or32.c b/bfd/coff-or32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-or32.c
rename to bfd/coff-or32.c
diff --git a/binutils/binutils-2.21/bfd/coff-pmac.c b/bfd/coff-pmac.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-pmac.c
rename to bfd/coff-pmac.c
diff --git a/binutils/binutils-2.21/bfd/coff-ppc.c b/bfd/coff-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-ppc.c
rename to bfd/coff-ppc.c
diff --git a/binutils/binutils-2.21/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-rs6000.c
rename to bfd/coff-rs6000.c
diff --git a/binutils/binutils-2.21/bfd/coff-sh.c b/bfd/coff-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-sh.c
rename to bfd/coff-sh.c
diff --git a/binutils/binutils-2.21/bfd/coff-sparc.c b/bfd/coff-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-sparc.c
rename to bfd/coff-sparc.c
diff --git a/binutils/binutils-2.21/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-stgo32.c
rename to bfd/coff-stgo32.c
diff --git a/binutils/binutils-2.21/bfd/coff-svm68k.c b/bfd/coff-svm68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-svm68k.c
rename to bfd/coff-svm68k.c
diff --git a/binutils/binutils-2.21/bfd/coff-tic30.c b/bfd/coff-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic30.c
rename to bfd/coff-tic30.c
diff --git a/binutils/binutils-2.21/bfd/coff-tic4x.c b/bfd/coff-tic4x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic4x.c
rename to bfd/coff-tic4x.c
diff --git a/binutils/binutils-2.21/bfd/coff-tic54x.c b/bfd/coff-tic54x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic54x.c
rename to bfd/coff-tic54x.c
diff --git a/binutils/binutils-2.21/bfd/coff-tic80.c b/bfd/coff-tic80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-tic80.c
rename to bfd/coff-tic80.c
diff --git a/binutils/binutils-2.21/bfd/coff-u68k.c b/bfd/coff-u68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-u68k.c
rename to bfd/coff-u68k.c
diff --git a/binutils/binutils-2.21/bfd/coff-w65.c b/bfd/coff-w65.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-w65.c
rename to bfd/coff-w65.c
diff --git a/binutils/binutils-2.21/bfd/coff-we32k.c b/bfd/coff-we32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-we32k.c
rename to bfd/coff-we32k.c
diff --git a/binutils/binutils-2.21/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-x86_64.c
rename to bfd/coff-x86_64.c
diff --git a/binutils/binutils-2.21/bfd/coff-z80.c b/bfd/coff-z80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-z80.c
rename to bfd/coff-z80.c
diff --git a/binutils/binutils-2.21/bfd/coff-z8k.c b/bfd/coff-z8k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff-z8k.c
rename to bfd/coff-z8k.c
diff --git a/binutils/binutils-2.21/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coff64-rs6000.c
rename to bfd/coff64-rs6000.c
diff --git a/binutils/binutils-2.21/bfd/coffcode.h b/bfd/coffcode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/coffcode.h
rename to bfd/coffcode.h
diff --git a/binutils/binutils-2.21/bfd/coffgen.c b/bfd/coffgen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/coffgen.c
rename to bfd/coffgen.c
diff --git a/binutils/binutils-2.21/bfd/cofflink.c b/bfd/cofflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cofflink.c
rename to bfd/cofflink.c
diff --git a/binutils/binutils-2.21/bfd/coffswap.h b/bfd/coffswap.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/coffswap.h
rename to bfd/coffswap.h
diff --git a/binutils/binutils-2.21/bfd/compress.c b/bfd/compress.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/compress.c
rename to bfd/compress.c
diff --git a/binutils/binutils-2.21/bfd/config.bfd b/bfd/config.bfd
similarity index 100%
rename from binutils/binutils-2.21/bfd/config.bfd
rename to bfd/config.bfd
diff --git a/binutils/binutils-2.21/bfd/config.in b/bfd/config.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/config.in
rename to bfd/config.in
diff --git a/binutils/binutils-2.21/bfd/configure b/bfd/configure
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure
rename to bfd/configure
diff --git a/binutils/binutils-2.21/bfd/configure.com b/bfd/configure.com
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure.com
rename to bfd/configure.com
diff --git a/binutils/binutils-2.21/bfd/configure.host b/bfd/configure.host
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure.host
rename to bfd/configure.host
diff --git a/binutils/binutils-2.21/bfd/configure.in b/bfd/configure.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/configure.in
rename to bfd/configure.in
diff --git a/binutils/binutils-2.21/bfd/corefile.c b/bfd/corefile.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/corefile.c
rename to bfd/corefile.c
diff --git a/binutils/binutils-2.21/bfd/cpu-alpha.c b/bfd/cpu-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-alpha.c
rename to bfd/cpu-alpha.c
diff --git a/binutils/binutils-2.21/bfd/cpu-arc.c b/bfd/cpu-arc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-arc.c
rename to bfd/cpu-arc.c
diff --git a/binutils/binutils-2.21/bfd/cpu-arm.c b/bfd/cpu-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-arm.c
rename to bfd/cpu-arm.c
diff --git a/binutils/binutils-2.21/bfd/cpu-avr.c b/bfd/cpu-avr.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-avr.c
rename to bfd/cpu-avr.c
diff --git a/binutils/binutils-2.21/bfd/cpu-bfin.c b/bfd/cpu-bfin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-bfin.c
rename to bfd/cpu-bfin.c
diff --git a/binutils/binutils-2.21/bfd/cpu-cr16.c b/bfd/cpu-cr16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-cr16.c
rename to bfd/cpu-cr16.c
diff --git a/binutils/binutils-2.21/bfd/cpu-cr16c.c b/bfd/cpu-cr16c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-cr16c.c
rename to bfd/cpu-cr16c.c
diff --git a/binutils/binutils-2.21/bfd/cpu-cris.c b/bfd/cpu-cris.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-cris.c
rename to bfd/cpu-cris.c
diff --git a/binutils/binutils-2.21/bfd/cpu-crx.c b/bfd/cpu-crx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-crx.c
rename to bfd/cpu-crx.c
diff --git a/binutils/binutils-2.21/bfd/cpu-d10v.c b/bfd/cpu-d10v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-d10v.c
rename to bfd/cpu-d10v.c
diff --git a/binutils/binutils-2.21/bfd/cpu-d30v.c b/bfd/cpu-d30v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-d30v.c
rename to bfd/cpu-d30v.c
diff --git a/binutils/binutils-2.21/bfd/cpu-dlx.c b/bfd/cpu-dlx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-dlx.c
rename to bfd/cpu-dlx.c
diff --git a/binutils/binutils-2.21/bfd/cpu-fr30.c b/bfd/cpu-fr30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-fr30.c
rename to bfd/cpu-fr30.c
diff --git a/binutils/binutils-2.21/bfd/cpu-frv.c b/bfd/cpu-frv.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-frv.c
rename to bfd/cpu-frv.c
diff --git a/binutils/binutils-2.21/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-h8300.c
rename to bfd/cpu-h8300.c
diff --git a/binutils/binutils-2.21/bfd/cpu-h8500.c b/bfd/cpu-h8500.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-h8500.c
rename to bfd/cpu-h8500.c
diff --git a/binutils/binutils-2.21/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-hppa.c
rename to bfd/cpu-hppa.c
diff --git a/binutils/binutils-2.21/bfd/cpu-i370.c b/bfd/cpu-i370.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i370.c
rename to bfd/cpu-i370.c
diff --git a/binutils/binutils-2.21/bfd/cpu-i386.c b/bfd/cpu-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i386.c
rename to bfd/cpu-i386.c
diff --git a/binutils/binutils-2.21/bfd/cpu-i860.c b/bfd/cpu-i860.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i860.c
rename to bfd/cpu-i860.c
diff --git a/binutils/binutils-2.21/bfd/cpu-i960.c b/bfd/cpu-i960.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-i960.c
rename to bfd/cpu-i960.c
diff --git a/binutils/binutils-2.21/bfd/cpu-ia64-opc.c b/bfd/cpu-ia64-opc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ia64-opc.c
rename to bfd/cpu-ia64-opc.c
diff --git a/binutils/binutils-2.21/bfd/cpu-ia64.c b/bfd/cpu-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ia64.c
rename to bfd/cpu-ia64.c
diff --git a/binutils/binutils-2.21/bfd/cpu-ip2k.c b/bfd/cpu-ip2k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ip2k.c
rename to bfd/cpu-ip2k.c
diff --git a/binutils/binutils-2.21/bfd/cpu-iq2000.c b/bfd/cpu-iq2000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-iq2000.c
rename to bfd/cpu-iq2000.c
diff --git a/binutils/binutils-2.21/bfd/cpu-l1om.c b/bfd/cpu-l1om.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-l1om.c
rename to bfd/cpu-l1om.c
diff --git a/binutils/binutils-2.21/bfd/cpu-lm32.c b/bfd/cpu-lm32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-lm32.c
rename to bfd/cpu-lm32.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m10200.c b/bfd/cpu-m10200.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m10200.c
rename to bfd/cpu-m10200.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m10300.c b/bfd/cpu-m10300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m10300.c
rename to bfd/cpu-m10300.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m32c.c b/bfd/cpu-m32c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m32c.c
rename to bfd/cpu-m32c.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m32r.c b/bfd/cpu-m32r.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m32r.c
rename to bfd/cpu-m32r.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m68hc11.c b/bfd/cpu-m68hc11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m68hc11.c
rename to bfd/cpu-m68hc11.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m68hc12.c b/bfd/cpu-m68hc12.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m68hc12.c
rename to bfd/cpu-m68hc12.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m68k.c
rename to bfd/cpu-m68k.c
diff --git a/binutils/binutils-2.21/bfd/cpu-m88k.c b/bfd/cpu-m88k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-m88k.c
rename to bfd/cpu-m88k.c
diff --git a/binutils/binutils-2.21/bfd/cpu-mcore.c b/bfd/cpu-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mcore.c
rename to bfd/cpu-mcore.c
diff --git a/binutils/binutils-2.21/bfd/cpu-mep.c b/bfd/cpu-mep.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mep.c
rename to bfd/cpu-mep.c
diff --git a/binutils/binutils-2.21/bfd/cpu-microblaze.c b/bfd/cpu-microblaze.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-microblaze.c
rename to bfd/cpu-microblaze.c
diff --git a/binutils/binutils-2.21/bfd/cpu-mips.c b/bfd/cpu-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mips.c
rename to bfd/cpu-mips.c
diff --git a/binutils/binutils-2.21/bfd/cpu-mmix.c b/bfd/cpu-mmix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mmix.c
rename to bfd/cpu-mmix.c
diff --git a/binutils/binutils-2.21/bfd/cpu-moxie.c b/bfd/cpu-moxie.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-moxie.c
rename to bfd/cpu-moxie.c
diff --git a/binutils/binutils-2.21/bfd/cpu-msp430.c b/bfd/cpu-msp430.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-msp430.c
rename to bfd/cpu-msp430.c
diff --git a/binutils/binutils-2.21/bfd/cpu-mt.c b/bfd/cpu-mt.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-mt.c
rename to bfd/cpu-mt.c
diff --git a/binutils/binutils-2.21/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-ns32k.c
rename to bfd/cpu-ns32k.c
diff --git a/binutils/binutils-2.21/bfd/cpu-openrisc.c b/bfd/cpu-openrisc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-openrisc.c
rename to bfd/cpu-openrisc.c
diff --git a/binutils/binutils-2.21/bfd/cpu-or32.c b/bfd/cpu-or32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-or32.c
rename to bfd/cpu-or32.c
diff --git a/binutils/binutils-2.21/bfd/cpu-pdp11.c b/bfd/cpu-pdp11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-pdp11.c
rename to bfd/cpu-pdp11.c
diff --git a/binutils/binutils-2.21/bfd/cpu-pj.c b/bfd/cpu-pj.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-pj.c
rename to bfd/cpu-pj.c
diff --git a/binutils/binutils-2.21/bfd/cpu-plugin.c b/bfd/cpu-plugin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-plugin.c
rename to bfd/cpu-plugin.c
diff --git a/binutils/binutils-2.21/bfd/cpu-powerpc.c b/bfd/cpu-powerpc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-powerpc.c
rename to bfd/cpu-powerpc.c
diff --git a/binutils/binutils-2.21/bfd/cpu-rs6000.c b/bfd/cpu-rs6000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-rs6000.c
rename to bfd/cpu-rs6000.c
diff --git a/binutils/binutils-2.21/bfd/cpu-rx.c b/bfd/cpu-rx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-rx.c
rename to bfd/cpu-rx.c
diff --git a/binutils/binutils-2.21/bfd/cpu-s390.c b/bfd/cpu-s390.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-s390.c
rename to bfd/cpu-s390.c
diff --git a/binutils/binutils-2.21/bfd/cpu-score.c b/bfd/cpu-score.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-score.c
rename to bfd/cpu-score.c
diff --git a/binutils/binutils-2.21/bfd/cpu-sh.c b/bfd/cpu-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-sh.c
rename to bfd/cpu-sh.c
diff --git a/binutils/binutils-2.21/bfd/cpu-sparc.c b/bfd/cpu-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-sparc.c
rename to bfd/cpu-sparc.c
diff --git a/binutils/binutils-2.21/bfd/cpu-spu.c b/bfd/cpu-spu.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-spu.c
rename to bfd/cpu-spu.c
diff --git a/binutils/binutils-2.21/bfd/cpu-tic30.c b/bfd/cpu-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic30.c
rename to bfd/cpu-tic30.c
diff --git a/binutils/binutils-2.21/bfd/cpu-tic4x.c b/bfd/cpu-tic4x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic4x.c
rename to bfd/cpu-tic4x.c
diff --git a/binutils/binutils-2.21/bfd/cpu-tic54x.c b/bfd/cpu-tic54x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic54x.c
rename to bfd/cpu-tic54x.c
diff --git a/binutils/binutils-2.21/bfd/cpu-tic6x.c b/bfd/cpu-tic6x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic6x.c
rename to bfd/cpu-tic6x.c
diff --git a/binutils/binutils-2.21/bfd/cpu-tic80.c b/bfd/cpu-tic80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-tic80.c
rename to bfd/cpu-tic80.c
diff --git a/binutils/binutils-2.21/bfd/cpu-v850.c b/bfd/cpu-v850.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-v850.c
rename to bfd/cpu-v850.c
diff --git a/binutils/binutils-2.21/bfd/cpu-vax.c b/bfd/cpu-vax.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-vax.c
rename to bfd/cpu-vax.c
diff --git a/binutils/binutils-2.21/bfd/cpu-w65.c b/bfd/cpu-w65.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-w65.c
rename to bfd/cpu-w65.c
diff --git a/binutils/binutils-2.21/bfd/cpu-we32k.c b/bfd/cpu-we32k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-we32k.c
rename to bfd/cpu-we32k.c
diff --git a/binutils/binutils-2.21/bfd/cpu-xc16x.c b/bfd/cpu-xc16x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-xc16x.c
rename to bfd/cpu-xc16x.c
diff --git a/binutils/binutils-2.21/bfd/cpu-xstormy16.c b/bfd/cpu-xstormy16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-xstormy16.c
rename to bfd/cpu-xstormy16.c
diff --git a/binutils/binutils-2.21/bfd/cpu-xtensa.c b/bfd/cpu-xtensa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-xtensa.c
rename to bfd/cpu-xtensa.c
diff --git a/binutils/binutils-2.21/bfd/cpu-z80.c b/bfd/cpu-z80.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-z80.c
rename to bfd/cpu-z80.c
diff --git a/binutils/binutils-2.21/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/cpu-z8k.c
rename to bfd/cpu-z8k.c
diff --git a/binutils/binutils-2.21/bfd/demo64.c b/bfd/demo64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/demo64.c
rename to bfd/demo64.c
diff --git a/binutils/binutils-2.21/bfd/dep-in.sed b/bfd/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/bfd/dep-in.sed
rename to bfd/dep-in.sed
diff --git a/binutils/binutils-2.21/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/ChangeLog
rename to bfd/doc/ChangeLog
diff --git a/binutils/binutils-2.21/bfd/doc/ChangeLog-9103 b/bfd/doc/ChangeLog-9103
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/ChangeLog-9103
rename to bfd/doc/ChangeLog-9103
diff --git a/binutils/binutils-2.21/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/Makefile.am
rename to bfd/doc/Makefile.am
diff --git a/binutils/binutils-2.21/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/Makefile.in
rename to bfd/doc/Makefile.in
diff --git a/binutils/binutils-2.21/bfd/doc/aoutx.texi b/bfd/doc/aoutx.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/aoutx.texi
rename to bfd/doc/aoutx.texi
diff --git a/binutils/binutils-2.21/bfd/doc/archive.texi b/bfd/doc/archive.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/archive.texi
rename to bfd/doc/archive.texi
diff --git a/binutils/binutils-2.21/bfd/doc/archures.texi b/bfd/doc/archures.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/archures.texi
rename to bfd/doc/archures.texi
diff --git a/binutils/binutils-2.21/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfd.texinfo
rename to bfd/doc/bfd.texinfo
diff --git a/binutils/binutils-2.21/bfd/doc/bfdint.texi b/bfd/doc/bfdint.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdint.texi
rename to bfd/doc/bfdint.texi
diff --git a/binutils/binutils-2.21/bfd/doc/bfdio.texi b/bfd/doc/bfdio.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdio.texi
rename to bfd/doc/bfdio.texi
diff --git a/binutils/binutils-2.21/bfd/doc/bfdsumm.texi b/bfd/doc/bfdsumm.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdsumm.texi
rename to bfd/doc/bfdsumm.texi
diff --git a/binutils/binutils-2.21/bfd/doc/bfdt.texi b/bfd/doc/bfdt.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdt.texi
rename to bfd/doc/bfdt.texi
diff --git a/binutils/binutils-2.21/bfd/doc/bfdver.texi b/bfd/doc/bfdver.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdver.texi
rename to bfd/doc/bfdver.texi
diff --git a/binutils/binutils-2.21/bfd/doc/bfdwin.texi b/bfd/doc/bfdwin.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/bfdwin.texi
rename to bfd/doc/bfdwin.texi
diff --git a/binutils/binutils-2.21/bfd/doc/cache.texi b/bfd/doc/cache.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/cache.texi
rename to bfd/doc/cache.texi
diff --git a/binutils/binutils-2.21/bfd/doc/chew.c b/bfd/doc/chew.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/chew.c
rename to bfd/doc/chew.c
diff --git a/binutils/binutils-2.21/bfd/doc/coffcode.texi b/bfd/doc/coffcode.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/coffcode.texi
rename to bfd/doc/coffcode.texi
diff --git a/binutils/binutils-2.21/bfd/doc/core.texi b/bfd/doc/core.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/core.texi
rename to bfd/doc/core.texi
diff --git a/binutils/binutils-2.21/bfd/doc/doc.str b/bfd/doc/doc.str
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/doc.str
rename to bfd/doc/doc.str
diff --git a/binutils/binutils-2.21/bfd/doc/elf.texi b/bfd/doc/elf.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/elf.texi
rename to bfd/doc/elf.texi
diff --git a/binutils/binutils-2.21/bfd/doc/elfcode.texi b/bfd/doc/elfcode.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/elfcode.texi
rename to bfd/doc/elfcode.texi
diff --git a/binutils/binutils-2.21/bfd/doc/fdl.texi b/bfd/doc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/fdl.texi
rename to bfd/doc/fdl.texi
diff --git a/binutils/binutils-2.21/bfd/doc/format.texi b/bfd/doc/format.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/format.texi
rename to bfd/doc/format.texi
diff --git a/binutils/binutils-2.21/bfd/doc/hash.texi b/bfd/doc/hash.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/hash.texi
rename to bfd/doc/hash.texi
diff --git a/binutils/binutils-2.21/bfd/doc/header.sed b/bfd/doc/header.sed
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/header.sed
rename to bfd/doc/header.sed
diff --git a/binutils/binutils-2.21/bfd/doc/init.texi b/bfd/doc/init.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/init.texi
rename to bfd/doc/init.texi
diff --git a/binutils/binutils-2.21/bfd/doc/libbfd.texi b/bfd/doc/libbfd.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/libbfd.texi
rename to bfd/doc/libbfd.texi
diff --git a/binutils/binutils-2.21/bfd/doc/linker.texi b/bfd/doc/linker.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/linker.texi
rename to bfd/doc/linker.texi
diff --git a/binutils/binutils-2.21/bfd/doc/makefile.vms b/bfd/doc/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/makefile.vms
rename to bfd/doc/makefile.vms
diff --git a/binutils/binutils-2.21/bfd/doc/mmo.texi b/bfd/doc/mmo.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/mmo.texi
rename to bfd/doc/mmo.texi
diff --git a/binutils/binutils-2.21/bfd/doc/opncls.texi b/bfd/doc/opncls.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/opncls.texi
rename to bfd/doc/opncls.texi
diff --git a/binutils/binutils-2.21/bfd/doc/proto.str b/bfd/doc/proto.str
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/proto.str
rename to bfd/doc/proto.str
diff --git a/binutils/binutils-2.21/bfd/doc/reloc.texi b/bfd/doc/reloc.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/reloc.texi
rename to bfd/doc/reloc.texi
diff --git a/binutils/binutils-2.21/bfd/doc/section.texi b/bfd/doc/section.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/section.texi
rename to bfd/doc/section.texi
diff --git a/binutils/binutils-2.21/bfd/doc/syms.texi b/bfd/doc/syms.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/syms.texi
rename to bfd/doc/syms.texi
diff --git a/binutils/binutils-2.21/bfd/doc/targets.texi b/bfd/doc/targets.texi
similarity index 100%
rename from binutils/binutils-2.21/bfd/doc/targets.texi
rename to bfd/doc/targets.texi
diff --git a/binutils/binutils-2.21/bfd/dwarf1.c b/bfd/dwarf1.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/dwarf1.c
rename to bfd/dwarf1.c
diff --git a/binutils/binutils-2.21/bfd/dwarf2.c b/bfd/dwarf2.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/dwarf2.c
rename to bfd/dwarf2.c
diff --git a/binutils/binutils-2.21/bfd/ecoff.c b/bfd/ecoff.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ecoff.c
rename to bfd/ecoff.c
diff --git a/binutils/binutils-2.21/bfd/ecofflink.c b/bfd/ecofflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ecofflink.c
rename to bfd/ecofflink.c
diff --git a/binutils/binutils-2.21/bfd/ecoffswap.h b/bfd/ecoffswap.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/ecoffswap.h
rename to bfd/ecoffswap.h
diff --git a/binutils/binutils-2.21/bfd/elf-attrs.c b/bfd/elf-attrs.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-attrs.c
rename to bfd/elf-attrs.c
diff --git a/binutils/binutils-2.21/bfd/elf-bfd.h b/bfd/elf-bfd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-bfd.h
rename to bfd/elf-bfd.h
diff --git a/binutils/binutils-2.21/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-eh-frame.c
rename to bfd/elf-eh-frame.c
diff --git a/binutils/binutils-2.21/bfd/elf-hppa.h b/bfd/elf-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-hppa.h
rename to bfd/elf-hppa.h
diff --git a/binutils/binutils-2.21/bfd/elf-ifunc.c b/bfd/elf-ifunc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-ifunc.c
rename to bfd/elf-ifunc.c
diff --git a/binutils/binutils-2.21/bfd/elf-m10200.c b/bfd/elf-m10200.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-m10200.c
rename to bfd/elf-m10200.c
diff --git a/binutils/binutils-2.21/bfd/elf-m10300.c b/bfd/elf-m10300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-m10300.c
rename to bfd/elf-m10300.c
diff --git a/binutils/binutils-2.21/bfd/elf-strtab.c b/bfd/elf-strtab.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-strtab.c
rename to bfd/elf-strtab.c
diff --git a/binutils/binutils-2.21/bfd/elf-vxworks.c b/bfd/elf-vxworks.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-vxworks.c
rename to bfd/elf-vxworks.c
diff --git a/binutils/binutils-2.21/bfd/elf-vxworks.h b/bfd/elf-vxworks.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf-vxworks.h
rename to bfd/elf-vxworks.h
diff --git a/binutils/binutils-2.21/bfd/elf.c b/bfd/elf.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf.c
rename to bfd/elf.c
diff --git a/binutils/binutils-2.21/bfd/elf32-am33lin.c b/bfd/elf32-am33lin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-am33lin.c
rename to bfd/elf32-am33lin.c
diff --git a/binutils/binutils-2.21/bfd/elf32-arc.c b/bfd/elf32-arc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-arc.c
rename to bfd/elf32-arc.c
diff --git a/binutils/binutils-2.21/bfd/elf32-arm.c b/bfd/elf32-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-arm.c
rename to bfd/elf32-arm.c
diff --git a/binutils/binutils-2.21/bfd/elf32-avr.c b/bfd/elf32-avr.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-avr.c
rename to bfd/elf32-avr.c
diff --git a/binutils/binutils-2.21/bfd/elf32-avr.h b/bfd/elf32-avr.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-avr.h
rename to bfd/elf32-avr.h
diff --git a/binutils/binutils-2.21/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-bfin.c
rename to bfd/elf32-bfin.c
diff --git a/binutils/binutils-2.21/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-cr16.c
rename to bfd/elf32-cr16.c
diff --git a/binutils/binutils-2.21/bfd/elf32-cr16c.c b/bfd/elf32-cr16c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-cr16c.c
rename to bfd/elf32-cr16c.c
diff --git a/binutils/binutils-2.21/bfd/elf32-cris.c b/bfd/elf32-cris.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-cris.c
rename to bfd/elf32-cris.c
diff --git a/binutils/binutils-2.21/bfd/elf32-crx.c b/bfd/elf32-crx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-crx.c
rename to bfd/elf32-crx.c
diff --git a/binutils/binutils-2.21/bfd/elf32-d10v.c b/bfd/elf32-d10v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-d10v.c
rename to bfd/elf32-d10v.c
diff --git a/binutils/binutils-2.21/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-d30v.c
rename to bfd/elf32-d30v.c
diff --git a/binutils/binutils-2.21/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-dlx.c
rename to bfd/elf32-dlx.c
diff --git a/binutils/binutils-2.21/bfd/elf32-fr30.c b/bfd/elf32-fr30.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-fr30.c
rename to bfd/elf32-fr30.c
diff --git a/binutils/binutils-2.21/bfd/elf32-frv.c b/bfd/elf32-frv.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-frv.c
rename to bfd/elf32-frv.c
diff --git a/binutils/binutils-2.21/bfd/elf32-gen.c b/bfd/elf32-gen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-gen.c
rename to bfd/elf32-gen.c
diff --git a/binutils/binutils-2.21/bfd/elf32-h8300.c b/bfd/elf32-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-h8300.c
rename to bfd/elf32-h8300.c
diff --git a/binutils/binutils-2.21/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-hppa.c
rename to bfd/elf32-hppa.c
diff --git a/binutils/binutils-2.21/bfd/elf32-hppa.h b/bfd/elf32-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-hppa.h
rename to bfd/elf32-hppa.h
diff --git a/binutils/binutils-2.21/bfd/elf32-i370.c b/bfd/elf32-i370.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i370.c
rename to bfd/elf32-i370.c
diff --git a/binutils/binutils-2.21/bfd/elf32-i386.c b/bfd/elf32-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i386.c
rename to bfd/elf32-i386.c
diff --git a/binutils/binutils-2.21/bfd/elf32-i860.c b/bfd/elf32-i860.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i860.c
rename to bfd/elf32-i860.c
diff --git a/binutils/binutils-2.21/bfd/elf32-i960.c b/bfd/elf32-i960.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-i960.c
rename to bfd/elf32-i960.c
diff --git a/binutils/binutils-2.21/bfd/elf32-ip2k.c b/bfd/elf32-ip2k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-ip2k.c
rename to bfd/elf32-ip2k.c
diff --git a/binutils/binutils-2.21/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-iq2000.c
rename to bfd/elf32-iq2000.c
diff --git a/binutils/binutils-2.21/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-lm32.c
rename to bfd/elf32-lm32.c
diff --git a/binutils/binutils-2.21/bfd/elf32-m32c.c b/bfd/elf32-m32c.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m32c.c
rename to bfd/elf32-m32c.c
diff --git a/binutils/binutils-2.21/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m32r.c
rename to bfd/elf32-m32r.c
diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc11.c
rename to bfd/elf32-m68hc11.c
diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc12.c
rename to bfd/elf32-m68hc12.c
diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc1x.c
rename to bfd/elf32-m68hc1x.c
diff --git a/binutils/binutils-2.21/bfd/elf32-m68hc1x.h b/bfd/elf32-m68hc1x.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68hc1x.h
rename to bfd/elf32-m68hc1x.h
diff --git a/binutils/binutils-2.21/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m68k.c
rename to bfd/elf32-m68k.c
diff --git a/binutils/binutils-2.21/bfd/elf32-m88k.c b/bfd/elf32-m88k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-m88k.c
rename to bfd/elf32-m88k.c
diff --git a/binutils/binutils-2.21/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mcore.c
rename to bfd/elf32-mcore.c
diff --git a/binutils/binutils-2.21/bfd/elf32-mep.c b/bfd/elf32-mep.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mep.c
rename to bfd/elf32-mep.c
diff --git a/binutils/binutils-2.21/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-microblaze.c
rename to bfd/elf32-microblaze.c
diff --git a/binutils/binutils-2.21/bfd/elf32-mips.c b/bfd/elf32-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mips.c
rename to bfd/elf32-mips.c
diff --git a/binutils/binutils-2.21/bfd/elf32-moxie.c b/bfd/elf32-moxie.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-moxie.c
rename to bfd/elf32-moxie.c
diff --git a/binutils/binutils-2.21/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-msp430.c
rename to bfd/elf32-msp430.c
diff --git a/binutils/binutils-2.21/bfd/elf32-mt.c b/bfd/elf32-mt.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-mt.c
rename to bfd/elf32-mt.c
diff --git a/binutils/binutils-2.21/bfd/elf32-openrisc.c b/bfd/elf32-openrisc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-openrisc.c
rename to bfd/elf32-openrisc.c
diff --git a/binutils/binutils-2.21/bfd/elf32-or32.c b/bfd/elf32-or32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-or32.c
rename to bfd/elf32-or32.c
diff --git a/binutils/binutils-2.21/bfd/elf32-pj.c b/bfd/elf32-pj.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-pj.c
rename to bfd/elf32-pj.c
diff --git a/binutils/binutils-2.21/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-ppc.c
rename to bfd/elf32-ppc.c
diff --git a/binutils/binutils-2.21/bfd/elf32-ppc.h b/bfd/elf32-ppc.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-ppc.h
rename to bfd/elf32-ppc.h
diff --git a/binutils/binutils-2.21/bfd/elf32-rx.c b/bfd/elf32-rx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-rx.c
rename to bfd/elf32-rx.c
diff --git a/binutils/binutils-2.21/bfd/elf32-s390.c b/bfd/elf32-s390.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-s390.c
rename to bfd/elf32-s390.c
diff --git a/binutils/binutils-2.21/bfd/elf32-score.c b/bfd/elf32-score.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-score.c
rename to bfd/elf32-score.c
diff --git a/binutils/binutils-2.21/bfd/elf32-score.h b/bfd/elf32-score.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-score.h
rename to bfd/elf32-score.h
diff --git a/binutils/binutils-2.21/bfd/elf32-score7.c b/bfd/elf32-score7.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-score7.c
rename to bfd/elf32-score7.c
diff --git a/binutils/binutils-2.21/bfd/elf32-sh-relocs.h b/bfd/elf32-sh-relocs.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh-relocs.h
rename to bfd/elf32-sh-relocs.h
diff --git a/binutils/binutils-2.21/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh-symbian.c
rename to bfd/elf32-sh-symbian.c
diff --git a/binutils/binutils-2.21/bfd/elf32-sh.c b/bfd/elf32-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh.c
rename to bfd/elf32-sh.c
diff --git a/binutils/binutils-2.21/bfd/elf32-sh64-com.c b/bfd/elf32-sh64-com.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh64-com.c
rename to bfd/elf32-sh64-com.c
diff --git a/binutils/binutils-2.21/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh64.c
rename to bfd/elf32-sh64.c
diff --git a/binutils/binutils-2.21/bfd/elf32-sh64.h b/bfd/elf32-sh64.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sh64.h
rename to bfd/elf32-sh64.h
diff --git a/binutils/binutils-2.21/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-sparc.c
rename to bfd/elf32-sparc.c
diff --git a/binutils/binutils-2.21/bfd/elf32-spu.c b/bfd/elf32-spu.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-spu.c
rename to bfd/elf32-spu.c
diff --git a/binutils/binutils-2.21/bfd/elf32-spu.h b/bfd/elf32-spu.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-spu.h
rename to bfd/elf32-spu.h
diff --git a/binutils/binutils-2.21/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-tic6x.c
rename to bfd/elf32-tic6x.c
diff --git a/binutils/binutils-2.21/bfd/elf32-tic6x.h b/bfd/elf32-tic6x.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-tic6x.h
rename to bfd/elf32-tic6x.h
diff --git a/binutils/binutils-2.21/bfd/elf32-v850.c b/bfd/elf32-v850.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-v850.c
rename to bfd/elf32-v850.c
diff --git a/binutils/binutils-2.21/bfd/elf32-vax.c b/bfd/elf32-vax.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-vax.c
rename to bfd/elf32-vax.c
diff --git a/binutils/binutils-2.21/bfd/elf32-xc16x.c b/bfd/elf32-xc16x.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-xc16x.c
rename to bfd/elf32-xc16x.c
diff --git a/binutils/binutils-2.21/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-xstormy16.c
rename to bfd/elf32-xstormy16.c
diff --git a/binutils/binutils-2.21/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32-xtensa.c
rename to bfd/elf32-xtensa.c
diff --git a/binutils/binutils-2.21/bfd/elf32.c b/bfd/elf32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf32.c
rename to bfd/elf32.c
diff --git a/binutils/binutils-2.21/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-alpha.c
rename to bfd/elf64-alpha.c
diff --git a/binutils/binutils-2.21/bfd/elf64-gen.c b/bfd/elf64-gen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-gen.c
rename to bfd/elf64-gen.c
diff --git a/binutils/binutils-2.21/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-hppa.c
rename to bfd/elf64-hppa.c
diff --git a/binutils/binutils-2.21/bfd/elf64-hppa.h b/bfd/elf64-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-hppa.h
rename to bfd/elf64-hppa.h
diff --git a/binutils/binutils-2.21/bfd/elf64-mips.c b/bfd/elf64-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-mips.c
rename to bfd/elf64-mips.c
diff --git a/binutils/binutils-2.21/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-mmix.c
rename to bfd/elf64-mmix.c
diff --git a/binutils/binutils-2.21/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-ppc.c
rename to bfd/elf64-ppc.c
diff --git a/binutils/binutils-2.21/bfd/elf64-ppc.h b/bfd/elf64-ppc.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-ppc.h
rename to bfd/elf64-ppc.h
diff --git a/binutils/binutils-2.21/bfd/elf64-s390.c b/bfd/elf64-s390.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-s390.c
rename to bfd/elf64-s390.c
diff --git a/binutils/binutils-2.21/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-sh64.c
rename to bfd/elf64-sh64.c
diff --git a/binutils/binutils-2.21/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-sparc.c
rename to bfd/elf64-sparc.c
diff --git a/binutils/binutils-2.21/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64-x86-64.c
rename to bfd/elf64-x86-64.c
diff --git a/binutils/binutils-2.21/bfd/elf64.c b/bfd/elf64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elf64.c
rename to bfd/elf64.c
diff --git a/binutils/binutils-2.21/bfd/elfcode.h b/bfd/elfcode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfcode.h
rename to bfd/elfcode.h
diff --git a/binutils/binutils-2.21/bfd/elfcore.h b/bfd/elfcore.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfcore.h
rename to bfd/elfcore.h
diff --git a/binutils/binutils-2.21/bfd/elflink.c b/bfd/elflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elflink.c
rename to bfd/elflink.c
diff --git a/binutils/binutils-2.21/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfn32-mips.c
rename to bfd/elfn32-mips.c
diff --git a/binutils/binutils-2.21/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-ia64.c
rename to bfd/elfxx-ia64.c
diff --git a/binutils/binutils-2.21/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-mips.c
rename to bfd/elfxx-mips.c
diff --git a/binutils/binutils-2.21/bfd/elfxx-mips.h b/bfd/elfxx-mips.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-mips.h
rename to bfd/elfxx-mips.h
diff --git a/binutils/binutils-2.21/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-sparc.c
rename to bfd/elfxx-sparc.c
diff --git a/binutils/binutils-2.21/bfd/elfxx-sparc.h b/bfd/elfxx-sparc.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-sparc.h
rename to bfd/elfxx-sparc.h
diff --git a/binutils/binutils-2.21/bfd/elfxx-target.h b/bfd/elfxx-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/elfxx-target.h
rename to bfd/elfxx-target.h
diff --git a/binutils/binutils-2.21/bfd/epoc-pe-arm.c b/bfd/epoc-pe-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/epoc-pe-arm.c
rename to bfd/epoc-pe-arm.c
diff --git a/binutils/binutils-2.21/bfd/epoc-pei-arm.c b/bfd/epoc-pei-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/epoc-pei-arm.c
rename to bfd/epoc-pei-arm.c
diff --git a/binutils/binutils-2.21/bfd/format.c b/bfd/format.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/format.c
rename to bfd/format.c
diff --git a/binutils/binutils-2.21/bfd/freebsd.h b/bfd/freebsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/freebsd.h
rename to bfd/freebsd.h
diff --git a/binutils/binutils-2.21/bfd/gen-aout.c b/bfd/gen-aout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/gen-aout.c
rename to bfd/gen-aout.c
diff --git a/binutils/binutils-2.21/bfd/genlink.h b/bfd/genlink.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/genlink.h
rename to bfd/genlink.h
diff --git a/binutils/binutils-2.21/bfd/go32stub.h b/bfd/go32stub.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/go32stub.h
rename to bfd/go32stub.h
diff --git a/binutils/binutils-2.21/bfd/hash.c b/bfd/hash.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hash.c
rename to bfd/hash.c
diff --git a/binutils/binutils-2.21/bfd/host-aout.c b/bfd/host-aout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/host-aout.c
rename to bfd/host-aout.c
diff --git a/binutils/binutils-2.21/bfd/hosts/alphalinux.h b/bfd/hosts/alphalinux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/alphalinux.h
rename to bfd/hosts/alphalinux.h
diff --git a/binutils/binutils-2.21/bfd/hosts/alphavms.h b/bfd/hosts/alphavms.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/alphavms.h
rename to bfd/hosts/alphavms.h
diff --git a/binutils/binutils-2.21/bfd/hosts/decstation.h b/bfd/hosts/decstation.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/decstation.h
rename to bfd/hosts/decstation.h
diff --git a/binutils/binutils-2.21/bfd/hosts/delta68.h b/bfd/hosts/delta68.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/delta68.h
rename to bfd/hosts/delta68.h
diff --git a/binutils/binutils-2.21/bfd/hosts/dpx2.h b/bfd/hosts/dpx2.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/dpx2.h
rename to bfd/hosts/dpx2.h
diff --git a/binutils/binutils-2.21/bfd/hosts/hp300bsd.h b/bfd/hosts/hp300bsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/hp300bsd.h
rename to bfd/hosts/hp300bsd.h
diff --git a/binutils/binutils-2.21/bfd/hosts/i386bsd.h b/bfd/hosts/i386bsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386bsd.h
rename to bfd/hosts/i386bsd.h
diff --git a/binutils/binutils-2.21/bfd/hosts/i386linux.h b/bfd/hosts/i386linux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386linux.h
rename to bfd/hosts/i386linux.h
diff --git a/binutils/binutils-2.21/bfd/hosts/i386mach3.h b/bfd/hosts/i386mach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386mach3.h
rename to bfd/hosts/i386mach3.h
diff --git a/binutils/binutils-2.21/bfd/hosts/i386sco.h b/bfd/hosts/i386sco.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i386sco.h
rename to bfd/hosts/i386sco.h
diff --git a/binutils/binutils-2.21/bfd/hosts/i860mach3.h b/bfd/hosts/i860mach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/i860mach3.h
rename to bfd/hosts/i860mach3.h
diff --git a/binutils/binutils-2.21/bfd/hosts/m68kaux.h b/bfd/hosts/m68kaux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/m68kaux.h
rename to bfd/hosts/m68kaux.h
diff --git a/binutils/binutils-2.21/bfd/hosts/m68klinux.h b/bfd/hosts/m68klinux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/m68klinux.h
rename to bfd/hosts/m68klinux.h
diff --git a/binutils/binutils-2.21/bfd/hosts/m88kmach3.h b/bfd/hosts/m88kmach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/m88kmach3.h
rename to bfd/hosts/m88kmach3.h
diff --git a/binutils/binutils-2.21/bfd/hosts/mipsbsd.h b/bfd/hosts/mipsbsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/mipsbsd.h
rename to bfd/hosts/mipsbsd.h
diff --git a/binutils/binutils-2.21/bfd/hosts/mipsmach3.h b/bfd/hosts/mipsmach3.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/mipsmach3.h
rename to bfd/hosts/mipsmach3.h
diff --git a/binutils/binutils-2.21/bfd/hosts/news-mips.h b/bfd/hosts/news-mips.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/news-mips.h
rename to bfd/hosts/news-mips.h
diff --git a/binutils/binutils-2.21/bfd/hosts/news.h b/bfd/hosts/news.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/news.h
rename to bfd/hosts/news.h
diff --git a/binutils/binutils-2.21/bfd/hosts/pc532mach.h b/bfd/hosts/pc532mach.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/pc532mach.h
rename to bfd/hosts/pc532mach.h
diff --git a/binutils/binutils-2.21/bfd/hosts/riscos.h b/bfd/hosts/riscos.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/riscos.h
rename to bfd/hosts/riscos.h
diff --git a/binutils/binutils-2.21/bfd/hosts/symmetry.h b/bfd/hosts/symmetry.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/symmetry.h
rename to bfd/hosts/symmetry.h
diff --git a/binutils/binutils-2.21/bfd/hosts/tahoe.h b/bfd/hosts/tahoe.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/tahoe.h
rename to bfd/hosts/tahoe.h
diff --git a/binutils/binutils-2.21/bfd/hosts/vaxbsd.h b/bfd/hosts/vaxbsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxbsd.h
rename to bfd/hosts/vaxbsd.h
diff --git a/binutils/binutils-2.21/bfd/hosts/vaxlinux.h b/bfd/hosts/vaxlinux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxlinux.h
rename to bfd/hosts/vaxlinux.h
diff --git a/binutils/binutils-2.21/bfd/hosts/vaxult.h b/bfd/hosts/vaxult.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxult.h
rename to bfd/hosts/vaxult.h
diff --git a/binutils/binutils-2.21/bfd/hosts/vaxult2.h b/bfd/hosts/vaxult2.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/vaxult2.h
rename to bfd/hosts/vaxult2.h
diff --git a/binutils/binutils-2.21/bfd/hosts/x86-64linux.h b/bfd/hosts/x86-64linux.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/hosts/x86-64linux.h
rename to bfd/hosts/x86-64linux.h
diff --git a/binutils/binutils-2.21/bfd/hp300bsd.c b/bfd/hp300bsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hp300bsd.c
rename to bfd/hp300bsd.c
diff --git a/binutils/binutils-2.21/bfd/hp300hpux.c b/bfd/hp300hpux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hp300hpux.c
rename to bfd/hp300hpux.c
diff --git a/binutils/binutils-2.21/bfd/hppabsd-core.c b/bfd/hppabsd-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hppabsd-core.c
rename to bfd/hppabsd-core.c
diff --git a/binutils/binutils-2.21/bfd/hpux-core.c b/bfd/hpux-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/hpux-core.c
rename to bfd/hpux-core.c
diff --git a/binutils/binutils-2.21/bfd/i386aout.c b/bfd/i386aout.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386aout.c
rename to bfd/i386aout.c
diff --git a/binutils/binutils-2.21/bfd/i386bsd.c b/bfd/i386bsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386bsd.c
rename to bfd/i386bsd.c
diff --git a/binutils/binutils-2.21/bfd/i386dynix.c b/bfd/i386dynix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386dynix.c
rename to bfd/i386dynix.c
diff --git a/binutils/binutils-2.21/bfd/i386freebsd.c b/bfd/i386freebsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386freebsd.c
rename to bfd/i386freebsd.c
diff --git a/binutils/binutils-2.21/bfd/i386linux.c b/bfd/i386linux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386linux.c
rename to bfd/i386linux.c
diff --git a/binutils/binutils-2.21/bfd/i386lynx.c b/bfd/i386lynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386lynx.c
rename to bfd/i386lynx.c
diff --git a/binutils/binutils-2.21/bfd/i386mach3.c b/bfd/i386mach3.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386mach3.c
rename to bfd/i386mach3.c
diff --git a/binutils/binutils-2.21/bfd/i386msdos.c b/bfd/i386msdos.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386msdos.c
rename to bfd/i386msdos.c
diff --git a/binutils/binutils-2.21/bfd/i386netbsd.c b/bfd/i386netbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386netbsd.c
rename to bfd/i386netbsd.c
diff --git a/binutils/binutils-2.21/bfd/i386os9k.c b/bfd/i386os9k.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/i386os9k.c
rename to bfd/i386os9k.c
diff --git a/binutils/binutils-2.21/bfd/ieee.c b/bfd/ieee.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ieee.c
rename to bfd/ieee.c
diff --git a/binutils/binutils-2.21/bfd/ihex.c b/bfd/ihex.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ihex.c
rename to bfd/ihex.c
diff --git a/binutils/binutils-2.21/bfd/init.c b/bfd/init.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/init.c
rename to bfd/init.c
diff --git a/binutils/binutils-2.21/bfd/irix-core.c b/bfd/irix-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/irix-core.c
rename to bfd/irix-core.c
diff --git a/binutils/binutils-2.21/bfd/libaout.h b/bfd/libaout.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libaout.h
rename to bfd/libaout.h
diff --git a/binutils/binutils-2.21/bfd/libbfd-in.h b/bfd/libbfd-in.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libbfd-in.h
rename to bfd/libbfd-in.h
diff --git a/binutils/binutils-2.21/bfd/libbfd.c b/bfd/libbfd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/libbfd.c
rename to bfd/libbfd.c
diff --git a/binutils/binutils-2.21/bfd/libbfd.h b/bfd/libbfd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libbfd.h
rename to bfd/libbfd.h
diff --git a/binutils/binutils-2.21/bfd/libcoff-in.h b/bfd/libcoff-in.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libcoff-in.h
rename to bfd/libcoff-in.h
diff --git a/binutils/binutils-2.21/bfd/libcoff.h b/bfd/libcoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libcoff.h
rename to bfd/libcoff.h
diff --git a/binutils/binutils-2.21/bfd/libecoff.h b/bfd/libecoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libecoff.h
rename to bfd/libecoff.h
diff --git a/binutils/binutils-2.21/bfd/libhppa.h b/bfd/libhppa.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libhppa.h
rename to bfd/libhppa.h
diff --git a/binutils/binutils-2.21/bfd/libieee.h b/bfd/libieee.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libieee.h
rename to bfd/libieee.h
diff --git a/binutils/binutils-2.21/bfd/libnlm.h b/bfd/libnlm.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libnlm.h
rename to bfd/libnlm.h
diff --git a/binutils/binutils-2.21/bfd/liboasys.h b/bfd/liboasys.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/liboasys.h
rename to bfd/liboasys.h
diff --git a/binutils/binutils-2.21/bfd/libpei.h b/bfd/libpei.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libpei.h
rename to bfd/libpei.h
diff --git a/binutils/binutils-2.21/bfd/libxcoff.h b/bfd/libxcoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/libxcoff.h
rename to bfd/libxcoff.h
diff --git a/binutils/binutils-2.21/bfd/linker.c b/bfd/linker.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/linker.c
rename to bfd/linker.c
diff --git a/binutils/binutils-2.21/bfd/lynx-core.c b/bfd/lynx-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/lynx-core.c
rename to bfd/lynx-core.c
diff --git a/binutils/binutils-2.21/bfd/m68k4knetbsd.c b/bfd/m68k4knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m68k4knetbsd.c
rename to bfd/m68k4knetbsd.c
diff --git a/binutils/binutils-2.21/bfd/m68klinux.c b/bfd/m68klinux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m68klinux.c
rename to bfd/m68klinux.c
diff --git a/binutils/binutils-2.21/bfd/m68knetbsd.c b/bfd/m68knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m68knetbsd.c
rename to bfd/m68knetbsd.c
diff --git a/binutils/binutils-2.21/bfd/m88kmach3.c b/bfd/m88kmach3.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m88kmach3.c
rename to bfd/m88kmach3.c
diff --git a/binutils/binutils-2.21/bfd/m88kopenbsd.c b/bfd/m88kopenbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/m88kopenbsd.c
rename to bfd/m88kopenbsd.c
diff --git a/binutils/binutils-2.21/bfd/mach-o-i386.c b/bfd/mach-o-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o-i386.c
rename to bfd/mach-o-i386.c
diff --git a/binutils/binutils-2.21/bfd/mach-o-target.c b/bfd/mach-o-target.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o-target.c
rename to bfd/mach-o-target.c
diff --git a/binutils/binutils-2.21/bfd/mach-o-x86-64.c b/bfd/mach-o-x86-64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o-x86-64.c
rename to bfd/mach-o-x86-64.c
diff --git a/binutils/binutils-2.21/bfd/mach-o.c b/bfd/mach-o.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o.c
rename to bfd/mach-o.c
diff --git a/binutils/binutils-2.21/bfd/mach-o.h b/bfd/mach-o.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/mach-o.h
rename to bfd/mach-o.h
diff --git a/binutils/binutils-2.21/bfd/makefile.vms b/bfd/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/bfd/makefile.vms
rename to bfd/makefile.vms
diff --git a/binutils/binutils-2.21/bfd/mep-relocs.pl b/bfd/mep-relocs.pl
similarity index 100%
rename from binutils/binutils-2.21/bfd/mep-relocs.pl
rename to bfd/mep-relocs.pl
diff --git a/binutils/binutils-2.21/bfd/merge.c b/bfd/merge.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/merge.c
rename to bfd/merge.c
diff --git a/binutils/binutils-2.21/bfd/mipsbsd.c b/bfd/mipsbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mipsbsd.c
rename to bfd/mipsbsd.c
diff --git a/binutils/binutils-2.21/bfd/mmo.c b/bfd/mmo.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/mmo.c
rename to bfd/mmo.c
diff --git a/binutils/binutils-2.21/bfd/netbsd-core.c b/bfd/netbsd-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/netbsd-core.c
rename to bfd/netbsd-core.c
diff --git a/binutils/binutils-2.21/bfd/netbsd.h b/bfd/netbsd.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/netbsd.h
rename to bfd/netbsd.h
diff --git a/binutils/binutils-2.21/bfd/newsos3.c b/bfd/newsos3.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/newsos3.c
rename to bfd/newsos3.c
diff --git a/binutils/binutils-2.21/bfd/nlm-target.h b/bfd/nlm-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm-target.h
rename to bfd/nlm-target.h
diff --git a/binutils/binutils-2.21/bfd/nlm.c b/bfd/nlm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm.c
rename to bfd/nlm.c
diff --git a/binutils/binutils-2.21/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-alpha.c
rename to bfd/nlm32-alpha.c
diff --git a/binutils/binutils-2.21/bfd/nlm32-i386.c b/bfd/nlm32-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-i386.c
rename to bfd/nlm32-i386.c
diff --git a/binutils/binutils-2.21/bfd/nlm32-ppc.c b/bfd/nlm32-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-ppc.c
rename to bfd/nlm32-ppc.c
diff --git a/binutils/binutils-2.21/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32-sparc.c
rename to bfd/nlm32-sparc.c
diff --git a/binutils/binutils-2.21/bfd/nlm32.c b/bfd/nlm32.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm32.c
rename to bfd/nlm32.c
diff --git a/binutils/binutils-2.21/bfd/nlm64.c b/bfd/nlm64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlm64.c
rename to bfd/nlm64.c
diff --git a/binutils/binutils-2.21/bfd/nlmcode.h b/bfd/nlmcode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlmcode.h
rename to bfd/nlmcode.h
diff --git a/binutils/binutils-2.21/bfd/nlmswap.h b/bfd/nlmswap.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/nlmswap.h
rename to bfd/nlmswap.h
diff --git a/binutils/binutils-2.21/bfd/ns32k.h b/bfd/ns32k.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/ns32k.h
rename to bfd/ns32k.h
diff --git a/binutils/binutils-2.21/bfd/ns32knetbsd.c b/bfd/ns32knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ns32knetbsd.c
rename to bfd/ns32knetbsd.c
diff --git a/binutils/binutils-2.21/bfd/oasys.c b/bfd/oasys.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/oasys.c
rename to bfd/oasys.c
diff --git a/binutils/binutils-2.21/bfd/opncls.c b/bfd/opncls.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/opncls.c
rename to bfd/opncls.c
diff --git a/binutils/binutils-2.21/bfd/osf-core.c b/bfd/osf-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/osf-core.c
rename to bfd/osf-core.c
diff --git a/binutils/binutils-2.21/bfd/pc532-mach.c b/bfd/pc532-mach.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pc532-mach.c
rename to bfd/pc532-mach.c
diff --git a/binutils/binutils-2.21/bfd/pdp11.c b/bfd/pdp11.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pdp11.c
rename to bfd/pdp11.c
diff --git a/binutils/binutils-2.21/bfd/pe-arm-wince.c b/bfd/pe-arm-wince.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-arm-wince.c
rename to bfd/pe-arm-wince.c
diff --git a/binutils/binutils-2.21/bfd/pe-arm.c b/bfd/pe-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-arm.c
rename to bfd/pe-arm.c
diff --git a/binutils/binutils-2.21/bfd/pe-i386.c b/bfd/pe-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-i386.c
rename to bfd/pe-i386.c
diff --git a/binutils/binutils-2.21/bfd/pe-mcore.c b/bfd/pe-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-mcore.c
rename to bfd/pe-mcore.c
diff --git a/binutils/binutils-2.21/bfd/pe-mips.c b/bfd/pe-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-mips.c
rename to bfd/pe-mips.c
diff --git a/binutils/binutils-2.21/bfd/pe-ppc.c b/bfd/pe-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-ppc.c
rename to bfd/pe-ppc.c
diff --git a/binutils/binutils-2.21/bfd/pe-sh.c b/bfd/pe-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-sh.c
rename to bfd/pe-sh.c
diff --git a/binutils/binutils-2.21/bfd/pe-x86_64.c b/bfd/pe-x86_64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pe-x86_64.c
rename to bfd/pe-x86_64.c
diff --git a/binutils/binutils-2.21/bfd/peXXigen.c b/bfd/peXXigen.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/peXXigen.c
rename to bfd/peXXigen.c
diff --git a/binutils/binutils-2.21/bfd/pef-traceback.h b/bfd/pef-traceback.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/pef-traceback.h
rename to bfd/pef-traceback.h
diff --git a/binutils/binutils-2.21/bfd/pef.c b/bfd/pef.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pef.c
rename to bfd/pef.c
diff --git a/binutils/binutils-2.21/bfd/pef.h b/bfd/pef.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/pef.h
rename to bfd/pef.h
diff --git a/binutils/binutils-2.21/bfd/pei-arm-wince.c b/bfd/pei-arm-wince.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-arm-wince.c
rename to bfd/pei-arm-wince.c
diff --git a/binutils/binutils-2.21/bfd/pei-arm.c b/bfd/pei-arm.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-arm.c
rename to bfd/pei-arm.c
diff --git a/binutils/binutils-2.21/bfd/pei-i386.c b/bfd/pei-i386.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-i386.c
rename to bfd/pei-i386.c
diff --git a/binutils/binutils-2.21/bfd/pei-ia64.c b/bfd/pei-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-ia64.c
rename to bfd/pei-ia64.c
diff --git a/binutils/binutils-2.21/bfd/pei-mcore.c b/bfd/pei-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-mcore.c
rename to bfd/pei-mcore.c
diff --git a/binutils/binutils-2.21/bfd/pei-mips.c b/bfd/pei-mips.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-mips.c
rename to bfd/pei-mips.c
diff --git a/binutils/binutils-2.21/bfd/pei-ppc.c b/bfd/pei-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-ppc.c
rename to bfd/pei-ppc.c
diff --git a/binutils/binutils-2.21/bfd/pei-sh.c b/bfd/pei-sh.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-sh.c
rename to bfd/pei-sh.c
diff --git a/binutils/binutils-2.21/bfd/pei-x86_64.c b/bfd/pei-x86_64.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/pei-x86_64.c
rename to bfd/pei-x86_64.c
diff --git a/binutils/binutils-2.21/bfd/peicode.h b/bfd/peicode.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/peicode.h
rename to bfd/peicode.h
diff --git a/binutils/binutils-2.21/bfd/plugin.c b/bfd/plugin.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/plugin.c
rename to bfd/plugin.c
diff --git a/binutils/binutils-2.21/bfd/plugin.h b/bfd/plugin.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/plugin.h
rename to bfd/plugin.h
diff --git a/binutils/binutils-2.21/bfd/po/BLD-POTFILES.in b/bfd/po/BLD-POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/BLD-POTFILES.in
rename to bfd/po/BLD-POTFILES.in
diff --git a/binutils/binutils-2.21/bfd/po/Make-in b/bfd/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/Make-in
rename to bfd/po/Make-in
diff --git a/binutils/binutils-2.21/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/SRC-POTFILES.in
rename to bfd/po/SRC-POTFILES.in
diff --git a/binutils/binutils-2.21/bfd/po/bfd.pot b/bfd/po/bfd.pot
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/bfd.pot
rename to bfd/po/bfd.pot
diff --git a/binutils/binutils-2.21/bfd/po/da.gmo b/bfd/po/da.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/da.gmo
rename to bfd/po/da.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/da.po b/bfd/po/da.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/da.po
rename to bfd/po/da.po
diff --git a/binutils/binutils-2.21/bfd/po/es.gmo b/bfd/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/es.gmo
rename to bfd/po/es.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/es.po b/bfd/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/es.po
rename to bfd/po/es.po
diff --git a/binutils/binutils-2.21/bfd/po/fi.gmo b/bfd/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fi.gmo
rename to bfd/po/fi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/fi.po b/bfd/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fi.po
rename to bfd/po/fi.po
diff --git a/binutils/binutils-2.21/bfd/po/fr.gmo b/bfd/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fr.gmo
rename to bfd/po/fr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/fr.po b/bfd/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/fr.po
rename to bfd/po/fr.po
diff --git a/binutils/binutils-2.21/bfd/po/id.gmo b/bfd/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/id.gmo
rename to bfd/po/id.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/id.po b/bfd/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/id.po
rename to bfd/po/id.po
diff --git a/binutils/binutils-2.21/bfd/po/ja.gmo b/bfd/po/ja.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ja.gmo
rename to bfd/po/ja.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/ja.po b/bfd/po/ja.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ja.po
rename to bfd/po/ja.po
diff --git a/binutils/binutils-2.21/bfd/po/ro.gmo b/bfd/po/ro.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ro.gmo
rename to bfd/po/ro.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/ro.po b/bfd/po/ro.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ro.po
rename to bfd/po/ro.po
diff --git a/binutils/binutils-2.21/bfd/po/ru.gmo b/bfd/po/ru.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ru.gmo
rename to bfd/po/ru.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/ru.po b/bfd/po/ru.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/ru.po
rename to bfd/po/ru.po
diff --git a/binutils/binutils-2.21/bfd/po/rw.gmo b/bfd/po/rw.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/rw.gmo
rename to bfd/po/rw.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/rw.po b/bfd/po/rw.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/rw.po
rename to bfd/po/rw.po
diff --git a/binutils/binutils-2.21/bfd/po/sv.gmo b/bfd/po/sv.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/sv.gmo
rename to bfd/po/sv.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/sv.po b/bfd/po/sv.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/sv.po
rename to bfd/po/sv.po
diff --git a/binutils/binutils-2.21/bfd/po/tr.gmo b/bfd/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/tr.gmo
rename to bfd/po/tr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/tr.po b/bfd/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/tr.po
rename to bfd/po/tr.po
diff --git a/binutils/binutils-2.21/bfd/po/vi.gmo b/bfd/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/vi.gmo
rename to bfd/po/vi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/vi.po b/bfd/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/vi.po
rename to bfd/po/vi.po
diff --git a/binutils/binutils-2.21/bfd/po/zh_CN.gmo b/bfd/po/zh_CN.gmo
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/zh_CN.gmo
rename to bfd/po/zh_CN.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/bfd/po/zh_CN.po b/bfd/po/zh_CN.po
similarity index 100%
rename from binutils/binutils-2.21/bfd/po/zh_CN.po
rename to bfd/po/zh_CN.po
diff --git a/binutils/binutils-2.21/bfd/ppcboot.c b/bfd/ppcboot.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ppcboot.c
rename to bfd/ppcboot.c
diff --git a/binutils/binutils-2.21/bfd/ptrace-core.c b/bfd/ptrace-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/ptrace-core.c
rename to bfd/ptrace-core.c
diff --git a/binutils/binutils-2.21/bfd/reloc.c b/bfd/reloc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/reloc.c
rename to bfd/reloc.c
diff --git a/binutils/binutils-2.21/bfd/reloc16.c b/bfd/reloc16.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/reloc16.c
rename to bfd/reloc16.c
diff --git a/binutils/binutils-2.21/bfd/riscix.c b/bfd/riscix.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/riscix.c
rename to bfd/riscix.c
diff --git a/binutils/binutils-2.21/bfd/rs6000-core.c b/bfd/rs6000-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/rs6000-core.c
rename to bfd/rs6000-core.c
diff --git a/binutils/binutils-2.21/bfd/sco5-core.c b/bfd/sco5-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sco5-core.c
rename to bfd/sco5-core.c
diff --git a/binutils/binutils-2.21/bfd/section.c b/bfd/section.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/section.c
rename to bfd/section.c
diff --git a/binutils/binutils-2.21/bfd/simple.c b/bfd/simple.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/simple.c
rename to bfd/simple.c
diff --git a/binutils/binutils-2.21/bfd/som.c b/bfd/som.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/som.c
rename to bfd/som.c
diff --git a/binutils/binutils-2.21/bfd/som.h b/bfd/som.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/som.h
rename to bfd/som.h
diff --git a/binutils/binutils-2.21/bfd/sparclinux.c b/bfd/sparclinux.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sparclinux.c
rename to bfd/sparclinux.c
diff --git a/binutils/binutils-2.21/bfd/sparclynx.c b/bfd/sparclynx.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sparclynx.c
rename to bfd/sparclynx.c
diff --git a/binutils/binutils-2.21/bfd/sparcnetbsd.c b/bfd/sparcnetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sparcnetbsd.c
rename to bfd/sparcnetbsd.c
diff --git a/binutils/binutils-2.21/bfd/srec.c b/bfd/srec.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/srec.c
rename to bfd/srec.c
diff --git a/binutils/binutils-2.21/bfd/stab-syms.c b/bfd/stab-syms.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/stab-syms.c
rename to bfd/stab-syms.c
diff --git a/binutils/binutils-2.21/bfd/stabs.c b/bfd/stabs.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/stabs.c
rename to bfd/stabs.c
diff --git a/binutils/binutils-2.21/bfd/stamp-h.in b/bfd/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/bfd/stamp-h.in
rename to bfd/stamp-h.in
diff --git a/binutils/binutils-2.21/bfd/sunos.c b/bfd/sunos.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/sunos.c
rename to bfd/sunos.c
diff --git a/binutils/binutils-2.21/bfd/syms.c b/bfd/syms.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/syms.c
rename to bfd/syms.c
diff --git a/binutils/binutils-2.21/bfd/sysdep.h b/bfd/sysdep.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/sysdep.h
rename to bfd/sysdep.h
diff --git a/binutils/binutils-2.21/bfd/targets.c b/bfd/targets.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/targets.c
rename to bfd/targets.c
diff --git a/binutils/binutils-2.21/bfd/targmatch.sed b/bfd/targmatch.sed
similarity index 100%
rename from binutils/binutils-2.21/bfd/targmatch.sed
rename to bfd/targmatch.sed
diff --git a/binutils/binutils-2.21/bfd/tekhex.c b/bfd/tekhex.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/tekhex.c
rename to bfd/tekhex.c
diff --git a/binutils/binutils-2.21/bfd/ticoff.h b/bfd/ticoff.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/ticoff.h
rename to bfd/ticoff.h
diff --git a/binutils/binutils-2.21/bfd/trad-core.c b/bfd/trad-core.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/trad-core.c
rename to bfd/trad-core.c
diff --git a/binutils/binutils-2.21/bfd/vax1knetbsd.c b/bfd/vax1knetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vax1knetbsd.c
rename to bfd/vax1knetbsd.c
diff --git a/binutils/binutils-2.21/bfd/vaxbsd.c b/bfd/vaxbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vaxbsd.c
rename to bfd/vaxbsd.c
diff --git a/binutils/binutils-2.21/bfd/vaxnetbsd.c b/bfd/vaxnetbsd.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vaxnetbsd.c
rename to bfd/vaxnetbsd.c
diff --git a/binutils/binutils-2.21/bfd/verilog.c b/bfd/verilog.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/verilog.c
rename to bfd/verilog.c
diff --git a/binutils/binutils-2.21/bfd/versados.c b/bfd/versados.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/versados.c
rename to bfd/versados.c
diff --git a/binutils/binutils-2.21/bfd/version.h b/bfd/version.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/version.h
rename to bfd/version.h
diff --git a/binutils/binutils-2.21/bfd/vms-alpha.c b/bfd/vms-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms-alpha.c
rename to bfd/vms-alpha.c
diff --git a/binutils/binutils-2.21/bfd/vms-lib.c b/bfd/vms-lib.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms-lib.c
rename to bfd/vms-lib.c
diff --git a/binutils/binutils-2.21/bfd/vms-misc.c b/bfd/vms-misc.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms-misc.c
rename to bfd/vms-misc.c
diff --git a/binutils/binutils-2.21/bfd/vms.h b/bfd/vms.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/vms.h
rename to bfd/vms.h
diff --git a/binutils/binutils-2.21/bfd/warning.m4 b/bfd/warning.m4
similarity index 100%
rename from binutils/binutils-2.21/bfd/warning.m4
rename to bfd/warning.m4
diff --git a/binutils/binutils-2.21/bfd/xcoff-target.h b/bfd/xcoff-target.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/xcoff-target.h
rename to bfd/xcoff-target.h
diff --git a/binutils/binutils-2.21/bfd/xcofflink.c b/bfd/xcofflink.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xcofflink.c
rename to bfd/xcofflink.c
diff --git a/binutils/binutils-2.21/bfd/xsym.c b/bfd/xsym.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xsym.c
rename to bfd/xsym.c
diff --git a/binutils/binutils-2.21/bfd/xsym.h b/bfd/xsym.h
similarity index 100%
rename from binutils/binutils-2.21/bfd/xsym.h
rename to bfd/xsym.h
diff --git a/binutils/binutils-2.21/bfd/xtensa-isa.c b/bfd/xtensa-isa.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xtensa-isa.c
rename to bfd/xtensa-isa.c
diff --git a/binutils/binutils-2.21/bfd/xtensa-modules.c b/bfd/xtensa-modules.c
similarity index 100%
rename from binutils/binutils-2.21/bfd/xtensa-modules.c
rename to bfd/xtensa-modules.c
diff --git a/binutils/binutils-2.21/binutils/BRANCHES b/binutils/BRANCHES
similarity index 100%
rename from binutils/binutils-2.21/binutils/BRANCHES
rename to binutils/BRANCHES
diff --git a/binutils/binutils-2.21/binutils/ChangeLog b/binutils/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog
rename to binutils/ChangeLog
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-0001 b/binutils/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-0001
rename to binutils/ChangeLog-0001
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-0203 b/binutils/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-0203
rename to binutils/ChangeLog-0203
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2004 b/binutils/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2004
rename to binutils/ChangeLog-2004
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2005 b/binutils/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2005
rename to binutils/ChangeLog-2005
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2006 b/binutils/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2006
rename to binutils/ChangeLog-2006
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2007 b/binutils/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2007
rename to binutils/ChangeLog-2007
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2008 b/binutils/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2008
rename to binutils/ChangeLog-2008
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-2009 b/binutils/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-2009
rename to binutils/ChangeLog-2009
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-9197 b/binutils/ChangeLog-9197
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-9197
rename to binutils/ChangeLog-9197
diff --git a/binutils/binutils-2.21/binutils/ChangeLog-9899 b/binutils/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/binutils/ChangeLog-9899
rename to binutils/ChangeLog-9899
diff --git a/binutils/binutils-2.21/binutils/MAINTAINERS b/binutils/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/binutils/MAINTAINERS
rename to binutils/MAINTAINERS
diff --git a/binutils/binutils-2.21/binutils/Makefile.am b/binutils/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/binutils/Makefile.am
rename to binutils/Makefile.am
diff --git a/binutils/binutils-2.21/binutils/Makefile.in b/binutils/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/Makefile.in
rename to binutils/Makefile.in
diff --git a/binutils/binutils-2.21/binutils/NEWS b/binutils/NEWS
similarity index 100%
rename from binutils/binutils-2.21/binutils/NEWS
rename to binutils/NEWS
diff --git a/binutils/binutils-2.21/binutils/README b/binutils/README
similarity index 100%
rename from binutils/binutils-2.21/binutils/README
rename to binutils/README
diff --git a/binutils/binutils-2.21/binutils/aclocal.m4 b/binutils/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/binutils/aclocal.m4
rename to binutils/aclocal.m4
diff --git a/binutils/binutils-2.21/binutils/addr2line.c b/binutils/addr2line.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/addr2line.c
rename to binutils/addr2line.c
diff --git a/binutils/binutils-2.21/binutils/ar.c b/binutils/ar.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/ar.c
rename to binutils/ar.c
diff --git a/binutils/binutils-2.21/binutils/arlex.c b/binutils/arlex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/arlex.c
rename to binutils/arlex.c
diff --git a/binutils/binutils-2.21/binutils/arlex.l b/binutils/arlex.l
similarity index 100%
rename from binutils/binutils-2.21/binutils/arlex.l
rename to binutils/arlex.l
diff --git a/binutils/binutils-2.21/binutils/arparse.c b/binutils/arparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/arparse.c
rename to binutils/arparse.c
diff --git a/binutils/binutils-2.21/binutils/arparse.h b/binutils/arparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/arparse.h
rename to binutils/arparse.h
diff --git a/binutils/binutils-2.21/binutils/arparse.y b/binutils/arparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/arparse.y
rename to binutils/arparse.y
diff --git a/binutils/binutils-2.21/binutils/arsup.c b/binutils/arsup.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/arsup.c
rename to binutils/arsup.c
diff --git a/binutils/binutils-2.21/binutils/arsup.h b/binutils/arsup.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/arsup.h
rename to binutils/arsup.h
diff --git a/binutils/binutils-2.21/binutils/bin2c.c b/binutils/bin2c.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/bin2c.c
rename to binutils/bin2c.c
diff --git a/binutils/binutils-2.21/binutils/binemul.c b/binutils/binemul.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/binemul.c
rename to binutils/binemul.c
diff --git a/binutils/binutils-2.21/binutils/binemul.h b/binutils/binemul.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/binemul.h
rename to binutils/binemul.h
diff --git a/binutils/binutils-2.21/binutils/bucomm.c b/binutils/bucomm.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/bucomm.c
rename to binutils/bucomm.c
diff --git a/binutils/binutils-2.21/binutils/bucomm.h b/binutils/bucomm.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/bucomm.h
rename to binutils/bucomm.h
diff --git a/binutils/binutils-2.21/binutils/budbg.h b/binutils/budbg.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/budbg.h
rename to binutils/budbg.h
diff --git a/binutils/binutils-2.21/binutils/coffdump.c b/binutils/coffdump.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/coffdump.c
rename to binutils/coffdump.c
diff --git a/binutils/binutils-2.21/binutils/coffgrok.c b/binutils/coffgrok.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/coffgrok.c
rename to binutils/coffgrok.c
diff --git a/binutils/binutils-2.21/binutils/coffgrok.h b/binutils/coffgrok.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/coffgrok.h
rename to binutils/coffgrok.h
diff --git a/binutils/binutils-2.21/binutils/config.in b/binutils/config.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/config.in
rename to binutils/config.in
diff --git a/binutils/binutils-2.21/binutils/configure b/binutils/configure
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure
rename to binutils/configure
diff --git a/binutils/binutils-2.21/binutils/configure.com b/binutils/configure.com
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure.com
rename to binutils/configure.com
diff --git a/binutils/binutils-2.21/binutils/configure.in b/binutils/configure.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure.in
rename to binutils/configure.in
diff --git a/binutils/binutils-2.21/binutils/configure.tgt b/binutils/configure.tgt
similarity index 100%
rename from binutils/binutils-2.21/binutils/configure.tgt
rename to binutils/configure.tgt
diff --git a/binutils/binutils-2.21/binutils/cxxfilt.c b/binutils/cxxfilt.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/cxxfilt.c
rename to binutils/cxxfilt.c
diff --git a/binutils/binutils-2.21/binutils/debug.c b/binutils/debug.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/debug.c
rename to binutils/debug.c
diff --git a/binutils/binutils-2.21/binutils/debug.h b/binutils/debug.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/debug.h
rename to binutils/debug.h
diff --git a/binutils/binutils-2.21/binutils/deflex.c b/binutils/deflex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/deflex.c
rename to binutils/deflex.c
diff --git a/binutils/binutils-2.21/binutils/deflex.l b/binutils/deflex.l
similarity index 100%
rename from binutils/binutils-2.21/binutils/deflex.l
rename to binutils/deflex.l
diff --git a/binutils/binutils-2.21/binutils/defparse.c b/binutils/defparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/defparse.c
rename to binutils/defparse.c
diff --git a/binutils/binutils-2.21/binutils/defparse.h b/binutils/defparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/defparse.h
rename to binutils/defparse.h
diff --git a/binutils/binutils-2.21/binutils/defparse.y b/binutils/defparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/defparse.y
rename to binutils/defparse.y
diff --git a/binutils/binutils-2.21/binutils/dep-in.sed b/binutils/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/binutils/dep-in.sed
rename to binutils/dep-in.sed
diff --git a/binutils/binutils-2.21/binutils/dlltool.c b/binutils/dlltool.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/dlltool.c
rename to binutils/dlltool.c
diff --git a/binutils/binutils-2.21/binutils/dlltool.h b/binutils/dlltool.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/dlltool.h
rename to binutils/dlltool.h
diff --git a/binutils/binutils-2.21/binutils/dllwrap.c b/binutils/dllwrap.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/dllwrap.c
rename to binutils/dllwrap.c
diff --git a/binutils/binutils-2.21/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/Makefile.am
rename to binutils/doc/Makefile.am
diff --git a/binutils/binutils-2.21/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/Makefile.in
rename to binutils/doc/Makefile.in
diff --git a/binutils/binutils-2.21/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/binutils.texi
rename to binutils/doc/binutils.texi
diff --git a/binutils/binutils-2.21/binutils/doc/cxxfilt.man b/binutils/doc/cxxfilt.man
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/cxxfilt.man
rename to binutils/doc/cxxfilt.man
diff --git a/binutils/binutils-2.21/binutils/doc/fdl.texi b/binutils/doc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/binutils/doc/fdl.texi
rename to binutils/doc/fdl.texi
diff --git a/binutils/binutils-2.21/binutils/dwarf.c b/binutils/dwarf.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/dwarf.c
rename to binutils/dwarf.c
diff --git a/binutils/binutils-2.21/binutils/dwarf.h b/binutils/dwarf.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/dwarf.h
rename to binutils/dwarf.h
diff --git a/binutils/binutils-2.21/binutils/elfedit.c b/binutils/elfedit.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/elfedit.c
rename to binutils/elfedit.c
diff --git a/binutils/binutils-2.21/binutils/embedspu.sh b/binutils/embedspu.sh
similarity index 100%
rename from binutils/binutils-2.21/binutils/embedspu.sh
rename to binutils/embedspu.sh
diff --git a/binutils/binutils-2.21/binutils/emul_aix.c b/binutils/emul_aix.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/emul_aix.c
rename to binutils/emul_aix.c
diff --git a/binutils/binutils-2.21/binutils/emul_vanilla.c b/binutils/emul_vanilla.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/emul_vanilla.c
rename to binutils/emul_vanilla.c
diff --git a/binutils/binutils-2.21/binutils/filemode.c b/binutils/filemode.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/filemode.c
rename to binutils/filemode.c
diff --git a/binutils/binutils-2.21/binutils/ieee.c b/binutils/ieee.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/ieee.c
rename to binutils/ieee.c
diff --git a/binutils/binutils-2.21/binutils/is-ranlib.c b/binutils/is-ranlib.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/is-ranlib.c
rename to binutils/is-ranlib.c
diff --git a/binutils/binutils-2.21/binutils/is-strip.c b/binutils/is-strip.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/is-strip.c
rename to binutils/is-strip.c
diff --git a/binutils/binutils-2.21/binutils/makefile.vms b/binutils/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/binutils/makefile.vms
rename to binutils/makefile.vms
diff --git a/binutils/binutils-2.21/binutils/maybe-ranlib.c b/binutils/maybe-ranlib.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/maybe-ranlib.c
rename to binutils/maybe-ranlib.c
diff --git a/binutils/binutils-2.21/binutils/maybe-strip.c b/binutils/maybe-strip.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/maybe-strip.c
rename to binutils/maybe-strip.c
diff --git a/binutils/binutils-2.21/binutils/mclex.c b/binutils/mclex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/mclex.c
rename to binutils/mclex.c
diff --git a/binutils/binutils-2.21/binutils/mcparse.c b/binutils/mcparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/mcparse.c
rename to binutils/mcparse.c
diff --git a/binutils/binutils-2.21/binutils/mcparse.h b/binutils/mcparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/mcparse.h
rename to binutils/mcparse.h
diff --git a/binutils/binutils-2.21/binutils/mcparse.y b/binutils/mcparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/mcparse.y
rename to binutils/mcparse.y
diff --git a/binutils/binutils-2.21/binutils/nlmconv.c b/binutils/nlmconv.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmconv.c
rename to binutils/nlmconv.c
diff --git a/binutils/binutils-2.21/binutils/nlmconv.h b/binutils/nlmconv.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmconv.h
rename to binutils/nlmconv.h
diff --git a/binutils/binutils-2.21/binutils/nlmheader.c b/binutils/nlmheader.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmheader.c
rename to binutils/nlmheader.c
diff --git a/binutils/binutils-2.21/binutils/nlmheader.h b/binutils/nlmheader.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmheader.h
rename to binutils/nlmheader.h
diff --git a/binutils/binutils-2.21/binutils/nlmheader.y b/binutils/nlmheader.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/nlmheader.y
rename to binutils/nlmheader.y
diff --git a/binutils/binutils-2.21/binutils/nm.c b/binutils/nm.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/nm.c
rename to binutils/nm.c
diff --git a/binutils/binutils-2.21/binutils/not-ranlib.c b/binutils/not-ranlib.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/not-ranlib.c
rename to binutils/not-ranlib.c
diff --git a/binutils/binutils-2.21/binutils/not-strip.c b/binutils/not-strip.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/not-strip.c
rename to binutils/not-strip.c
diff --git a/binutils/binutils-2.21/binutils/objcopy.c b/binutils/objcopy.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/objcopy.c
rename to binutils/objcopy.c
diff --git a/binutils/binutils-2.21/binutils/objdump.c b/binutils/objdump.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/objdump.c
rename to binutils/objdump.c
diff --git a/binutils/binutils-2.21/binutils/po/Make-in b/binutils/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/Make-in
rename to binutils/po/Make-in
diff --git a/binutils/binutils-2.21/binutils/po/POTFILES.in b/binutils/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/POTFILES.in
rename to binutils/po/POTFILES.in
diff --git a/binutils/binutils-2.21/binutils/po/bg.gmo b/binutils/po/bg.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/bg.gmo
rename to binutils/po/bg.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/bg.po b/binutils/po/bg.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/bg.po
rename to binutils/po/bg.po
diff --git a/binutils/binutils-2.21/binutils/po/binutils.pot b/binutils/po/binutils.pot
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/binutils.pot
rename to binutils/po/binutils.pot
diff --git a/binutils/binutils-2.21/binutils/po/da.gmo b/binutils/po/da.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/da.gmo
rename to binutils/po/da.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/da.po b/binutils/po/da.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/da.po
rename to binutils/po/da.po
diff --git a/binutils/binutils-2.21/binutils/po/es.gmo b/binutils/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/es.gmo
rename to binutils/po/es.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/es.po b/binutils/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/es.po
rename to binutils/po/es.po
diff --git a/binutils/binutils-2.21/binutils/po/fi.gmo b/binutils/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fi.gmo
rename to binutils/po/fi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/fi.po b/binutils/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fi.po
rename to binutils/po/fi.po
diff --git a/binutils/binutils-2.21/binutils/po/fr.gmo b/binutils/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fr.gmo
rename to binutils/po/fr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/fr.po b/binutils/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/fr.po
rename to binutils/po/fr.po
diff --git a/binutils/binutils-2.21/binutils/po/id.gmo b/binutils/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/id.gmo
rename to binutils/po/id.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/id.po b/binutils/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/id.po
rename to binutils/po/id.po
diff --git a/binutils/binutils-2.21/binutils/po/ja.gmo b/binutils/po/ja.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ja.gmo
rename to binutils/po/ja.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/ja.po b/binutils/po/ja.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ja.po
rename to binutils/po/ja.po
diff --git a/binutils/binutils-2.21/binutils/po/ro.gmo b/binutils/po/ro.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ro.gmo
rename to binutils/po/ro.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/ro.po b/binutils/po/ro.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ro.po
rename to binutils/po/ro.po
diff --git a/binutils/binutils-2.21/binutils/po/ru.gmo b/binutils/po/ru.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ru.gmo
rename to binutils/po/ru.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/ru.po b/binutils/po/ru.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/ru.po
rename to binutils/po/ru.po
diff --git a/binutils/binutils-2.21/binutils/po/rw.gmo b/binutils/po/rw.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/rw.gmo
rename to binutils/po/rw.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/rw.po b/binutils/po/rw.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/rw.po
rename to binutils/po/rw.po
diff --git a/binutils/binutils-2.21/binutils/po/sk.gmo b/binutils/po/sk.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sk.gmo
rename to binutils/po/sk.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/sk.po b/binutils/po/sk.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sk.po
rename to binutils/po/sk.po
diff --git a/binutils/binutils-2.21/binutils/po/sv.gmo b/binutils/po/sv.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sv.gmo
rename to binutils/po/sv.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/sv.po b/binutils/po/sv.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/sv.po
rename to binutils/po/sv.po
diff --git a/binutils/binutils-2.21/binutils/po/tr.gmo b/binutils/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/tr.gmo
rename to binutils/po/tr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/tr.po b/binutils/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/tr.po
rename to binutils/po/tr.po
diff --git a/binutils/binutils-2.21/binutils/po/uk.gmo b/binutils/po/uk.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/uk.gmo
rename to binutils/po/uk.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/uk.po b/binutils/po/uk.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/uk.po
rename to binutils/po/uk.po
diff --git a/binutils/binutils-2.21/binutils/po/vi.gmo b/binutils/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/vi.gmo
rename to binutils/po/vi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/vi.po b/binutils/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/vi.po
rename to binutils/po/vi.po
diff --git a/binutils/binutils-2.21/binutils/po/zh_CN.gmo b/binutils/po/zh_CN.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_CN.gmo
rename to binutils/po/zh_CN.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/zh_CN.po b/binutils/po/zh_CN.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_CN.po
rename to binutils/po/zh_CN.po
diff --git a/binutils/binutils-2.21/binutils/po/zh_TW.gmo b/binutils/po/zh_TW.gmo
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_TW.gmo
rename to binutils/po/zh_TW.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/po/zh_TW.po b/binutils/po/zh_TW.po
similarity index 100%
rename from binutils/binutils-2.21/binutils/po/zh_TW.po
rename to binutils/po/zh_TW.po
diff --git a/binutils/binutils-2.21/binutils/prdbg.c b/binutils/prdbg.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/prdbg.c
rename to binutils/prdbg.c
diff --git a/binutils/binutils-2.21/binutils/ranlib.sh b/binutils/ranlib.sh
similarity index 100%
rename from binutils/binutils-2.21/binutils/ranlib.sh
rename to binutils/ranlib.sh
diff --git a/binutils/binutils-2.21/binutils/rclex.c b/binutils/rclex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rclex.c
rename to binutils/rclex.c
diff --git a/binutils/binutils-2.21/binutils/rcparse.c b/binutils/rcparse.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rcparse.c
rename to binutils/rcparse.c
diff --git a/binutils/binutils-2.21/binutils/rcparse.h b/binutils/rcparse.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/rcparse.h
rename to binutils/rcparse.h
diff --git a/binutils/binutils-2.21/binutils/rcparse.y b/binutils/rcparse.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/rcparse.y
rename to binutils/rcparse.y
diff --git a/binutils/binutils-2.21/binutils/rdcoff.c b/binutils/rdcoff.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rdcoff.c
rename to binutils/rdcoff.c
diff --git a/binutils/binutils-2.21/binutils/rddbg.c b/binutils/rddbg.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rddbg.c
rename to binutils/rddbg.c
diff --git a/binutils/binutils-2.21/binutils/readelf.c b/binutils/readelf.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/readelf.c
rename to binutils/readelf.c
diff --git a/binutils/binutils-2.21/binutils/rename.c b/binutils/rename.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rename.c
rename to binutils/rename.c
diff --git a/binutils/binutils-2.21/binutils/resbin.c b/binutils/resbin.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/resbin.c
rename to binutils/resbin.c
diff --git a/binutils/binutils-2.21/binutils/rescoff.c b/binutils/rescoff.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/rescoff.c
rename to binutils/rescoff.c
diff --git a/binutils/binutils-2.21/binutils/resrc.c b/binutils/resrc.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/resrc.c
rename to binutils/resrc.c
diff --git a/binutils/binutils-2.21/binutils/resres.c b/binutils/resres.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/resres.c
rename to binutils/resres.c
diff --git a/binutils/binutils-2.21/binutils/sanity.sh b/binutils/sanity.sh
similarity index 100%
rename from binutils/binutils-2.21/binutils/sanity.sh
rename to binutils/sanity.sh
diff --git a/binutils/binutils-2.21/binutils/size.c b/binutils/size.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/size.c
rename to binutils/size.c
diff --git a/binutils/binutils-2.21/binutils/srconv.c b/binutils/srconv.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/srconv.c
rename to binutils/srconv.c
diff --git a/binutils/binutils-2.21/binutils/stabs.c b/binutils/stabs.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/stabs.c
rename to binutils/stabs.c
diff --git a/binutils/binutils-2.21/binutils/stamp-h.in b/binutils/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/binutils/stamp-h.in
rename to binutils/stamp-h.in
diff --git a/binutils/binutils-2.21/binutils/strings.c b/binutils/strings.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/strings.c
rename to binutils/strings.c
diff --git a/binutils/binutils-2.21/binutils/sysdep.h b/binutils/sysdep.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysdep.h
rename to binutils/sysdep.h
diff --git a/binutils/binutils-2.21/binutils/sysdump.c b/binutils/sysdump.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysdump.c
rename to binutils/sysdump.c
diff --git a/binutils/binutils-2.21/binutils/sysinfo.c b/binutils/sysinfo.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysinfo.c
rename to binutils/sysinfo.c
diff --git a/binutils/binutils-2.21/binutils/sysinfo.h b/binutils/sysinfo.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysinfo.h
rename to binutils/sysinfo.h
diff --git a/binutils/binutils-2.21/binutils/sysinfo.y b/binutils/sysinfo.y
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysinfo.y
rename to binutils/sysinfo.y
diff --git a/binutils/binutils-2.21/binutils/syslex.c b/binutils/syslex.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/syslex.c
rename to binutils/syslex.c
diff --git a/binutils/binutils-2.21/binutils/syslex.l b/binutils/syslex.l
similarity index 100%
rename from binutils/binutils-2.21/binutils/syslex.l
rename to binutils/syslex.l
diff --git a/binutils/binutils-2.21/binutils/sysroff.info b/binutils/sysroff.info
similarity index 100%
rename from binutils/binutils-2.21/binutils/sysroff.info
rename to binutils/sysroff.info
diff --git a/binutils/binutils-2.21/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/ChangeLog
rename to binutils/testsuite/ChangeLog
diff --git a/binutils/binutils-2.21/binutils/testsuite/ChangeLog-9303 b/binutils/testsuite/ChangeLog-9303
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/ChangeLog-9303
rename to binutils/testsuite/ChangeLog-9303
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/add-empty-section.d b/binutils/testsuite/binutils-all/add-empty-section.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/add-empty-section.d
rename to binutils/testsuite/binutils-all/add-empty-section.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/add-section.d b/binutils/testsuite/binutils-all/add-section.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/add-section.d
rename to binutils/testsuite/binutils-all/add-section.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/alias-2.def b/binutils/testsuite/binutils-all/alias-2.def
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/alias-2.def
rename to binutils/testsuite/binutils-all/alias-2.def
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/alias.def b/binutils/testsuite/binutils-all/alias.def
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/alias.def
rename to binutils/testsuite/binutils-all/alias.def
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/ar.exp
rename to binutils/testsuite/binutils-all/ar.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/objdump.exp b/binutils/testsuite/binutils-all/arm/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/objdump.exp
rename to binutils/testsuite/binutils-all/arm/objdump.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/thumb2-cond.s b/binutils/testsuite/binutils-all/arm/thumb2-cond.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/arm/thumb2-cond.s
rename to binutils/testsuite/binutils-all/arm/thumb2-cond.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/objdump.exp b/binutils/testsuite/binutils-all/bfin/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/objdump.exp
rename to binutils/testsuite/binutils-all/bfin/objdump.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/unknown-mode.s b/binutils/testsuite/binutils-all/bfin/unknown-mode.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/bfin/unknown-mode.s
rename to binutils/testsuite/binutils-all/bfin/unknown-mode.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/bintest.s b/binutils/testsuite/binutils-all/bintest.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/bintest.s
rename to binutils/testsuite/binutils-all/bintest.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/compress.exp b/binutils/testsuite/binutils-all/compress.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/compress.exp
rename to binutils/testsuite/binutils-all/compress.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.d b/binutils/testsuite/binutils-all/copy-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.d
rename to binutils/testsuite/binutils-all/copy-1.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.s b/binutils/testsuite/binutils-all/copy-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-1.s
rename to binutils/testsuite/binutils-all/copy-1.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-2.d b/binutils/testsuite/binutils-all/copy-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-2.d
rename to binutils/testsuite/binutils-all/copy-2.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-3.d b/binutils/testsuite/binutils-all/copy-3.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-3.d
rename to binutils/testsuite/binutils-all/copy-3.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-4.d b/binutils/testsuite/binutils-all/copy-4.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copy-4.d
rename to binutils/testsuite/binutils-all/copy-4.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/copytest.s b/binutils/testsuite/binutils-all/copytest.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/copytest.s
rename to binutils/testsuite/binutils-all/copytest.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dlltool.exp
rename to binutils/testsuite/binutils-all/dlltool.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dumptest.s b/binutils/testsuite/binutils-all/dumptest.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dumptest.s
rename to binutils/testsuite/binutils-all/dumptest.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-1.S b/binutils/testsuite/binutils-all/dw2-1.S
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-1.S
rename to binutils/testsuite/binutils-all/dw2-1.S
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-2.S b/binutils/testsuite/binutils-all/dw2-2.S
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-2.S
rename to binutils/testsuite/binutils-all/dw2-2.S
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-compressed.S b/binutils/testsuite/binutils-all/dw2-compressed.S
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/dw2-compressed.S
rename to binutils/testsuite/binutils-all/dw2-compressed.S
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-1.d b/binutils/testsuite/binutils-all/elfedit-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-1.d
rename to binutils/testsuite/binutils-all/elfedit-1.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-2.d b/binutils/testsuite/binutils-all/elfedit-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-2.d
rename to binutils/testsuite/binutils-all/elfedit-2.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-3.d b/binutils/testsuite/binutils-all/elfedit-3.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit-3.d
rename to binutils/testsuite/binutils-all/elfedit-3.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit.exp b/binutils/testsuite/binutils-all/elfedit.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/elfedit.exp
rename to binutils/testsuite/binutils-all/elfedit.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/empty-file b/binutils/testsuite/binutils-all/empty-file
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/empty-file
rename to binutils/testsuite/binutils-all/empty-file
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/empty.s b/binutils/testsuite/binutils-all/empty.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/empty.s
rename to binutils/testsuite/binutils-all/empty.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1.s b/binutils/testsuite/binutils-all/exclude-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1.s
rename to binutils/testsuite/binutils-all/exclude-1.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1a.d b/binutils/testsuite/binutils-all/exclude-1a.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1a.d
rename to binutils/testsuite/binutils-all/exclude-1a.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1b.d b/binutils/testsuite/binutils-all/exclude-1b.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/exclude-1b.d
rename to binutils/testsuite/binutils-all/exclude-1b.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/fastcall.def b/binutils/testsuite/binutils-all/fastcall.def
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/fastcall.def
rename to binutils/testsuite/binutils-all/fastcall.def
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-2.s b/binutils/testsuite/binutils-all/group-2.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-2.s
rename to binutils/testsuite/binutils-all/group-2.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-3.s b/binutils/testsuite/binutils-all/group-3.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-3.s
rename to binutils/testsuite/binutils-all/group-3.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-4.s b/binutils/testsuite/binutils-all/group-4.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-4.s
rename to binutils/testsuite/binutils-all/group-4.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.d b/binutils/testsuite/binutils-all/group-5.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.d
rename to binutils/testsuite/binutils-all/group-5.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.s b/binutils/testsuite/binutils-all/group-5.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-5.s
rename to binutils/testsuite/binutils-all/group-5.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.d b/binutils/testsuite/binutils-all/group-6.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.d
rename to binutils/testsuite/binutils-all/group-6.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.s b/binutils/testsuite/binutils-all/group-6.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group-6.s
rename to binutils/testsuite/binutils-all/group-6.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/group.s b/binutils/testsuite/binutils-all/group.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/group.s
rename to binutils/testsuite/binutils-all/group.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/addendbug.s b/binutils/testsuite/binutils-all/hppa/addendbug.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/addendbug.s
rename to binutils/testsuite/binutils-all/hppa/addendbug.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/freg.s b/binutils/testsuite/binutils-all/hppa/freg.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/freg.s
rename to binutils/testsuite/binutils-all/hppa/freg.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/objdump.exp b/binutils/testsuite/binutils-all/hppa/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/hppa/objdump.exp
rename to binutils/testsuite/binutils-all/hppa/objdump.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1.s b/binutils/testsuite/binutils-all/i386/compressed-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1.s
rename to binutils/testsuite/binutils-all/i386/compressed-1.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1a.d b/binutils/testsuite/binutils-all/i386/compressed-1a.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1a.d
rename to binutils/testsuite/binutils-all/i386/compressed-1a.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1b.d b/binutils/testsuite/binutils-all/i386/compressed-1b.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1b.d
rename to binutils/testsuite/binutils-all/i386/compressed-1b.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1c.d b/binutils/testsuite/binutils-all/i386/compressed-1c.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/compressed-1c.d
rename to binutils/testsuite/binutils-all/i386/compressed-1c.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/i386.exp b/binutils/testsuite/binutils-all/i386/i386.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/i386/i386.exp
rename to binutils/testsuite/binutils-all/i386/i386.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2-compressed.out b/binutils/testsuite/binutils-all/libdw2-compressed.out
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2-compressed.out
rename to binutils/testsuite/binutils-all/libdw2-compressed.out
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2.out b/binutils/testsuite/binutils-all/libdw2.out
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/libdw2.out
rename to binutils/testsuite/binutils-all/libdw2.out
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/link-order.s b/binutils/testsuite/binutils-all/link-order.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/link-order.s
rename to binutils/testsuite/binutils-all/link-order.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.d b/binutils/testsuite/binutils-all/localize-hidden-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.d
rename to binutils/testsuite/binutils-all/localize-hidden-1.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.s b/binutils/testsuite/binutils-all/localize-hidden-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-1.s
rename to binutils/testsuite/binutils-all/localize-hidden-1.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.d b/binutils/testsuite/binutils-all/localize-hidden-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.d
rename to binutils/testsuite/binutils-all/localize-hidden-2.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.s b/binutils/testsuite/binutils-all/localize-hidden-2.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/localize-hidden-2.s
rename to binutils/testsuite/binutils-all/localize-hidden-2.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/fnop.s b/binutils/testsuite/binutils-all/m68k/fnop.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/fnop.s
rename to binutils/testsuite/binutils-all/m68k/fnop.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/movem.s b/binutils/testsuite/binutils-all/m68k/movem.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/movem.s
rename to binutils/testsuite/binutils-all/m68k/movem.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/objdump.exp b/binutils/testsuite/binutils-all/m68k/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/m68k/objdump.exp
rename to binutils/testsuite/binutils-all/m68k/objdump.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/needed-by-reloc.s b/binutils/testsuite/binutils-all/needed-by-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/needed-by-reloc.s
rename to binutils/testsuite/binutils-all/needed-by-reloc.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/nm.exp
rename to binutils/testsuite/binutils-all/nm.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/note-1.d b/binutils/testsuite/binutils-all/note-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/note-1.d
rename to binutils/testsuite/binutils-all/note-1.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objcopy.exp
rename to binutils/testsuite/binutils-all/objcopy.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.W
rename to binutils/testsuite/binutils-all/objdump.W
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.exp
rename to binutils/testsuite/binutils-all/objdump.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.s b/binutils/testsuite/binutils-all/objdump.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/objdump.s
rename to binutils/testsuite/binutils-all/objdump.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.exp
rename to binutils/testsuite/binutils-all/readelf.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.h b/binutils/testsuite/binutils-all/readelf.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.h
rename to binutils/testsuite/binutils-all/readelf.h
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r b/binutils/testsuite/binutils-all/readelf.r
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r
rename to binutils/testsuite/binutils-all/readelf.r
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r-64 b/binutils/testsuite/binutils-all/readelf.r-64
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.r-64
rename to binutils/testsuite/binutils-all/readelf.r-64
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s b/binutils/testsuite/binutils-all/readelf.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s
rename to binutils/testsuite/binutils-all/readelf.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s-64 b/binutils/testsuite/binutils-all/readelf.s-64
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.s-64
rename to binutils/testsuite/binutils-all/readelf.s-64
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss b/binutils/testsuite/binutils-all/readelf.ss
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss
rename to binutils/testsuite/binutils-all/readelf.ss
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-64 b/binutils/testsuite/binutils-all/readelf.ss-64
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-64
rename to binutils/testsuite/binutils-all/readelf.ss-64
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-mips b/binutils/testsuite/binutils-all/readelf.ss-mips
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-mips
rename to binutils/testsuite/binutils-all/readelf.ss-mips
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-tmips b/binutils/testsuite/binutils-all/readelf.ss-tmips
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.ss-tmips
rename to binutils/testsuite/binutils-all/readelf.ss-tmips
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.wa b/binutils/testsuite/binutils-all/readelf.wa
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/readelf.wa
rename to binutils/testsuite/binutils-all/readelf.wa
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/size.exp b/binutils/testsuite/binutils-all/size.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/size.exp
rename to binutils/testsuite/binutils-all/size.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-1.d b/binutils/testsuite/binutils-all/strip-1.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-1.d
rename to binutils/testsuite/binutils-all/strip-1.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-10.d b/binutils/testsuite/binutils-all/strip-10.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-10.d
rename to binutils/testsuite/binutils-all/strip-10.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-2.d b/binutils/testsuite/binutils-all/strip-2.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-2.d
rename to binutils/testsuite/binutils-all/strip-2.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-3.d b/binutils/testsuite/binutils-all/strip-3.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-3.d
rename to binutils/testsuite/binutils-all/strip-3.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-4.d b/binutils/testsuite/binutils-all/strip-4.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-4.d
rename to binutils/testsuite/binutils-all/strip-4.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-5.d b/binutils/testsuite/binutils-all/strip-5.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-5.d
rename to binutils/testsuite/binutils-all/strip-5.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-6.d b/binutils/testsuite/binutils-all/strip-6.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-6.d
rename to binutils/testsuite/binutils-all/strip-6.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-7.d b/binutils/testsuite/binutils-all/strip-7.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-7.d
rename to binutils/testsuite/binutils-all/strip-7.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-8.d b/binutils/testsuite/binutils-all/strip-8.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-8.d
rename to binutils/testsuite/binutils-all/strip-8.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-9.d b/binutils/testsuite/binutils-all/strip-9.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/strip-9.d
rename to binutils/testsuite/binutils-all/strip-9.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testprog.c b/binutils/testsuite/binutils-all/testprog.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testprog.c
rename to binutils/testsuite/binutils-all/testprog.c
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.d b/binutils/testsuite/binutils-all/testranges-ia64.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.d
rename to binutils/testsuite/binutils-all/testranges-ia64.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.s b/binutils/testsuite/binutils-all/testranges-ia64.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges-ia64.s
rename to binutils/testsuite/binutils-all/testranges-ia64.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.d b/binutils/testsuite/binutils-all/testranges.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.d
rename to binutils/testsuite/binutils-all/testranges.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.s b/binutils/testsuite/binutils-all/testranges.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/testranges.s
rename to binutils/testsuite/binutils-all/testranges.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/unique.s b/binutils/testsuite/binutils-all/unique.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/unique.s
rename to binutils/testsuite/binutils-all/unique.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/unknown.s b/binutils/testsuite/binutils-all/unknown.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/unknown.s
rename to binutils/testsuite/binutils-all/unknown.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/entrymask.s b/binutils/testsuite/binutils-all/vax/entrymask.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/entrymask.s
rename to binutils/testsuite/binutils-all/vax/entrymask.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/objdump.exp b/binutils/testsuite/binutils-all/vax/objdump.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/vax/objdump.exp
rename to binutils/testsuite/binutils-all/vax/objdump.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/MSG00001.bin b/binutils/testsuite/binutils-all/windres/MSG00001.bin
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/MSG00001.bin
rename to binutils/testsuite/binutils-all/windres/MSG00001.bin
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/README b/binutils/testsuite/binutils-all/windres/README
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/README
rename to binutils/testsuite/binutils-all/windres/README
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmp1.bmp b/binutils/testsuite/binutils-all/windres/bmp1.bmp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmp1.bmp
rename to binutils/testsuite/binutils-all/windres/bmp1.bmp
Binary files differ
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rc b/binutils/testsuite/binutils-all/windres/bmpalign.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rc
rename to binutils/testsuite/binutils-all/windres/bmpalign.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rsd b/binutils/testsuite/binutils-all/windres/bmpalign.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/bmpalign.rsd
rename to binutils/testsuite/binutils-all/windres/bmpalign.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rc b/binutils/testsuite/binutils-all/windres/capstyle.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rc
rename to binutils/testsuite/binutils-all/windres/capstyle.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rsd b/binutils/testsuite/binutils-all/windres/capstyle.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/capstyle.rsd
rename to binutils/testsuite/binutils-all/windres/capstyle.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rc b/binutils/testsuite/binutils-all/windres/checkbox.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rc
rename to binutils/testsuite/binutils-all/windres/checkbox.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rsd b/binutils/testsuite/binutils-all/windres/checkbox.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/checkbox.rsd
rename to binutils/testsuite/binutils-all/windres/checkbox.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rc b/binutils/testsuite/binutils-all/windres/combobox.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rc
rename to binutils/testsuite/binutils-all/windres/combobox.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rsd b/binutils/testsuite/binutils-all/windres/combobox.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/combobox.rsd
rename to binutils/testsuite/binutils-all/windres/combobox.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rc b/binutils/testsuite/binutils-all/windres/deflang.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rc
rename to binutils/testsuite/binutils-all/windres/deflang.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rsd b/binutils/testsuite/binutils-all/windres/deflang.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/deflang.rsd
rename to binutils/testsuite/binutils-all/windres/deflang.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rc b/binutils/testsuite/binutils-all/windres/dialog0.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rc
rename to binutils/testsuite/binutils-all/windres/dialog0.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rsd b/binutils/testsuite/binutils-all/windres/dialog0.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog0.rsd
rename to binutils/testsuite/binutils-all/windres/dialog0.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rc b/binutils/testsuite/binutils-all/windres/dialog1.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rc
rename to binutils/testsuite/binutils-all/windres/dialog1.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rsd b/binutils/testsuite/binutils-all/windres/dialog1.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialog1.rsd
rename to binutils/testsuite/binutils-all/windres/dialog1.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rc b/binutils/testsuite/binutils-all/windres/dialogid.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rc
rename to binutils/testsuite/binutils-all/windres/dialogid.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rsd b/binutils/testsuite/binutils-all/windres/dialogid.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogid.rsd
rename to binutils/testsuite/binutils-all/windres/dialogid.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rc b/binutils/testsuite/binutils-all/windres/dialogsignature.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rc
rename to binutils/testsuite/binutils-all/windres/dialogsignature.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rsd b/binutils/testsuite/binutils-all/windres/dialogsignature.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dialogsignature.rsd
rename to binutils/testsuite/binutils-all/windres/dialogsignature.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rc b/binutils/testsuite/binutils-all/windres/dlgfont.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rc
rename to binutils/testsuite/binutils-all/windres/dlgfont.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rsd b/binutils/testsuite/binutils-all/windres/dlgfont.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/dlgfont.rsd
rename to binutils/testsuite/binutils-all/windres/dlgfont.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rc b/binutils/testsuite/binutils-all/windres/edittext.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rc
rename to binutils/testsuite/binutils-all/windres/edittext.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rsd b/binutils/testsuite/binutils-all/windres/edittext.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/edittext.rsd
rename to binutils/testsuite/binutils-all/windres/edittext.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rc b/binutils/testsuite/binutils-all/windres/escapea.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rc
rename to binutils/testsuite/binutils-all/windres/escapea.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rsd b/binutils/testsuite/binutils-all/windres/escapea.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapea.rsd
rename to binutils/testsuite/binutils-all/windres/escapea.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rc b/binutils/testsuite/binutils-all/windres/escapex-2.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rc
rename to binutils/testsuite/binutils-all/windres/escapex-2.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rsd b/binutils/testsuite/binutils-all/windres/escapex-2.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex-2.rsd
rename to binutils/testsuite/binutils-all/windres/escapex-2.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rc b/binutils/testsuite/binutils-all/windres/escapex.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rc
rename to binutils/testsuite/binutils-all/windres/escapex.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rsd b/binutils/testsuite/binutils-all/windres/escapex.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/escapex.rsd
rename to binutils/testsuite/binutils-all/windres/escapex.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rc b/binutils/testsuite/binutils-all/windres/html.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rc
rename to binutils/testsuite/binutils-all/windres/html.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rsd b/binutils/testsuite/binutils-all/windres/html.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html.rsd
rename to binutils/testsuite/binutils-all/windres/html.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html1.hm b/binutils/testsuite/binutils-all/windres/html1.hm
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html1.hm
rename to binutils/testsuite/binutils-all/windres/html1.hm
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html2.hm b/binutils/testsuite/binutils-all/windres/html2.hm
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/html2.hm
rename to binutils/testsuite/binutils-all/windres/html2.hm
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rc b/binutils/testsuite/binutils-all/windres/lang.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rc
rename to binutils/testsuite/binutils-all/windres/lang.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rsd b/binutils/testsuite/binutils-all/windres/lang.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/lang.rsd
rename to binutils/testsuite/binutils-all/windres/lang.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rc b/binutils/testsuite/binutils-all/windres/listbox.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rc
rename to binutils/testsuite/binutils-all/windres/listbox.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rsd b/binutils/testsuite/binutils-all/windres/listbox.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/listbox.rsd
rename to binutils/testsuite/binutils-all/windres/listbox.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rc b/binutils/testsuite/binutils-all/windres/messagetable.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rc
rename to binutils/testsuite/binutils-all/windres/messagetable.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rsd b/binutils/testsuite/binutils-all/windres/messagetable.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/messagetable.rsd
rename to binutils/testsuite/binutils-all/windres/messagetable.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/msupdate b/binutils/testsuite/binutils-all/windres/msupdate
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/msupdate
rename to binutils/testsuite/binutils-all/windres/msupdate
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rc b/binutils/testsuite/binutils-all/windres/nocaption.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rc
rename to binutils/testsuite/binutils-all/windres/nocaption.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rsd b/binutils/testsuite/binutils-all/windres/nocaption.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/nocaption.rsd
rename to binutils/testsuite/binutils-all/windres/nocaption.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rc b/binutils/testsuite/binutils-all/windres/printstyle.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rc
rename to binutils/testsuite/binutils-all/windres/printstyle.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rsd b/binutils/testsuite/binutils-all/windres/printstyle.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/printstyle.rsd
rename to binutils/testsuite/binutils-all/windres/printstyle.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/quoteclass.rc b/binutils/testsuite/binutils-all/windres/quoteclass.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/quoteclass.rc
rename to binutils/testsuite/binutils-all/windres/quoteclass.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rc b/binutils/testsuite/binutils-all/windres/scrollbar.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rc
rename to binutils/testsuite/binutils-all/windres/scrollbar.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rsd b/binutils/testsuite/binutils-all/windres/scrollbar.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/scrollbar.rsd
rename to binutils/testsuite/binutils-all/windres/scrollbar.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rc b/binutils/testsuite/binutils-all/windres/strtab1.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rc
rename to binutils/testsuite/binutils-all/windres/strtab1.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rsd b/binutils/testsuite/binutils-all/windres/strtab1.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab1.rsd
rename to binutils/testsuite/binutils-all/windres/strtab1.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rc b/binutils/testsuite/binutils-all/windres/strtab2.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rc
rename to binutils/testsuite/binutils-all/windres/strtab2.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rsd b/binutils/testsuite/binutils-all/windres/strtab2.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/strtab2.rsd
rename to binutils/testsuite/binutils-all/windres/strtab2.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rc b/binutils/testsuite/binutils-all/windres/sublang.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rc
rename to binutils/testsuite/binutils-all/windres/sublang.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rsd b/binutils/testsuite/binutils-all/windres/sublang.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/sublang.rsd
rename to binutils/testsuite/binutils-all/windres/sublang.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rc b/binutils/testsuite/binutils-all/windres/version.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rc
rename to binutils/testsuite/binutils-all/windres/version.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rsd b/binutils/testsuite/binutils-all/windres/version.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version.rsd
rename to binutils/testsuite/binutils-all/windres/version.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rc b/binutils/testsuite/binutils-all/windres/version_cat.rc
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rc
rename to binutils/testsuite/binutils-all/windres/version_cat.rc
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rsd b/binutils/testsuite/binutils-all/windres/version_cat.rsd
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/version_cat.rsd
rename to binutils/testsuite/binutils-all/windres/version_cat.rsd
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/windres/windres.exp
rename to binutils/testsuite/binutils-all/windres/windres.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1.s b/binutils/testsuite/binutils-all/x86-64/compressed-1.s
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1.s
rename to binutils/testsuite/binutils-all/x86-64/compressed-1.s
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
rename to binutils/testsuite/binutils-all/x86-64/compressed-1a.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1b.d b/binutils/testsuite/binutils-all/x86-64/compressed-1b.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1b.d
rename to binutils/testsuite/binutils-all/x86-64/compressed-1b.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1c.d b/binutils/testsuite/binutils-all/x86-64/compressed-1c.d
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/compressed-1c.d
rename to binutils/testsuite/binutils-all/x86-64/compressed-1c.d
diff --git a/binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/x86-64.exp b/binutils/testsuite/binutils-all/x86-64/x86-64.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/binutils-all/x86-64/x86-64.exp
rename to binutils/testsuite/binutils-all/x86-64/x86-64.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/config/default.exp
rename to binutils/testsuite/config/default.exp
diff --git a/binutils/binutils-2.21/binutils/testsuite/config/hppa.sed b/binutils/testsuite/config/hppa.sed
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/config/hppa.sed
rename to binutils/testsuite/config/hppa.sed
diff --git a/binutils/binutils-2.21/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp
similarity index 100%
rename from binutils/binutils-2.21/binutils/testsuite/lib/utils-lib.exp
rename to binutils/testsuite/lib/utils-lib.exp
diff --git a/binutils/binutils-2.21/binutils/unwind-ia64.c b/binutils/unwind-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/unwind-ia64.c
rename to binutils/unwind-ia64.c
diff --git a/binutils/binutils-2.21/binutils/unwind-ia64.h b/binutils/unwind-ia64.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/unwind-ia64.h
rename to binutils/unwind-ia64.h
diff --git a/binutils/binutils-2.21/binutils/version.c b/binutils/version.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/version.c
rename to binutils/version.c
diff --git a/binutils/binutils-2.21/binutils/windint.h b/binutils/windint.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/windint.h
rename to binutils/windint.h
diff --git a/binutils/binutils-2.21/binutils/windmc.c b/binutils/windmc.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/windmc.c
rename to binutils/windmc.c
diff --git a/binutils/binutils-2.21/binutils/windmc.h b/binutils/windmc.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/windmc.h
rename to binutils/windmc.h
diff --git a/binutils/binutils-2.21/binutils/windres.c b/binutils/windres.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/windres.c
rename to binutils/windres.c
diff --git a/binutils/binutils-2.21/binutils/windres.h b/binutils/windres.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/windres.h
rename to binutils/windres.h
diff --git a/binutils/binutils-2.21/binutils/winduni.c b/binutils/winduni.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/winduni.c
rename to binutils/winduni.c
diff --git a/binutils/binutils-2.21/binutils/winduni.h b/binutils/winduni.h
similarity index 100%
rename from binutils/binutils-2.21/binutils/winduni.h
rename to binutils/winduni.h
diff --git a/binutils/binutils-2.21/binutils/wrstabs.c b/binutils/wrstabs.c
similarity index 100%
rename from binutils/binutils-2.21/binutils/wrstabs.c
rename to binutils/wrstabs.c
diff --git a/binutils/binutils-2.21/compile b/compile
similarity index 100%
rename from binutils/binutils-2.21/compile
rename to compile
diff --git a/binutils/binutils-2.21/config-ml.in b/config-ml.in
similarity index 100%
rename from binutils/binutils-2.21/config-ml.in
rename to config-ml.in
diff --git a/binutils/binutils-2.21/config.guess b/config.guess
similarity index 100%
rename from binutils/binutils-2.21/config.guess
rename to config.guess
diff --git a/binutils/binutils-2.21/config.rpath b/config.rpath
similarity index 100%
rename from binutils/binutils-2.21/config.rpath
rename to config.rpath
diff --git a/binutils/binutils-2.21/config.sub b/config.sub
similarity index 100%
rename from binutils/binutils-2.21/config.sub
rename to config.sub
diff --git a/binutils/binutils-2.21/config/ChangeLog b/config/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/config/ChangeLog
rename to config/ChangeLog
diff --git a/binutils/binutils-2.21/config/acinclude.m4 b/config/acinclude.m4
similarity index 100%
rename from binutils/binutils-2.21/config/acinclude.m4
rename to config/acinclude.m4
diff --git a/binutils/binutils-2.21/config/acx.m4 b/config/acx.m4
similarity index 100%
rename from binutils/binutils-2.21/config/acx.m4
rename to config/acx.m4
diff --git a/binutils/binutils-2.21/config/bootstrap-O1.mk b/config/bootstrap-O1.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-O1.mk
rename to config/bootstrap-O1.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-O3.mk b/config/bootstrap-O3.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-O3.mk
rename to config/bootstrap-O3.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-debug-big.mk b/config/bootstrap-debug-big.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-big.mk
rename to config/bootstrap-debug-big.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-debug-ckovw.mk b/config/bootstrap-debug-ckovw.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-ckovw.mk
rename to config/bootstrap-debug-ckovw.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-debug-lean.mk b/config/bootstrap-debug-lean.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-lean.mk
rename to config/bootstrap-debug-lean.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-debug-lib.mk b/config/bootstrap-debug-lib.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug-lib.mk
rename to config/bootstrap-debug-lib.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-debug.mk b/config/bootstrap-debug.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-debug.mk
rename to config/bootstrap-debug.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-lto.mk b/config/bootstrap-lto.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-lto.mk
rename to config/bootstrap-lto.mk
diff --git a/binutils/binutils-2.21/config/bootstrap-time.mk b/config/bootstrap-time.mk
similarity index 100%
rename from binutils/binutils-2.21/config/bootstrap-time.mk
rename to config/bootstrap-time.mk
diff --git a/binutils/binutils-2.21/config/codeset.m4 b/config/codeset.m4
similarity index 100%
rename from binutils/binutils-2.21/config/codeset.m4
rename to config/codeset.m4
diff --git a/binutils/binutils-2.21/config/depstand.m4 b/config/depstand.m4
similarity index 100%
rename from binutils/binutils-2.21/config/depstand.m4
rename to config/depstand.m4
diff --git a/binutils/binutils-2.21/config/dfp.m4 b/config/dfp.m4
similarity index 100%
rename from binutils/binutils-2.21/config/dfp.m4
rename to config/dfp.m4
diff --git a/binutils/binutils-2.21/config/elf.m4 b/config/elf.m4
similarity index 100%
rename from binutils/binutils-2.21/config/elf.m4
rename to config/elf.m4
diff --git a/binutils/binutils-2.21/config/enable.m4 b/config/enable.m4
similarity index 100%
rename from binutils/binutils-2.21/config/enable.m4
rename to config/enable.m4
diff --git a/binutils/binutils-2.21/config/extensions.m4 b/config/extensions.m4
similarity index 100%
rename from binutils/binutils-2.21/config/extensions.m4
rename to config/extensions.m4
diff --git a/binutils/binutils-2.21/config/futex.m4 b/config/futex.m4
similarity index 100%
rename from binutils/binutils-2.21/config/futex.m4
rename to config/futex.m4
diff --git a/binutils/binutils-2.21/config/gc++filt.m4 b/config/gc++filt.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gc++filt.m4
rename to config/gc++filt.m4
diff --git a/binutils/binutils-2.21/config/gettext-sister.m4 b/config/gettext-sister.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gettext-sister.m4
rename to config/gettext-sister.m4
diff --git a/binutils/binutils-2.21/config/gettext.m4 b/config/gettext.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gettext.m4
rename to config/gettext.m4
diff --git a/binutils/binutils-2.21/config/glibc21.m4 b/config/glibc21.m4
similarity index 100%
rename from binutils/binutils-2.21/config/glibc21.m4
rename to config/glibc21.m4
diff --git a/binutils/binutils-2.21/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4
similarity index 100%
rename from binutils/binutils-2.21/config/gxx-include-dir.m4
rename to config/gxx-include-dir.m4
diff --git a/binutils/binutils-2.21/config/iconv.m4 b/config/iconv.m4
similarity index 100%
rename from binutils/binutils-2.21/config/iconv.m4
rename to config/iconv.m4
diff --git a/binutils/binutils-2.21/config/intdiv0.m4 b/config/intdiv0.m4
similarity index 100%
rename from binutils/binutils-2.21/config/intdiv0.m4
rename to config/intdiv0.m4
diff --git a/binutils/binutils-2.21/config/inttypes-pri.m4 b/config/inttypes-pri.m4
similarity index 100%
rename from binutils/binutils-2.21/config/inttypes-pri.m4
rename to config/inttypes-pri.m4
diff --git a/binutils/binutils-2.21/config/inttypes.m4 b/config/inttypes.m4
similarity index 100%
rename from binutils/binutils-2.21/config/inttypes.m4
rename to config/inttypes.m4
diff --git a/binutils/binutils-2.21/config/inttypes_h.m4 b/config/inttypes_h.m4
similarity index 100%
rename from binutils/binutils-2.21/config/inttypes_h.m4
rename to config/inttypes_h.m4
diff --git a/binutils/binutils-2.21/config/largefile.m4 b/config/largefile.m4
similarity index 100%
rename from binutils/binutils-2.21/config/largefile.m4
rename to config/largefile.m4
diff --git a/binutils/binutils-2.21/config/lcmessage.m4 b/config/lcmessage.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lcmessage.m4
rename to config/lcmessage.m4
diff --git a/binutils/binutils-2.21/config/ld-symbolic.m4 b/config/ld-symbolic.m4
similarity index 100%
rename from binutils/binutils-2.21/config/ld-symbolic.m4
rename to config/ld-symbolic.m4
diff --git a/binutils/binutils-2.21/config/lead-dot.m4 b/config/lead-dot.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lead-dot.m4
rename to config/lead-dot.m4
diff --git a/binutils/binutils-2.21/config/lib-ld.m4 b/config/lib-ld.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lib-ld.m4
rename to config/lib-ld.m4
diff --git a/binutils/binutils-2.21/config/lib-link.m4 b/config/lib-link.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lib-link.m4
rename to config/lib-link.m4
diff --git a/binutils/binutils-2.21/config/lib-prefix.m4 b/config/lib-prefix.m4
similarity index 100%
rename from binutils/binutils-2.21/config/lib-prefix.m4
rename to config/lib-prefix.m4
diff --git a/binutils/binutils-2.21/config/mh-cxux b/config/mh-cxux
similarity index 100%
rename from binutils/binutils-2.21/config/mh-cxux
rename to config/mh-cxux
diff --git a/binutils/binutils-2.21/config/mh-cygwin b/config/mh-cygwin
similarity index 100%
rename from binutils/binutils-2.21/config/mh-cygwin
rename to config/mh-cygwin
diff --git a/binutils/binutils-2.21/config/mh-decstation b/config/mh-decstation
similarity index 100%
rename from binutils/binutils-2.21/config/mh-decstation
rename to config/mh-decstation
diff --git a/binutils/binutils-2.21/config/mh-dgux386 b/config/mh-dgux386
similarity index 100%
rename from binutils/binutils-2.21/config/mh-dgux386
rename to config/mh-dgux386
diff --git a/binutils/binutils-2.21/config/mh-djgpp b/config/mh-djgpp
similarity index 100%
rename from binutils/binutils-2.21/config/mh-djgpp
rename to config/mh-djgpp
diff --git a/binutils/binutils-2.21/config/mh-interix b/config/mh-interix
similarity index 100%
rename from binutils/binutils-2.21/config/mh-interix
rename to config/mh-interix
diff --git a/binutils/binutils-2.21/config/mh-lynxrs6k b/config/mh-lynxrs6k
similarity index 100%
rename from binutils/binutils-2.21/config/mh-lynxrs6k
rename to config/mh-lynxrs6k
diff --git a/binutils/binutils-2.21/config/mh-mingw b/config/mh-mingw
similarity index 100%
rename from binutils/binutils-2.21/config/mh-mingw
rename to config/mh-mingw
diff --git a/binutils/binutils-2.21/config/mh-ncr3000 b/config/mh-ncr3000
similarity index 100%
rename from binutils/binutils-2.21/config/mh-ncr3000
rename to config/mh-ncr3000
diff --git a/binutils/binutils-2.21/config/mh-necv4 b/config/mh-necv4
similarity index 100%
rename from binutils/binutils-2.21/config/mh-necv4
rename to config/mh-necv4
diff --git a/binutils/binutils-2.21/config/mh-pa b/config/mh-pa
similarity index 100%
rename from binutils/binutils-2.21/config/mh-pa
rename to config/mh-pa
diff --git a/binutils/binutils-2.21/config/mh-pa-hpux10 b/config/mh-pa-hpux10
similarity index 100%
rename from binutils/binutils-2.21/config/mh-pa-hpux10
rename to config/mh-pa-hpux10
diff --git a/binutils/binutils-2.21/config/mh-ppc-aix b/config/mh-ppc-aix
similarity index 100%
rename from binutils/binutils-2.21/config/mh-ppc-aix
rename to config/mh-ppc-aix
diff --git a/binutils/binutils-2.21/config/mh-ppc-darwin b/config/mh-ppc-darwin
similarity index 100%
rename from binutils/binutils-2.21/config/mh-ppc-darwin
rename to config/mh-ppc-darwin
diff --git a/binutils/binutils-2.21/config/mh-sco b/config/mh-sco
similarity index 100%
rename from binutils/binutils-2.21/config/mh-sco
rename to config/mh-sco
diff --git a/binutils/binutils-2.21/config/mh-solaris b/config/mh-solaris
similarity index 100%
rename from binutils/binutils-2.21/config/mh-solaris
rename to config/mh-solaris
diff --git a/binutils/binutils-2.21/config/mh-sysv4 b/config/mh-sysv4
similarity index 100%
rename from binutils/binutils-2.21/config/mh-sysv4
rename to config/mh-sysv4
diff --git a/binutils/binutils-2.21/config/mh-sysv5 b/config/mh-sysv5
similarity index 100%
rename from binutils/binutils-2.21/config/mh-sysv5
rename to config/mh-sysv5
diff --git a/binutils/binutils-2.21/config/mh-x86omitfp b/config/mh-x86omitfp
similarity index 100%
rename from binutils/binutils-2.21/config/mh-x86omitfp
rename to config/mh-x86omitfp
diff --git a/binutils/binutils-2.21/config/mt-alphaieee b/config/mt-alphaieee
similarity index 100%
rename from binutils/binutils-2.21/config/mt-alphaieee
rename to config/mt-alphaieee
diff --git a/binutils/binutils-2.21/config/mt-d30v b/config/mt-d30v
similarity index 100%
rename from binutils/binutils-2.21/config/mt-d30v
rename to config/mt-d30v
diff --git a/binutils/binutils-2.21/config/mt-gnu b/config/mt-gnu
similarity index 100%
rename from binutils/binutils-2.21/config/mt-gnu
rename to config/mt-gnu
diff --git a/binutils/binutils-2.21/config/mt-mep b/config/mt-mep
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mep
rename to config/mt-mep
diff --git a/binutils/binutils-2.21/config/mt-mips-elfoabi b/config/mt-mips-elfoabi
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mips-elfoabi
rename to config/mt-mips-elfoabi
diff --git a/binutils/binutils-2.21/config/mt-mips-gnu b/config/mt-mips-gnu
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mips-gnu
rename to config/mt-mips-gnu
diff --git a/binutils/binutils-2.21/config/mt-mips16-compat b/config/mt-mips16-compat
similarity index 100%
rename from binutils/binutils-2.21/config/mt-mips16-compat
rename to config/mt-mips16-compat
diff --git a/binutils/binutils-2.21/config/mt-netware b/config/mt-netware
similarity index 100%
rename from binutils/binutils-2.21/config/mt-netware
rename to config/mt-netware
diff --git a/binutils/binutils-2.21/config/mt-ospace b/config/mt-ospace
similarity index 100%
rename from binutils/binutils-2.21/config/mt-ospace
rename to config/mt-ospace
diff --git a/binutils/binutils-2.21/config/mt-sde b/config/mt-sde
similarity index 100%
rename from binutils/binutils-2.21/config/mt-sde
rename to config/mt-sde
diff --git a/binutils/binutils-2.21/config/mt-spu b/config/mt-spu
similarity index 100%
rename from binutils/binutils-2.21/config/mt-spu
rename to config/mt-spu
diff --git a/binutils/binutils-2.21/config/mt-v810 b/config/mt-v810
similarity index 100%
rename from binutils/binutils-2.21/config/mt-v810
rename to config/mt-v810
diff --git a/binutils/binutils-2.21/config/mt-wince b/config/mt-wince
similarity index 100%
rename from binutils/binutils-2.21/config/mt-wince
rename to config/mt-wince
diff --git a/binutils/binutils-2.21/config/multi.m4 b/config/multi.m4
similarity index 100%
rename from binutils/binutils-2.21/config/multi.m4
rename to config/multi.m4
diff --git a/binutils/binutils-2.21/config/nls.m4 b/config/nls.m4
similarity index 100%
rename from binutils/binutils-2.21/config/nls.m4
rename to config/nls.m4
diff --git a/binutils/binutils-2.21/config/no-executables.m4 b/config/no-executables.m4
similarity index 100%
rename from binutils/binutils-2.21/config/no-executables.m4
rename to config/no-executables.m4
diff --git a/binutils/binutils-2.21/config/override.m4 b/config/override.m4
similarity index 100%
rename from binutils/binutils-2.21/config/override.m4
rename to config/override.m4
diff --git a/binutils/binutils-2.21/config/plugins.m4 b/config/plugins.m4
similarity index 100%
rename from binutils/binutils-2.21/config/plugins.m4
rename to config/plugins.m4
diff --git a/binutils/binutils-2.21/config/po.m4 b/config/po.m4
similarity index 100%
rename from binutils/binutils-2.21/config/po.m4
rename to config/po.m4
diff --git a/binutils/binutils-2.21/config/proginstall.m4 b/config/proginstall.m4
similarity index 100%
rename from binutils/binutils-2.21/config/proginstall.m4
rename to config/proginstall.m4
diff --git a/binutils/binutils-2.21/config/progtest.m4 b/config/progtest.m4
similarity index 100%
rename from binutils/binutils-2.21/config/progtest.m4
rename to config/progtest.m4
diff --git a/binutils/binutils-2.21/config/stdint.m4 b/config/stdint.m4
similarity index 100%
rename from binutils/binutils-2.21/config/stdint.m4
rename to config/stdint.m4
diff --git a/binutils/binutils-2.21/config/stdint_h.m4 b/config/stdint_h.m4
similarity index 100%
rename from binutils/binutils-2.21/config/stdint_h.m4
rename to config/stdint_h.m4
diff --git a/binutils/binutils-2.21/config/tcl.m4 b/config/tcl.m4
similarity index 100%
rename from binutils/binutils-2.21/config/tcl.m4
rename to config/tcl.m4
diff --git a/binutils/binutils-2.21/config/tls.m4 b/config/tls.m4
similarity index 100%
rename from binutils/binutils-2.21/config/tls.m4
rename to config/tls.m4
diff --git a/binutils/binutils-2.21/config/uintmax_t.m4 b/config/uintmax_t.m4
similarity index 100%
rename from binutils/binutils-2.21/config/uintmax_t.m4
rename to config/uintmax_t.m4
diff --git a/binutils/binutils-2.21/config/ulonglong.m4 b/config/ulonglong.m4
similarity index 100%
rename from binutils/binutils-2.21/config/ulonglong.m4
rename to config/ulonglong.m4
diff --git a/binutils/binutils-2.21/config/unwind_ipinfo.m4 b/config/unwind_ipinfo.m4
similarity index 100%
rename from binutils/binutils-2.21/config/unwind_ipinfo.m4
rename to config/unwind_ipinfo.m4
diff --git a/binutils/binutils-2.21/config/warnings.m4 b/config/warnings.m4
similarity index 100%
rename from binutils/binutils-2.21/config/warnings.m4
rename to config/warnings.m4
diff --git a/binutils/binutils-2.21/config/zlib.m4 b/config/zlib.m4
similarity index 100%
rename from binutils/binutils-2.21/config/zlib.m4
rename to config/zlib.m4
diff --git a/binutils/binutils-2.21/configure b/configure
similarity index 100%
rename from binutils/binutils-2.21/configure
rename to configure
diff --git a/binutils/binutils-2.21/configure.ac b/configure.ac
similarity index 100%
rename from binutils/binutils-2.21/configure.ac
rename to configure.ac
diff --git a/binutils/binutils-2.21/cpu/ChangeLog b/cpu/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/cpu/ChangeLog
rename to cpu/ChangeLog
diff --git a/binutils/binutils-2.21/cpu/cris.cpu b/cpu/cris.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/cris.cpu
rename to cpu/cris.cpu
diff --git a/binutils/binutils-2.21/cpu/frv.cpu b/cpu/frv.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/frv.cpu
rename to cpu/frv.cpu
diff --git a/binutils/binutils-2.21/cpu/frv.opc b/cpu/frv.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/frv.opc
rename to cpu/frv.opc
diff --git a/binutils/binutils-2.21/cpu/iq10.cpu b/cpu/iq10.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq10.cpu
rename to cpu/iq10.cpu
diff --git a/binutils/binutils-2.21/cpu/iq2000.cpu b/cpu/iq2000.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq2000.cpu
rename to cpu/iq2000.cpu
diff --git a/binutils/binutils-2.21/cpu/iq2000.opc b/cpu/iq2000.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq2000.opc
rename to cpu/iq2000.opc
diff --git a/binutils/binutils-2.21/cpu/iq2000m.cpu b/cpu/iq2000m.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/iq2000m.cpu
rename to cpu/iq2000m.cpu
diff --git a/binutils/binutils-2.21/cpu/lm32.cpu b/cpu/lm32.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/lm32.cpu
rename to cpu/lm32.cpu
diff --git a/binutils/binutils-2.21/cpu/lm32.opc b/cpu/lm32.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/lm32.opc
rename to cpu/lm32.opc
diff --git a/binutils/binutils-2.21/cpu/m32c.cpu b/cpu/m32c.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32c.cpu
rename to cpu/m32c.cpu
diff --git a/binutils/binutils-2.21/cpu/m32c.opc b/cpu/m32c.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32c.opc
rename to cpu/m32c.opc
diff --git a/binutils/binutils-2.21/cpu/m32r.cpu b/cpu/m32r.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32r.cpu
rename to cpu/m32r.cpu
diff --git a/binutils/binutils-2.21/cpu/m32r.opc b/cpu/m32r.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/m32r.opc
rename to cpu/m32r.opc
diff --git a/binutils/binutils-2.21/cpu/mt.cpu b/cpu/mt.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/mt.cpu
rename to cpu/mt.cpu
diff --git a/binutils/binutils-2.21/cpu/mt.opc b/cpu/mt.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/mt.opc
rename to cpu/mt.opc
diff --git a/binutils/binutils-2.21/cpu/sh.cpu b/cpu/sh.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh.cpu
rename to cpu/sh.cpu
diff --git a/binutils/binutils-2.21/cpu/sh.opc b/cpu/sh.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh.opc
rename to cpu/sh.opc
diff --git a/binutils/binutils-2.21/cpu/sh64-compact.cpu b/cpu/sh64-compact.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh64-compact.cpu
rename to cpu/sh64-compact.cpu
diff --git a/binutils/binutils-2.21/cpu/sh64-media.cpu b/cpu/sh64-media.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/sh64-media.cpu
rename to cpu/sh64-media.cpu
diff --git a/binutils/binutils-2.21/cpu/simplify.inc b/cpu/simplify.inc
similarity index 100%
rename from binutils/binutils-2.21/cpu/simplify.inc
rename to cpu/simplify.inc
diff --git a/binutils/binutils-2.21/cpu/xc16x.cpu b/cpu/xc16x.cpu
similarity index 100%
rename from binutils/binutils-2.21/cpu/xc16x.cpu
rename to cpu/xc16x.cpu
diff --git a/binutils/binutils-2.21/cpu/xc16x.opc b/cpu/xc16x.opc
similarity index 100%
rename from binutils/binutils-2.21/cpu/xc16x.opc
rename to cpu/xc16x.opc
diff --git a/binutils/binutils-2.21/depcomp b/depcomp
similarity index 100%
rename from binutils/binutils-2.21/depcomp
rename to depcomp
diff --git a/binutils/binutils-2.21/elfcpp/ChangeLog b/elfcpp/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/ChangeLog
rename to elfcpp/ChangeLog
diff --git a/binutils/binutils-2.21/elfcpp/README b/elfcpp/README
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/README
rename to elfcpp/README
diff --git a/binutils/binutils-2.21/elfcpp/arm.h b/elfcpp/arm.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/arm.h
rename to elfcpp/arm.h
diff --git a/binutils/binutils-2.21/elfcpp/dwarf.h b/elfcpp/dwarf.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/dwarf.h
rename to elfcpp/dwarf.h
diff --git a/binutils/binutils-2.21/elfcpp/elfcpp.h b/elfcpp/elfcpp.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp.h
rename to elfcpp/elfcpp.h
diff --git a/binutils/binutils-2.21/elfcpp/elfcpp_file.h b/elfcpp/elfcpp_file.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp_file.h
rename to elfcpp/elfcpp_file.h
diff --git a/binutils/binutils-2.21/elfcpp/elfcpp_internal.h b/elfcpp/elfcpp_internal.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp_internal.h
rename to elfcpp/elfcpp_internal.h
diff --git a/binutils/binutils-2.21/elfcpp/elfcpp_swap.h b/elfcpp/elfcpp_swap.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/elfcpp_swap.h
rename to elfcpp/elfcpp_swap.h
diff --git a/binutils/binutils-2.21/elfcpp/i386.h b/elfcpp/i386.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/i386.h
rename to elfcpp/i386.h
diff --git a/binutils/binutils-2.21/elfcpp/powerpc.h b/elfcpp/powerpc.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/powerpc.h
rename to elfcpp/powerpc.h
diff --git a/binutils/binutils-2.21/elfcpp/sparc.h b/elfcpp/sparc.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/sparc.h
rename to elfcpp/sparc.h
diff --git a/binutils/binutils-2.21/elfcpp/x86_64.h b/elfcpp/x86_64.h
similarity index 100%
rename from binutils/binutils-2.21/elfcpp/x86_64.h
rename to elfcpp/x86_64.h
diff --git a/binutils/binutils-2.21/etc/ChangeLog b/etc/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/etc/ChangeLog
rename to etc/ChangeLog
diff --git a/binutils/binutils-2.21/etc/Makefile.in b/etc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/etc/Makefile.in
rename to etc/Makefile.in
diff --git a/binutils/binutils-2.21/etc/configbuild.ein b/etc/configbuild.ein
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.ein
rename to etc/configbuild.ein
diff --git a/binutils/binutils-2.21/etc/configbuild.fig b/etc/configbuild.fig
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.fig
rename to etc/configbuild.fig
diff --git a/binutils/binutils-2.21/etc/configbuild.jin b/etc/configbuild.jin
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.jin
rename to etc/configbuild.jin
Binary files differ
diff --git a/binutils/binutils-2.21/etc/configbuild.tin b/etc/configbuild.tin
similarity index 100%
rename from binutils/binutils-2.21/etc/configbuild.tin
rename to etc/configbuild.tin
diff --git a/binutils/binutils-2.21/etc/configdev.ein b/etc/configdev.ein
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.ein
rename to etc/configdev.ein
diff --git a/binutils/binutils-2.21/etc/configdev.fig b/etc/configdev.fig
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.fig
rename to etc/configdev.fig
diff --git a/binutils/binutils-2.21/etc/configdev.jin b/etc/configdev.jin
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.jin
rename to etc/configdev.jin
Binary files differ
diff --git a/binutils/binutils-2.21/etc/configdev.tin b/etc/configdev.tin
similarity index 100%
rename from binutils/binutils-2.21/etc/configdev.tin
rename to etc/configdev.tin
diff --git a/binutils/binutils-2.21/etc/configure b/etc/configure
similarity index 100%
rename from binutils/binutils-2.21/etc/configure
rename to etc/configure
diff --git a/binutils/binutils-2.21/etc/configure.in b/etc/configure.in
similarity index 100%
rename from binutils/binutils-2.21/etc/configure.in
rename to etc/configure.in
diff --git a/binutils/binutils-2.21/etc/configure.texi b/etc/configure.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/configure.texi
rename to etc/configure.texi
diff --git a/binutils/binutils-2.21/etc/fdl.texi b/etc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/fdl.texi
rename to etc/fdl.texi
diff --git a/binutils/binutils-2.21/etc/gnu-oids.texi b/etc/gnu-oids.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/gnu-oids.texi
rename to etc/gnu-oids.texi
diff --git a/binutils/binutils-2.21/etc/make-stds.texi b/etc/make-stds.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/make-stds.texi
rename to etc/make-stds.texi
diff --git a/binutils/binutils-2.21/etc/standards.texi b/etc/standards.texi
similarity index 100%
rename from binutils/binutils-2.21/etc/standards.texi
rename to etc/standards.texi
diff --git a/binutils/binutils-2.21/etc/texi2pod.pl b/etc/texi2pod.pl
similarity index 100%
rename from binutils/binutils-2.21/etc/texi2pod.pl
rename to etc/texi2pod.pl
diff --git a/binutils/binutils-2.21/gas/CONTRIBUTORS b/gas/CONTRIBUTORS
similarity index 100%
rename from binutils/binutils-2.21/gas/CONTRIBUTORS
rename to gas/CONTRIBUTORS
diff --git a/binutils/binutils-2.21/gas/COPYING b/gas/COPYING
similarity index 100%
rename from binutils/binutils-2.21/gas/COPYING
rename to gas/COPYING
diff --git a/binutils/binutils-2.21/gas/ChangeLog b/gas/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog
rename to gas/ChangeLog
diff --git a/binutils/binutils-2.21/gas/ChangeLog-0001 b/gas/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-0001
rename to gas/ChangeLog-0001
diff --git a/binutils/binutils-2.21/gas/ChangeLog-0203 b/gas/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-0203
rename to gas/ChangeLog-0203
diff --git a/binutils/binutils-2.21/gas/ChangeLog-2004 b/gas/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2004
rename to gas/ChangeLog-2004
diff --git a/binutils/binutils-2.21/gas/ChangeLog-2005 b/gas/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2005
rename to gas/ChangeLog-2005
diff --git a/binutils/binutils-2.21/gas/ChangeLog-2006 b/gas/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2006
rename to gas/ChangeLog-2006
diff --git a/binutils/binutils-2.21/gas/ChangeLog-2007 b/gas/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2007
rename to gas/ChangeLog-2007
diff --git a/binutils/binutils-2.21/gas/ChangeLog-2008 b/gas/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2008
rename to gas/ChangeLog-2008
diff --git a/binutils/binutils-2.21/gas/ChangeLog-2009 b/gas/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-2009
rename to gas/ChangeLog-2009
diff --git a/binutils/binutils-2.21/gas/ChangeLog-9295 b/gas/ChangeLog-9295
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-9295
rename to gas/ChangeLog-9295
diff --git a/binutils/binutils-2.21/gas/ChangeLog-9697 b/gas/ChangeLog-9697
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-9697
rename to gas/ChangeLog-9697
diff --git a/binutils/binutils-2.21/gas/ChangeLog-9899 b/gas/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/gas/ChangeLog-9899
rename to gas/ChangeLog-9899
diff --git a/binutils/binutils-2.21/gas/MAINTAINERS b/gas/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/gas/MAINTAINERS
rename to gas/MAINTAINERS
diff --git a/binutils/binutils-2.21/gas/Makefile.am b/gas/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/gas/Makefile.am
rename to gas/Makefile.am
diff --git a/binutils/binutils-2.21/gas/Makefile.in b/gas/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/gas/Makefile.in
rename to gas/Makefile.in
diff --git a/binutils/binutils-2.21/gas/NEWS b/gas/NEWS
similarity index 100%
rename from binutils/binutils-2.21/gas/NEWS
rename to gas/NEWS
diff --git a/binutils/binutils-2.21/gas/README b/gas/README
similarity index 100%
rename from binutils/binutils-2.21/gas/README
rename to gas/README
diff --git a/binutils/binutils-2.21/gas/acinclude.m4 b/gas/acinclude.m4
similarity index 100%
rename from binutils/binutils-2.21/gas/acinclude.m4
rename to gas/acinclude.m4
diff --git a/binutils/binutils-2.21/gas/aclocal.m4 b/gas/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/gas/aclocal.m4
rename to gas/aclocal.m4
diff --git a/binutils/binutils-2.21/gas/app.c b/gas/app.c
similarity index 100%
rename from binutils/binutils-2.21/gas/app.c
rename to gas/app.c
diff --git a/binutils/binutils-2.21/gas/as.c b/gas/as.c
similarity index 100%
rename from binutils/binutils-2.21/gas/as.c
rename to gas/as.c
diff --git a/binutils/binutils-2.21/gas/as.h b/gas/as.h
similarity index 100%
rename from binutils/binutils-2.21/gas/as.h
rename to gas/as.h
diff --git a/binutils/binutils-2.21/gas/asintl.h b/gas/asintl.h
similarity index 100%
rename from binutils/binutils-2.21/gas/asintl.h
rename to gas/asintl.h
diff --git a/binutils/binutils-2.21/gas/atof-generic.c b/gas/atof-generic.c
similarity index 100%
rename from binutils/binutils-2.21/gas/atof-generic.c
rename to gas/atof-generic.c
diff --git a/binutils/binutils-2.21/gas/bfin-lex.c b/gas/bfin-lex.c
similarity index 100%
rename from binutils/binutils-2.21/gas/bfin-lex.c
rename to gas/bfin-lex.c
diff --git a/binutils/binutils-2.21/gas/bfin-parse.c b/gas/bfin-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/bfin-parse.c
rename to gas/bfin-parse.c
diff --git a/binutils/binutils-2.21/gas/bfin-parse.h b/gas/bfin-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/bfin-parse.h
rename to gas/bfin-parse.h
diff --git a/binutils/binutils-2.21/gas/bignum.h b/gas/bignum.h
similarity index 100%
rename from binutils/binutils-2.21/gas/bignum.h
rename to gas/bignum.h
diff --git a/binutils/binutils-2.21/gas/bit_fix.h b/gas/bit_fix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/bit_fix.h
rename to gas/bit_fix.h
diff --git a/binutils/binutils-2.21/gas/cgen.c b/gas/cgen.c
similarity index 100%
rename from binutils/binutils-2.21/gas/cgen.c
rename to gas/cgen.c
diff --git a/binutils/binutils-2.21/gas/cgen.h b/gas/cgen.h
similarity index 100%
rename from binutils/binutils-2.21/gas/cgen.h
rename to gas/cgen.h
diff --git a/binutils/binutils-2.21/gas/compress-debug.c b/gas/compress-debug.c
similarity index 100%
rename from binutils/binutils-2.21/gas/compress-debug.c
rename to gas/compress-debug.c
diff --git a/binutils/binutils-2.21/gas/compress-debug.h b/gas/compress-debug.h
similarity index 100%
rename from binutils/binutils-2.21/gas/compress-debug.h
rename to gas/compress-debug.h
diff --git a/binutils/binutils-2.21/gas/cond.c b/gas/cond.c
similarity index 100%
rename from binutils/binutils-2.21/gas/cond.c
rename to gas/cond.c
diff --git a/binutils/binutils-2.21/gas/config.in b/gas/config.in
similarity index 100%
rename from binutils/binutils-2.21/gas/config.in
rename to gas/config.in
diff --git a/binutils/binutils-2.21/gas/config/aout_gnu.h b/gas/config/aout_gnu.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/aout_gnu.h
rename to gas/config/aout_gnu.h
diff --git a/binutils/binutils-2.21/gas/config/atof-ieee.c b/gas/config/atof-ieee.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/atof-ieee.c
rename to gas/config/atof-ieee.c
diff --git a/binutils/binutils-2.21/gas/config/atof-vax.c b/gas/config/atof-vax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/atof-vax.c
rename to gas/config/atof-vax.c
diff --git a/binutils/binutils-2.21/gas/config/bfin-aux.h b/gas/config/bfin-aux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-aux.h
rename to gas/config/bfin-aux.h
diff --git a/binutils/binutils-2.21/gas/config/bfin-defs.h b/gas/config/bfin-defs.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-defs.h
rename to gas/config/bfin-defs.h
diff --git a/binutils/binutils-2.21/gas/config/bfin-lex.l b/gas/config/bfin-lex.l
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-lex.l
rename to gas/config/bfin-lex.l
diff --git a/binutils/binutils-2.21/gas/config/bfin-parse.y b/gas/config/bfin-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/config/bfin-parse.y
rename to gas/config/bfin-parse.y
diff --git a/binutils/binutils-2.21/gas/config/e-crisaout.c b/gas/config/e-crisaout.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-crisaout.c
rename to gas/config/e-crisaout.c
diff --git a/binutils/binutils-2.21/gas/config/e-criself.c b/gas/config/e-criself.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-criself.c
rename to gas/config/e-criself.c
diff --git a/binutils/binutils-2.21/gas/config/e-i386aout.c b/gas/config/e-i386aout.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-i386aout.c
rename to gas/config/e-i386aout.c
diff --git a/binutils/binutils-2.21/gas/config/e-i386coff.c b/gas/config/e-i386coff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-i386coff.c
rename to gas/config/e-i386coff.c
diff --git a/binutils/binutils-2.21/gas/config/e-i386elf.c b/gas/config/e-i386elf.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-i386elf.c
rename to gas/config/e-i386elf.c
diff --git a/binutils/binutils-2.21/gas/config/e-mipsecoff.c b/gas/config/e-mipsecoff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-mipsecoff.c
rename to gas/config/e-mipsecoff.c
diff --git a/binutils/binutils-2.21/gas/config/e-mipself.c b/gas/config/e-mipself.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/e-mipself.c
rename to gas/config/e-mipself.c
diff --git a/binutils/binutils-2.21/gas/config/itbl-mips.h b/gas/config/itbl-mips.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/itbl-mips.h
rename to gas/config/itbl-mips.h
diff --git a/binutils/binutils-2.21/gas/config/m68k-parse.h b/gas/config/m68k-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/m68k-parse.h
rename to gas/config/m68k-parse.h
diff --git a/binutils/binutils-2.21/gas/config/m68k-parse.y b/gas/config/m68k-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/config/m68k-parse.y
rename to gas/config/m68k-parse.y
diff --git a/binutils/binutils-2.21/gas/config/obj-aout.c b/gas/config/obj-aout.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-aout.c
rename to gas/config/obj-aout.c
diff --git a/binutils/binutils-2.21/gas/config/obj-aout.h b/gas/config/obj-aout.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-aout.h
rename to gas/config/obj-aout.h
diff --git a/binutils/binutils-2.21/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff-seh.c
rename to gas/config/obj-coff-seh.c
diff --git a/binutils/binutils-2.21/gas/config/obj-coff-seh.h b/gas/config/obj-coff-seh.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff-seh.h
rename to gas/config/obj-coff-seh.h
diff --git a/binutils/binutils-2.21/gas/config/obj-coff.c b/gas/config/obj-coff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff.c
rename to gas/config/obj-coff.c
diff --git a/binutils/binutils-2.21/gas/config/obj-coff.h b/gas/config/obj-coff.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-coff.h
rename to gas/config/obj-coff.h
diff --git a/binutils/binutils-2.21/gas/config/obj-ecoff.c b/gas/config/obj-ecoff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-ecoff.c
rename to gas/config/obj-ecoff.c
diff --git a/binutils/binutils-2.21/gas/config/obj-ecoff.h b/gas/config/obj-ecoff.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-ecoff.h
rename to gas/config/obj-ecoff.h
diff --git a/binutils/binutils-2.21/gas/config/obj-elf.c b/gas/config/obj-elf.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-elf.c
rename to gas/config/obj-elf.c
diff --git a/binutils/binutils-2.21/gas/config/obj-elf.h b/gas/config/obj-elf.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-elf.h
rename to gas/config/obj-elf.h
diff --git a/binutils/binutils-2.21/gas/config/obj-evax.c b/gas/config/obj-evax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-evax.c
rename to gas/config/obj-evax.c
diff --git a/binutils/binutils-2.21/gas/config/obj-evax.h b/gas/config/obj-evax.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-evax.h
rename to gas/config/obj-evax.h
diff --git a/binutils/binutils-2.21/gas/config/obj-fdpicelf.c b/gas/config/obj-fdpicelf.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-fdpicelf.c
rename to gas/config/obj-fdpicelf.c
diff --git a/binutils/binutils-2.21/gas/config/obj-fdpicelf.h b/gas/config/obj-fdpicelf.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-fdpicelf.h
rename to gas/config/obj-fdpicelf.h
diff --git a/binutils/binutils-2.21/gas/config/obj-macho.c b/gas/config/obj-macho.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-macho.c
rename to gas/config/obj-macho.c
diff --git a/binutils/binutils-2.21/gas/config/obj-macho.h b/gas/config/obj-macho.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-macho.h
rename to gas/config/obj-macho.h
diff --git a/binutils/binutils-2.21/gas/config/obj-multi.c b/gas/config/obj-multi.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-multi.c
rename to gas/config/obj-multi.c
diff --git a/binutils/binutils-2.21/gas/config/obj-multi.h b/gas/config/obj-multi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-multi.h
rename to gas/config/obj-multi.h
diff --git a/binutils/binutils-2.21/gas/config/obj-som.c b/gas/config/obj-som.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-som.c
rename to gas/config/obj-som.c
diff --git a/binutils/binutils-2.21/gas/config/obj-som.h b/gas/config/obj-som.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/obj-som.h
rename to gas/config/obj-som.h
diff --git a/binutils/binutils-2.21/gas/config/rx-defs.h b/gas/config/rx-defs.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/rx-defs.h
rename to gas/config/rx-defs.h
diff --git a/binutils/binutils-2.21/gas/config/rx-parse.y b/gas/config/rx-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/config/rx-parse.y
rename to gas/config/rx-parse.y
diff --git a/binutils/binutils-2.21/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-alpha.c
rename to gas/config/tc-alpha.c
diff --git a/binutils/binutils-2.21/gas/config/tc-alpha.h b/gas/config/tc-alpha.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-alpha.h
rename to gas/config/tc-alpha.h
diff --git a/binutils/binutils-2.21/gas/config/tc-arc.c b/gas/config/tc-arc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arc.c
rename to gas/config/tc-arc.c
diff --git a/binutils/binutils-2.21/gas/config/tc-arc.h b/gas/config/tc-arc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arc.h
rename to gas/config/tc-arc.h
diff --git a/binutils/binutils-2.21/gas/config/tc-arm.c b/gas/config/tc-arm.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arm.c
rename to gas/config/tc-arm.c
diff --git a/binutils/binutils-2.21/gas/config/tc-arm.h b/gas/config/tc-arm.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-arm.h
rename to gas/config/tc-arm.h
diff --git a/binutils/binutils-2.21/gas/config/tc-avr.c b/gas/config/tc-avr.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-avr.c
rename to gas/config/tc-avr.c
diff --git a/binutils/binutils-2.21/gas/config/tc-avr.h b/gas/config/tc-avr.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-avr.h
rename to gas/config/tc-avr.h
diff --git a/binutils/binutils-2.21/gas/config/tc-bfin.c b/gas/config/tc-bfin.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-bfin.c
rename to gas/config/tc-bfin.c
diff --git a/binutils/binutils-2.21/gas/config/tc-bfin.h b/gas/config/tc-bfin.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-bfin.h
rename to gas/config/tc-bfin.h
diff --git a/binutils/binutils-2.21/gas/config/tc-cr16.c b/gas/config/tc-cr16.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cr16.c
rename to gas/config/tc-cr16.c
diff --git a/binutils/binutils-2.21/gas/config/tc-cr16.h b/gas/config/tc-cr16.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cr16.h
rename to gas/config/tc-cr16.h
diff --git a/binutils/binutils-2.21/gas/config/tc-cris.c b/gas/config/tc-cris.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cris.c
rename to gas/config/tc-cris.c
diff --git a/binutils/binutils-2.21/gas/config/tc-cris.h b/gas/config/tc-cris.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-cris.h
rename to gas/config/tc-cris.h
diff --git a/binutils/binutils-2.21/gas/config/tc-crx.c b/gas/config/tc-crx.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-crx.c
rename to gas/config/tc-crx.c
diff --git a/binutils/binutils-2.21/gas/config/tc-crx.h b/gas/config/tc-crx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-crx.h
rename to gas/config/tc-crx.h
diff --git a/binutils/binutils-2.21/gas/config/tc-d10v.c b/gas/config/tc-d10v.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d10v.c
rename to gas/config/tc-d10v.c
diff --git a/binutils/binutils-2.21/gas/config/tc-d10v.h b/gas/config/tc-d10v.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d10v.h
rename to gas/config/tc-d10v.h
diff --git a/binutils/binutils-2.21/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d30v.c
rename to gas/config/tc-d30v.c
diff --git a/binutils/binutils-2.21/gas/config/tc-d30v.h b/gas/config/tc-d30v.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-d30v.h
rename to gas/config/tc-d30v.h
diff --git a/binutils/binutils-2.21/gas/config/tc-dlx.c b/gas/config/tc-dlx.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-dlx.c
rename to gas/config/tc-dlx.c
diff --git a/binutils/binutils-2.21/gas/config/tc-dlx.h b/gas/config/tc-dlx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-dlx.h
rename to gas/config/tc-dlx.h
diff --git a/binutils/binutils-2.21/gas/config/tc-fr30.c b/gas/config/tc-fr30.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-fr30.c
rename to gas/config/tc-fr30.c
diff --git a/binutils/binutils-2.21/gas/config/tc-fr30.h b/gas/config/tc-fr30.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-fr30.h
rename to gas/config/tc-fr30.h
diff --git a/binutils/binutils-2.21/gas/config/tc-frv.c b/gas/config/tc-frv.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-frv.c
rename to gas/config/tc-frv.c
diff --git a/binutils/binutils-2.21/gas/config/tc-frv.h b/gas/config/tc-frv.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-frv.h
rename to gas/config/tc-frv.h
diff --git a/binutils/binutils-2.21/gas/config/tc-generic.c b/gas/config/tc-generic.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-generic.c
rename to gas/config/tc-generic.c
diff --git a/binutils/binutils-2.21/gas/config/tc-generic.h b/gas/config/tc-generic.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-generic.h
rename to gas/config/tc-generic.h
diff --git a/binutils/binutils-2.21/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-h8300.c
rename to gas/config/tc-h8300.c
diff --git a/binutils/binutils-2.21/gas/config/tc-h8300.h b/gas/config/tc-h8300.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-h8300.h
rename to gas/config/tc-h8300.h
diff --git a/binutils/binutils-2.21/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-hppa.c
rename to gas/config/tc-hppa.c
diff --git a/binutils/binutils-2.21/gas/config/tc-hppa.h b/gas/config/tc-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-hppa.h
rename to gas/config/tc-hppa.h
diff --git a/binutils/binutils-2.21/gas/config/tc-i370.c b/gas/config/tc-i370.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i370.c
rename to gas/config/tc-i370.c
diff --git a/binutils/binutils-2.21/gas/config/tc-i370.h b/gas/config/tc-i370.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i370.h
rename to gas/config/tc-i370.h
diff --git a/binutils/binutils-2.21/gas/config/tc-i386-intel.c b/gas/config/tc-i386-intel.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i386-intel.c
rename to gas/config/tc-i386-intel.c
diff --git a/binutils/binutils-2.21/gas/config/tc-i386.c b/gas/config/tc-i386.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i386.c
rename to gas/config/tc-i386.c
diff --git a/binutils/binutils-2.21/gas/config/tc-i386.h b/gas/config/tc-i386.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i386.h
rename to gas/config/tc-i386.h
diff --git a/binutils/binutils-2.21/gas/config/tc-i860.c b/gas/config/tc-i860.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i860.c
rename to gas/config/tc-i860.c
diff --git a/binutils/binutils-2.21/gas/config/tc-i860.h b/gas/config/tc-i860.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i860.h
rename to gas/config/tc-i860.h
diff --git a/binutils/binutils-2.21/gas/config/tc-i960.c b/gas/config/tc-i960.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i960.c
rename to gas/config/tc-i960.c
diff --git a/binutils/binutils-2.21/gas/config/tc-i960.h b/gas/config/tc-i960.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-i960.h
rename to gas/config/tc-i960.h
diff --git a/binutils/binutils-2.21/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ia64.c
rename to gas/config/tc-ia64.c
diff --git a/binutils/binutils-2.21/gas/config/tc-ia64.h b/gas/config/tc-ia64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ia64.h
rename to gas/config/tc-ia64.h
diff --git a/binutils/binutils-2.21/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ip2k.c
rename to gas/config/tc-ip2k.c
diff --git a/binutils/binutils-2.21/gas/config/tc-ip2k.h b/gas/config/tc-ip2k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ip2k.h
rename to gas/config/tc-ip2k.h
diff --git a/binutils/binutils-2.21/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-iq2000.c
rename to gas/config/tc-iq2000.c
diff --git a/binutils/binutils-2.21/gas/config/tc-iq2000.h b/gas/config/tc-iq2000.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-iq2000.h
rename to gas/config/tc-iq2000.h
diff --git a/binutils/binutils-2.21/gas/config/tc-lm32.c b/gas/config/tc-lm32.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-lm32.c
rename to gas/config/tc-lm32.c
diff --git a/binutils/binutils-2.21/gas/config/tc-lm32.h b/gas/config/tc-lm32.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-lm32.h
rename to gas/config/tc-lm32.h
diff --git a/binutils/binutils-2.21/gas/config/tc-m32c.c b/gas/config/tc-m32c.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32c.c
rename to gas/config/tc-m32c.c
diff --git a/binutils/binutils-2.21/gas/config/tc-m32c.h b/gas/config/tc-m32c.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32c.h
rename to gas/config/tc-m32c.h
diff --git a/binutils/binutils-2.21/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32r.c
rename to gas/config/tc-m32r.c
diff --git a/binutils/binutils-2.21/gas/config/tc-m32r.h b/gas/config/tc-m32r.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m32r.h
rename to gas/config/tc-m32r.h
diff --git a/binutils/binutils-2.21/gas/config/tc-m68851.h b/gas/config/tc-m68851.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68851.h
rename to gas/config/tc-m68851.h
diff --git a/binutils/binutils-2.21/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68hc11.c
rename to gas/config/tc-m68hc11.c
diff --git a/binutils/binutils-2.21/gas/config/tc-m68hc11.h b/gas/config/tc-m68hc11.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68hc11.h
rename to gas/config/tc-m68hc11.h
diff --git a/binutils/binutils-2.21/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68k.c
rename to gas/config/tc-m68k.c
diff --git a/binutils/binutils-2.21/gas/config/tc-m68k.h b/gas/config/tc-m68k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-m68k.h
rename to gas/config/tc-m68k.h
diff --git a/binutils/binutils-2.21/gas/config/tc-mcore.c b/gas/config/tc-mcore.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mcore.c
rename to gas/config/tc-mcore.c
diff --git a/binutils/binutils-2.21/gas/config/tc-mcore.h b/gas/config/tc-mcore.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mcore.h
rename to gas/config/tc-mcore.h
diff --git a/binutils/binutils-2.21/gas/config/tc-mep.c b/gas/config/tc-mep.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mep.c
rename to gas/config/tc-mep.c
diff --git a/binutils/binutils-2.21/gas/config/tc-mep.h b/gas/config/tc-mep.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mep.h
rename to gas/config/tc-mep.h
diff --git a/binutils/binutils-2.21/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-microblaze.c
rename to gas/config/tc-microblaze.c
diff --git a/binutils/binutils-2.21/gas/config/tc-microblaze.h b/gas/config/tc-microblaze.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-microblaze.h
rename to gas/config/tc-microblaze.h
diff --git a/binutils/binutils-2.21/gas/config/tc-mips.c b/gas/config/tc-mips.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mips.c
rename to gas/config/tc-mips.c
diff --git a/binutils/binutils-2.21/gas/config/tc-mips.h b/gas/config/tc-mips.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mips.h
rename to gas/config/tc-mips.h
diff --git a/binutils/binutils-2.21/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mmix.c
rename to gas/config/tc-mmix.c
diff --git a/binutils/binutils-2.21/gas/config/tc-mmix.h b/gas/config/tc-mmix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mmix.h
rename to gas/config/tc-mmix.h
diff --git a/binutils/binutils-2.21/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10200.c
rename to gas/config/tc-mn10200.c
diff --git a/binutils/binutils-2.21/gas/config/tc-mn10200.h b/gas/config/tc-mn10200.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10200.h
rename to gas/config/tc-mn10200.h
diff --git a/binutils/binutils-2.21/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10300.c
rename to gas/config/tc-mn10300.c
diff --git a/binutils/binutils-2.21/gas/config/tc-mn10300.h b/gas/config/tc-mn10300.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mn10300.h
rename to gas/config/tc-mn10300.h
diff --git a/binutils/binutils-2.21/gas/config/tc-moxie.c b/gas/config/tc-moxie.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-moxie.c
rename to gas/config/tc-moxie.c
diff --git a/binutils/binutils-2.21/gas/config/tc-moxie.h b/gas/config/tc-moxie.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-moxie.h
rename to gas/config/tc-moxie.h
diff --git a/binutils/binutils-2.21/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-msp430.c
rename to gas/config/tc-msp430.c
diff --git a/binutils/binutils-2.21/gas/config/tc-msp430.h b/gas/config/tc-msp430.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-msp430.h
rename to gas/config/tc-msp430.h
diff --git a/binutils/binutils-2.21/gas/config/tc-mt.c b/gas/config/tc-mt.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mt.c
rename to gas/config/tc-mt.c
diff --git a/binutils/binutils-2.21/gas/config/tc-mt.h b/gas/config/tc-mt.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-mt.h
rename to gas/config/tc-mt.h
diff --git a/binutils/binutils-2.21/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ns32k.c
rename to gas/config/tc-ns32k.c
diff --git a/binutils/binutils-2.21/gas/config/tc-ns32k.h b/gas/config/tc-ns32k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ns32k.h
rename to gas/config/tc-ns32k.h
diff --git a/binutils/binutils-2.21/gas/config/tc-openrisc.c b/gas/config/tc-openrisc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-openrisc.c
rename to gas/config/tc-openrisc.c
diff --git a/binutils/binutils-2.21/gas/config/tc-openrisc.h b/gas/config/tc-openrisc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-openrisc.h
rename to gas/config/tc-openrisc.h
diff --git a/binutils/binutils-2.21/gas/config/tc-or32.c b/gas/config/tc-or32.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-or32.c
rename to gas/config/tc-or32.c
diff --git a/binutils/binutils-2.21/gas/config/tc-or32.h b/gas/config/tc-or32.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-or32.h
rename to gas/config/tc-or32.h
diff --git a/binutils/binutils-2.21/gas/config/tc-pdp11.c b/gas/config/tc-pdp11.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pdp11.c
rename to gas/config/tc-pdp11.c
diff --git a/binutils/binutils-2.21/gas/config/tc-pdp11.h b/gas/config/tc-pdp11.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pdp11.h
rename to gas/config/tc-pdp11.h
diff --git a/binutils/binutils-2.21/gas/config/tc-pj.c b/gas/config/tc-pj.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pj.c
rename to gas/config/tc-pj.c
diff --git a/binutils/binutils-2.21/gas/config/tc-pj.h b/gas/config/tc-pj.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-pj.h
rename to gas/config/tc-pj.h
diff --git a/binutils/binutils-2.21/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ppc.c
rename to gas/config/tc-ppc.c
diff --git a/binutils/binutils-2.21/gas/config/tc-ppc.h b/gas/config/tc-ppc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-ppc.h
rename to gas/config/tc-ppc.h
diff --git a/binutils/binutils-2.21/gas/config/tc-rx.c b/gas/config/tc-rx.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-rx.c
rename to gas/config/tc-rx.c
diff --git a/binutils/binutils-2.21/gas/config/tc-rx.h b/gas/config/tc-rx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-rx.h
rename to gas/config/tc-rx.h
diff --git a/binutils/binutils-2.21/gas/config/tc-s390.c b/gas/config/tc-s390.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-s390.c
rename to gas/config/tc-s390.c
diff --git a/binutils/binutils-2.21/gas/config/tc-s390.h b/gas/config/tc-s390.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-s390.h
rename to gas/config/tc-s390.h
diff --git a/binutils/binutils-2.21/gas/config/tc-score.c b/gas/config/tc-score.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-score.c
rename to gas/config/tc-score.c
diff --git a/binutils/binutils-2.21/gas/config/tc-score.h b/gas/config/tc-score.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-score.h
rename to gas/config/tc-score.h
diff --git a/binutils/binutils-2.21/gas/config/tc-score7.c b/gas/config/tc-score7.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-score7.c
rename to gas/config/tc-score7.c
diff --git a/binutils/binutils-2.21/gas/config/tc-sh.c b/gas/config/tc-sh.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh.c
rename to gas/config/tc-sh.c
diff --git a/binutils/binutils-2.21/gas/config/tc-sh.h b/gas/config/tc-sh.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh.h
rename to gas/config/tc-sh.h
diff --git a/binutils/binutils-2.21/gas/config/tc-sh64.c b/gas/config/tc-sh64.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh64.c
rename to gas/config/tc-sh64.c
diff --git a/binutils/binutils-2.21/gas/config/tc-sh64.h b/gas/config/tc-sh64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sh64.h
rename to gas/config/tc-sh64.h
diff --git a/binutils/binutils-2.21/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sparc.c
rename to gas/config/tc-sparc.c
diff --git a/binutils/binutils-2.21/gas/config/tc-sparc.h b/gas/config/tc-sparc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-sparc.h
rename to gas/config/tc-sparc.h
diff --git a/binutils/binutils-2.21/gas/config/tc-spu.c b/gas/config/tc-spu.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-spu.c
rename to gas/config/tc-spu.c
diff --git a/binutils/binutils-2.21/gas/config/tc-spu.h b/gas/config/tc-spu.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-spu.h
rename to gas/config/tc-spu.h
diff --git a/binutils/binutils-2.21/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic30.c
rename to gas/config/tc-tic30.c
diff --git a/binutils/binutils-2.21/gas/config/tc-tic30.h b/gas/config/tc-tic30.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic30.h
rename to gas/config/tc-tic30.h
diff --git a/binutils/binutils-2.21/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic4x.c
rename to gas/config/tc-tic4x.c
diff --git a/binutils/binutils-2.21/gas/config/tc-tic4x.h b/gas/config/tc-tic4x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic4x.h
rename to gas/config/tc-tic4x.h
diff --git a/binutils/binutils-2.21/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic54x.c
rename to gas/config/tc-tic54x.c
diff --git a/binutils/binutils-2.21/gas/config/tc-tic54x.h b/gas/config/tc-tic54x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic54x.h
rename to gas/config/tc-tic54x.h
diff --git a/binutils/binutils-2.21/gas/config/tc-tic6x.c b/gas/config/tc-tic6x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic6x.c
rename to gas/config/tc-tic6x.c
diff --git a/binutils/binutils-2.21/gas/config/tc-tic6x.h b/gas/config/tc-tic6x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-tic6x.h
rename to gas/config/tc-tic6x.h
diff --git a/binutils/binutils-2.21/gas/config/tc-v850.c b/gas/config/tc-v850.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-v850.c
rename to gas/config/tc-v850.c
diff --git a/binutils/binutils-2.21/gas/config/tc-v850.h b/gas/config/tc-v850.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-v850.h
rename to gas/config/tc-v850.h
diff --git a/binutils/binutils-2.21/gas/config/tc-vax.c b/gas/config/tc-vax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-vax.c
rename to gas/config/tc-vax.c
diff --git a/binutils/binutils-2.21/gas/config/tc-vax.h b/gas/config/tc-vax.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-vax.h
rename to gas/config/tc-vax.h
diff --git a/binutils/binutils-2.21/gas/config/tc-xc16x.c b/gas/config/tc-xc16x.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xc16x.c
rename to gas/config/tc-xc16x.c
diff --git a/binutils/binutils-2.21/gas/config/tc-xc16x.h b/gas/config/tc-xc16x.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xc16x.h
rename to gas/config/tc-xc16x.h
diff --git a/binutils/binutils-2.21/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xstormy16.c
rename to gas/config/tc-xstormy16.c
diff --git a/binutils/binutils-2.21/gas/config/tc-xstormy16.h b/gas/config/tc-xstormy16.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xstormy16.h
rename to gas/config/tc-xstormy16.h
diff --git a/binutils/binutils-2.21/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xtensa.c
rename to gas/config/tc-xtensa.c
diff --git a/binutils/binutils-2.21/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-xtensa.h
rename to gas/config/tc-xtensa.h
diff --git a/binutils/binutils-2.21/gas/config/tc-z80.c b/gas/config/tc-z80.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z80.c
rename to gas/config/tc-z80.c
diff --git a/binutils/binutils-2.21/gas/config/tc-z80.h b/gas/config/tc-z80.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z80.h
rename to gas/config/tc-z80.h
diff --git a/binutils/binutils-2.21/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z8k.c
rename to gas/config/tc-z8k.c
diff --git a/binutils/binutils-2.21/gas/config/tc-z8k.h b/gas/config/tc-z8k.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/tc-z8k.h
rename to gas/config/tc-z8k.h
diff --git a/binutils/binutils-2.21/gas/config/te-386bsd.h b/gas/config/te-386bsd.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-386bsd.h
rename to gas/config/te-386bsd.h
diff --git a/binutils/binutils-2.21/gas/config/te-aix5.h b/gas/config/te-aix5.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-aix5.h
rename to gas/config/te-aix5.h
diff --git a/binutils/binutils-2.21/gas/config/te-armeabi.h b/gas/config/te-armeabi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-armeabi.h
rename to gas/config/te-armeabi.h
diff --git a/binutils/binutils-2.21/gas/config/te-armlinuxeabi.h b/gas/config/te-armlinuxeabi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-armlinuxeabi.h
rename to gas/config/te-armlinuxeabi.h
diff --git a/binutils/binutils-2.21/gas/config/te-dynix.h b/gas/config/te-dynix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-dynix.h
rename to gas/config/te-dynix.h
diff --git a/binutils/binutils-2.21/gas/config/te-epoc-pe.h b/gas/config/te-epoc-pe.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-epoc-pe.h
rename to gas/config/te-epoc-pe.h
diff --git a/binutils/binutils-2.21/gas/config/te-freebsd.h b/gas/config/te-freebsd.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-freebsd.h
rename to gas/config/te-freebsd.h
diff --git a/binutils/binutils-2.21/gas/config/te-generic.h b/gas/config/te-generic.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-generic.h
rename to gas/config/te-generic.h
diff --git a/binutils/binutils-2.21/gas/config/te-gnu.h b/gas/config/te-gnu.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-gnu.h
rename to gas/config/te-gnu.h
diff --git a/binutils/binutils-2.21/gas/config/te-go32.h b/gas/config/te-go32.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-go32.h
rename to gas/config/te-go32.h
diff --git a/binutils/binutils-2.21/gas/config/te-hppa.h b/gas/config/te-hppa.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hppa.h
rename to gas/config/te-hppa.h
diff --git a/binutils/binutils-2.21/gas/config/te-hppa64.h b/gas/config/te-hppa64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hppa64.h
rename to gas/config/te-hppa64.h
diff --git a/binutils/binutils-2.21/gas/config/te-hppalinux64.h b/gas/config/te-hppalinux64.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hppalinux64.h
rename to gas/config/te-hppalinux64.h
diff --git a/binutils/binutils-2.21/gas/config/te-hpux.h b/gas/config/te-hpux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-hpux.h
rename to gas/config/te-hpux.h
diff --git a/binutils/binutils-2.21/gas/config/te-i386aix.h b/gas/config/te-i386aix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-i386aix.h
rename to gas/config/te-i386aix.h
diff --git a/binutils/binutils-2.21/gas/config/te-ia64aix.h b/gas/config/te-ia64aix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-ia64aix.h
rename to gas/config/te-ia64aix.h
diff --git a/binutils/binutils-2.21/gas/config/te-interix.h b/gas/config/te-interix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-interix.h
rename to gas/config/te-interix.h
diff --git a/binutils/binutils-2.21/gas/config/te-irix.h b/gas/config/te-irix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-irix.h
rename to gas/config/te-irix.h
diff --git a/binutils/binutils-2.21/gas/config/te-linux.h b/gas/config/te-linux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-linux.h
rename to gas/config/te-linux.h
diff --git a/binutils/binutils-2.21/gas/config/te-lnews.h b/gas/config/te-lnews.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-lnews.h
rename to gas/config/te-lnews.h
diff --git a/binutils/binutils-2.21/gas/config/te-lynx.h b/gas/config/te-lynx.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-lynx.h
rename to gas/config/te-lynx.h
diff --git a/binutils/binutils-2.21/gas/config/te-mach.h b/gas/config/te-mach.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-mach.h
rename to gas/config/te-mach.h
diff --git a/binutils/binutils-2.21/gas/config/te-macos.h b/gas/config/te-macos.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-macos.h
rename to gas/config/te-macos.h
diff --git a/binutils/binutils-2.21/gas/config/te-nbsd.h b/gas/config/te-nbsd.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-nbsd.h
rename to gas/config/te-nbsd.h
diff --git a/binutils/binutils-2.21/gas/config/te-nbsd532.h b/gas/config/te-nbsd532.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-nbsd532.h
rename to gas/config/te-nbsd532.h
diff --git a/binutils/binutils-2.21/gas/config/te-netware.h b/gas/config/te-netware.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-netware.h
rename to gas/config/te-netware.h
diff --git a/binutils/binutils-2.21/gas/config/te-pc532mach.h b/gas/config/te-pc532mach.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-pc532mach.h
rename to gas/config/te-pc532mach.h
diff --git a/binutils/binutils-2.21/gas/config/te-pe.h b/gas/config/te-pe.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-pe.h
rename to gas/config/te-pe.h
diff --git a/binutils/binutils-2.21/gas/config/te-pep.h b/gas/config/te-pep.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-pep.h
rename to gas/config/te-pep.h
diff --git a/binutils/binutils-2.21/gas/config/te-psos.h b/gas/config/te-psos.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-psos.h
rename to gas/config/te-psos.h
diff --git a/binutils/binutils-2.21/gas/config/te-riscix.h b/gas/config/te-riscix.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-riscix.h
rename to gas/config/te-riscix.h
diff --git a/binutils/binutils-2.21/gas/config/te-solaris.h b/gas/config/te-solaris.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-solaris.h
rename to gas/config/te-solaris.h
diff --git a/binutils/binutils-2.21/gas/config/te-sparcaout.h b/gas/config/te-sparcaout.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-sparcaout.h
rename to gas/config/te-sparcaout.h
diff --git a/binutils/binutils-2.21/gas/config/te-sun3.h b/gas/config/te-sun3.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-sun3.h
rename to gas/config/te-sun3.h
diff --git a/binutils/binutils-2.21/gas/config/te-svr4.h b/gas/config/te-svr4.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-svr4.h
rename to gas/config/te-svr4.h
diff --git a/binutils/binutils-2.21/gas/config/te-symbian.h b/gas/config/te-symbian.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-symbian.h
rename to gas/config/te-symbian.h
diff --git a/binutils/binutils-2.21/gas/config/te-tmips.h b/gas/config/te-tmips.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-tmips.h
rename to gas/config/te-tmips.h
diff --git a/binutils/binutils-2.21/gas/config/te-uclinux.h b/gas/config/te-uclinux.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-uclinux.h
rename to gas/config/te-uclinux.h
diff --git a/binutils/binutils-2.21/gas/config/te-vms.c b/gas/config/te-vms.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-vms.c
rename to gas/config/te-vms.c
diff --git a/binutils/binutils-2.21/gas/config/te-vms.h b/gas/config/te-vms.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-vms.h
rename to gas/config/te-vms.h
diff --git a/binutils/binutils-2.21/gas/config/te-vxworks.h b/gas/config/te-vxworks.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-vxworks.h
rename to gas/config/te-vxworks.h
diff --git a/binutils/binutils-2.21/gas/config/te-wince-pe.h b/gas/config/te-wince-pe.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/te-wince-pe.h
rename to gas/config/te-wince-pe.h
diff --git a/binutils/binutils-2.21/gas/config/vax-inst.h b/gas/config/vax-inst.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/vax-inst.h
rename to gas/config/vax-inst.h
diff --git a/binutils/binutils-2.21/gas/config/xtensa-istack.h b/gas/config/xtensa-istack.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/xtensa-istack.h
rename to gas/config/xtensa-istack.h
diff --git a/binutils/binutils-2.21/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c
similarity index 100%
rename from binutils/binutils-2.21/gas/config/xtensa-relax.c
rename to gas/config/xtensa-relax.c
diff --git a/binutils/binutils-2.21/gas/config/xtensa-relax.h b/gas/config/xtensa-relax.h
similarity index 100%
rename from binutils/binutils-2.21/gas/config/xtensa-relax.h
rename to gas/config/xtensa-relax.h
diff --git a/binutils/binutils-2.21/gas/configure b/gas/configure
similarity index 100%
rename from binutils/binutils-2.21/gas/configure
rename to gas/configure
diff --git a/binutils/binutils-2.21/gas/configure.com b/gas/configure.com
similarity index 100%
rename from binutils/binutils-2.21/gas/configure.com
rename to gas/configure.com
diff --git a/binutils/binutils-2.21/gas/configure.in b/gas/configure.in
similarity index 100%
rename from binutils/binutils-2.21/gas/configure.in
rename to gas/configure.in
diff --git a/binutils/binutils-2.21/gas/configure.tgt b/gas/configure.tgt
similarity index 100%
rename from binutils/binutils-2.21/gas/configure.tgt
rename to gas/configure.tgt
diff --git a/binutils/binutils-2.21/gas/debug.c b/gas/debug.c
similarity index 100%
rename from binutils/binutils-2.21/gas/debug.c
rename to gas/debug.c
diff --git a/binutils/binutils-2.21/gas/dep-in.sed b/gas/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/gas/dep-in.sed
rename to gas/dep-in.sed
diff --git a/binutils/binutils-2.21/gas/depend.c b/gas/depend.c
similarity index 100%
rename from binutils/binutils-2.21/gas/depend.c
rename to gas/depend.c
diff --git a/binutils/binutils-2.21/gas/doc/Makefile.am b/gas/doc/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/Makefile.am
rename to gas/doc/Makefile.am
diff --git a/binutils/binutils-2.21/gas/doc/Makefile.in b/gas/doc/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/Makefile.in
rename to gas/doc/Makefile.in
diff --git a/binutils/binutils-2.21/gas/doc/all.texi b/gas/doc/all.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/all.texi
rename to gas/doc/all.texi
diff --git a/binutils/binutils-2.21/gas/doc/as.texinfo b/gas/doc/as.texinfo
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/as.texinfo
rename to gas/doc/as.texinfo
diff --git a/binutils/binutils-2.21/gas/doc/asconfig.texi b/gas/doc/asconfig.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/asconfig.texi
rename to gas/doc/asconfig.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-alpha.texi b/gas/doc/c-alpha.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-alpha.texi
rename to gas/doc/c-alpha.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-arc.texi b/gas/doc/c-arc.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-arc.texi
rename to gas/doc/c-arc.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-arm.texi
rename to gas/doc/c-arm.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-avr.texi b/gas/doc/c-avr.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-avr.texi
rename to gas/doc/c-avr.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-bfin.texi b/gas/doc/c-bfin.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-bfin.texi
rename to gas/doc/c-bfin.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-cr16.texi b/gas/doc/c-cr16.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-cr16.texi
rename to gas/doc/c-cr16.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-cris.texi b/gas/doc/c-cris.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-cris.texi
rename to gas/doc/c-cris.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-d10v.texi b/gas/doc/c-d10v.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-d10v.texi
rename to gas/doc/c-d10v.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-d30v.texi b/gas/doc/c-d30v.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-d30v.texi
rename to gas/doc/c-d30v.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-h8300.texi b/gas/doc/c-h8300.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-h8300.texi
rename to gas/doc/c-h8300.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-hppa.texi b/gas/doc/c-hppa.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-hppa.texi
rename to gas/doc/c-hppa.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-i370.texi b/gas/doc/c-i370.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i370.texi
rename to gas/doc/c-i370.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-i386.texi b/gas/doc/c-i386.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i386.texi
rename to gas/doc/c-i386.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-i860.texi b/gas/doc/c-i860.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i860.texi
rename to gas/doc/c-i860.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-i960.texi b/gas/doc/c-i960.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-i960.texi
rename to gas/doc/c-i960.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-ia64.texi b/gas/doc/c-ia64.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ia64.texi
rename to gas/doc/c-ia64.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-ip2k.texi b/gas/doc/c-ip2k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ip2k.texi
rename to gas/doc/c-ip2k.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-lm32.texi b/gas/doc/c-lm32.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-lm32.texi
rename to gas/doc/c-lm32.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-m32c.texi b/gas/doc/c-m32c.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m32c.texi
rename to gas/doc/c-m32c.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-m32r.texi b/gas/doc/c-m32r.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m32r.texi
rename to gas/doc/c-m32r.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-m68hc11.texi b/gas/doc/c-m68hc11.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m68hc11.texi
rename to gas/doc/c-m68hc11.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-m68k.texi b/gas/doc/c-m68k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-m68k.texi
rename to gas/doc/c-m68k.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-microblaze.texi b/gas/doc/c-microblaze.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-microblaze.texi
rename to gas/doc/c-microblaze.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-mips.texi
rename to gas/doc/c-mips.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-mmix.texi b/gas/doc/c-mmix.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-mmix.texi
rename to gas/doc/c-mmix.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-msp430.texi b/gas/doc/c-msp430.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-msp430.texi
rename to gas/doc/c-msp430.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-mt.texi b/gas/doc/c-mt.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-mt.texi
rename to gas/doc/c-mt.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-ns32k.texi b/gas/doc/c-ns32k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ns32k.texi
rename to gas/doc/c-ns32k.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-pdp11.texi b/gas/doc/c-pdp11.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-pdp11.texi
rename to gas/doc/c-pdp11.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-pj.texi b/gas/doc/c-pj.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-pj.texi
rename to gas/doc/c-pj.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-ppc.texi b/gas/doc/c-ppc.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-ppc.texi
rename to gas/doc/c-ppc.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-rx.texi b/gas/doc/c-rx.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-rx.texi
rename to gas/doc/c-rx.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-s390.texi b/gas/doc/c-s390.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-s390.texi
rename to gas/doc/c-s390.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-score.texi b/gas/doc/c-score.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-score.texi
rename to gas/doc/c-score.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-sh.texi b/gas/doc/c-sh.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-sh.texi
rename to gas/doc/c-sh.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-sh64.texi b/gas/doc/c-sh64.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-sh64.texi
rename to gas/doc/c-sh64.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-sparc.texi b/gas/doc/c-sparc.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-sparc.texi
rename to gas/doc/c-sparc.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-tic54x.texi b/gas/doc/c-tic54x.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-tic54x.texi
rename to gas/doc/c-tic54x.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-tic6x.texi b/gas/doc/c-tic6x.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-tic6x.texi
rename to gas/doc/c-tic6x.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-v850.texi b/gas/doc/c-v850.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-v850.texi
rename to gas/doc/c-v850.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-vax.texi b/gas/doc/c-vax.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-vax.texi
rename to gas/doc/c-vax.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-xc16x.texi b/gas/doc/c-xc16x.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-xc16x.texi
rename to gas/doc/c-xc16x.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-xtensa.texi b/gas/doc/c-xtensa.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-xtensa.texi
rename to gas/doc/c-xtensa.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-z80.texi b/gas/doc/c-z80.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-z80.texi
rename to gas/doc/c-z80.texi
diff --git a/binutils/binutils-2.21/gas/doc/c-z8k.texi b/gas/doc/c-z8k.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/c-z8k.texi
rename to gas/doc/c-z8k.texi
diff --git a/binutils/binutils-2.21/gas/doc/fdl.texi b/gas/doc/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/fdl.texi
rename to gas/doc/fdl.texi
diff --git a/binutils/binutils-2.21/gas/doc/h8.texi b/gas/doc/h8.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/h8.texi
rename to gas/doc/h8.texi
diff --git a/binutils/binutils-2.21/gas/doc/internals.texi b/gas/doc/internals.texi
similarity index 100%
rename from binutils/binutils-2.21/gas/doc/internals.texi
rename to gas/doc/internals.texi
diff --git a/binutils/binutils-2.21/gas/dw2gencfi.c b/gas/dw2gencfi.c
similarity index 100%
rename from binutils/binutils-2.21/gas/dw2gencfi.c
rename to gas/dw2gencfi.c
diff --git a/binutils/binutils-2.21/gas/dw2gencfi.h b/gas/dw2gencfi.h
similarity index 100%
rename from binutils/binutils-2.21/gas/dw2gencfi.h
rename to gas/dw2gencfi.h
diff --git a/binutils/binutils-2.21/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
similarity index 100%
rename from binutils/binutils-2.21/gas/dwarf2dbg.c
rename to gas/dwarf2dbg.c
diff --git a/binutils/binutils-2.21/gas/dwarf2dbg.h b/gas/dwarf2dbg.h
similarity index 100%
rename from binutils/binutils-2.21/gas/dwarf2dbg.h
rename to gas/dwarf2dbg.h
diff --git a/binutils/binutils-2.21/gas/ecoff.c b/gas/ecoff.c
similarity index 100%
rename from binutils/binutils-2.21/gas/ecoff.c
rename to gas/ecoff.c
diff --git a/binutils/binutils-2.21/gas/ecoff.h b/gas/ecoff.h
similarity index 100%
rename from binutils/binutils-2.21/gas/ecoff.h
rename to gas/ecoff.h
diff --git a/binutils/binutils-2.21/gas/ehopt.c b/gas/ehopt.c
similarity index 100%
rename from binutils/binutils-2.21/gas/ehopt.c
rename to gas/ehopt.c
diff --git a/binutils/binutils-2.21/gas/emul-target.h b/gas/emul-target.h
similarity index 100%
rename from binutils/binutils-2.21/gas/emul-target.h
rename to gas/emul-target.h
diff --git a/binutils/binutils-2.21/gas/emul.h b/gas/emul.h
similarity index 100%
rename from binutils/binutils-2.21/gas/emul.h
rename to gas/emul.h
diff --git a/binutils/binutils-2.21/gas/expr.c b/gas/expr.c
similarity index 100%
rename from binutils/binutils-2.21/gas/expr.c
rename to gas/expr.c
diff --git a/binutils/binutils-2.21/gas/expr.h b/gas/expr.h
similarity index 100%
rename from binutils/binutils-2.21/gas/expr.h
rename to gas/expr.h
diff --git a/binutils/binutils-2.21/gas/flonum-copy.c b/gas/flonum-copy.c
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum-copy.c
rename to gas/flonum-copy.c
diff --git a/binutils/binutils-2.21/gas/flonum-konst.c b/gas/flonum-konst.c
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum-konst.c
rename to gas/flonum-konst.c
diff --git a/binutils/binutils-2.21/gas/flonum-mult.c b/gas/flonum-mult.c
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum-mult.c
rename to gas/flonum-mult.c
diff --git a/binutils/binutils-2.21/gas/flonum.h b/gas/flonum.h
similarity index 100%
rename from binutils/binutils-2.21/gas/flonum.h
rename to gas/flonum.h
diff --git a/binutils/binutils-2.21/gas/frags.c b/gas/frags.c
similarity index 100%
rename from binutils/binutils-2.21/gas/frags.c
rename to gas/frags.c
diff --git a/binutils/binutils-2.21/gas/frags.h b/gas/frags.h
similarity index 100%
rename from binutils/binutils-2.21/gas/frags.h
rename to gas/frags.h
diff --git a/binutils/binutils-2.21/gas/gdbinit.in b/gas/gdbinit.in
similarity index 100%
rename from binutils/binutils-2.21/gas/gdbinit.in
rename to gas/gdbinit.in
diff --git a/binutils/binutils-2.21/gas/hash.c b/gas/hash.c
similarity index 100%
rename from binutils/binutils-2.21/gas/hash.c
rename to gas/hash.c
diff --git a/binutils/binutils-2.21/gas/hash.h b/gas/hash.h
similarity index 100%
rename from binutils/binutils-2.21/gas/hash.h
rename to gas/hash.h
diff --git a/binutils/binutils-2.21/gas/input-file.c b/gas/input-file.c
similarity index 100%
rename from binutils/binutils-2.21/gas/input-file.c
rename to gas/input-file.c
diff --git a/binutils/binutils-2.21/gas/input-file.h b/gas/input-file.h
similarity index 100%
rename from binutils/binutils-2.21/gas/input-file.h
rename to gas/input-file.h
diff --git a/binutils/binutils-2.21/gas/input-scrub.c b/gas/input-scrub.c
similarity index 100%
rename from binutils/binutils-2.21/gas/input-scrub.c
rename to gas/input-scrub.c
diff --git a/binutils/binutils-2.21/gas/itbl-lex.c b/gas/itbl-lex.c
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-lex.c
rename to gas/itbl-lex.c
diff --git a/binutils/binutils-2.21/gas/itbl-lex.h b/gas/itbl-lex.h
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-lex.h
rename to gas/itbl-lex.h
diff --git a/binutils/binutils-2.21/gas/itbl-lex.l b/gas/itbl-lex.l
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-lex.l
rename to gas/itbl-lex.l
diff --git a/binutils/binutils-2.21/gas/itbl-ops.c b/gas/itbl-ops.c
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-ops.c
rename to gas/itbl-ops.c
diff --git a/binutils/binutils-2.21/gas/itbl-ops.h b/gas/itbl-ops.h
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-ops.h
rename to gas/itbl-ops.h
diff --git a/binutils/binutils-2.21/gas/itbl-parse.c b/gas/itbl-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-parse.c
rename to gas/itbl-parse.c
diff --git a/binutils/binutils-2.21/gas/itbl-parse.h b/gas/itbl-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-parse.h
rename to gas/itbl-parse.h
diff --git a/binutils/binutils-2.21/gas/itbl-parse.y b/gas/itbl-parse.y
similarity index 100%
rename from binutils/binutils-2.21/gas/itbl-parse.y
rename to gas/itbl-parse.y
diff --git a/binutils/binutils-2.21/gas/listing.c b/gas/listing.c
similarity index 100%
rename from binutils/binutils-2.21/gas/listing.c
rename to gas/listing.c
diff --git a/binutils/binutils-2.21/gas/listing.h b/gas/listing.h
similarity index 100%
rename from binutils/binutils-2.21/gas/listing.h
rename to gas/listing.h
diff --git a/binutils/binutils-2.21/gas/literal.c b/gas/literal.c
similarity index 100%
rename from binutils/binutils-2.21/gas/literal.c
rename to gas/literal.c
diff --git a/binutils/binutils-2.21/gas/m68k-parse.c b/gas/m68k-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/m68k-parse.c
rename to gas/m68k-parse.c
diff --git a/binutils/binutils-2.21/gas/macro.c b/gas/macro.c
similarity index 100%
rename from binutils/binutils-2.21/gas/macro.c
rename to gas/macro.c
diff --git a/binutils/binutils-2.21/gas/macro.h b/gas/macro.h
similarity index 100%
rename from binutils/binutils-2.21/gas/macro.h
rename to gas/macro.h
diff --git a/binutils/binutils-2.21/gas/makefile.vms b/gas/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/gas/makefile.vms
rename to gas/makefile.vms
diff --git a/binutils/binutils-2.21/gas/messages.c b/gas/messages.c
similarity index 100%
rename from binutils/binutils-2.21/gas/messages.c
rename to gas/messages.c
diff --git a/binutils/binutils-2.21/gas/obj.h b/gas/obj.h
similarity index 100%
rename from binutils/binutils-2.21/gas/obj.h
rename to gas/obj.h
diff --git a/binutils/binutils-2.21/gas/output-file.c b/gas/output-file.c
similarity index 100%
rename from binutils/binutils-2.21/gas/output-file.c
rename to gas/output-file.c
diff --git a/binutils/binutils-2.21/gas/output-file.h b/gas/output-file.h
similarity index 100%
rename from binutils/binutils-2.21/gas/output-file.h
rename to gas/output-file.h
diff --git a/binutils/binutils-2.21/gas/po/Make-in b/gas/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/gas/po/Make-in
rename to gas/po/Make-in
diff --git a/binutils/binutils-2.21/gas/po/POTFILES.in b/gas/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/gas/po/POTFILES.in
rename to gas/po/POTFILES.in
diff --git a/binutils/binutils-2.21/gas/po/es.gmo b/gas/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/es.gmo
rename to gas/po/es.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gas/po/es.po b/gas/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/es.po
rename to gas/po/es.po
diff --git a/binutils/binutils-2.21/gas/po/fr.gmo b/gas/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/fr.gmo
rename to gas/po/fr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gas/po/fr.po b/gas/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/fr.po
rename to gas/po/fr.po
diff --git a/binutils/binutils-2.21/gas/po/gas.pot b/gas/po/gas.pot
similarity index 100%
rename from binutils/binutils-2.21/gas/po/gas.pot
rename to gas/po/gas.pot
diff --git a/binutils/binutils-2.21/gas/po/id.gmo b/gas/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/id.gmo
rename to gas/po/id.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gas/po/id.po b/gas/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/id.po
rename to gas/po/id.po
diff --git a/binutils/binutils-2.21/gas/po/ru.gmo b/gas/po/ru.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/ru.gmo
rename to gas/po/ru.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gas/po/ru.po b/gas/po/ru.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/ru.po
rename to gas/po/ru.po
diff --git a/binutils/binutils-2.21/gas/po/rw.gmo b/gas/po/rw.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/rw.gmo
rename to gas/po/rw.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gas/po/rw.po b/gas/po/rw.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/rw.po
rename to gas/po/rw.po
diff --git a/binutils/binutils-2.21/gas/po/tr.gmo b/gas/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/gas/po/tr.gmo
rename to gas/po/tr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gas/po/tr.po b/gas/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/gas/po/tr.po
rename to gas/po/tr.po
diff --git a/binutils/binutils-2.21/gas/read.c b/gas/read.c
similarity index 100%
rename from binutils/binutils-2.21/gas/read.c
rename to gas/read.c
diff --git a/binutils/binutils-2.21/gas/read.h b/gas/read.h
similarity index 100%
rename from binutils/binutils-2.21/gas/read.h
rename to gas/read.h
diff --git a/binutils/binutils-2.21/gas/remap.c b/gas/remap.c
similarity index 100%
rename from binutils/binutils-2.21/gas/remap.c
rename to gas/remap.c
diff --git a/binutils/binutils-2.21/gas/rx-parse.c b/gas/rx-parse.c
similarity index 100%
rename from binutils/binutils-2.21/gas/rx-parse.c
rename to gas/rx-parse.c
diff --git a/binutils/binutils-2.21/gas/rx-parse.h b/gas/rx-parse.h
similarity index 100%
rename from binutils/binutils-2.21/gas/rx-parse.h
rename to gas/rx-parse.h
diff --git a/binutils/binutils-2.21/gas/sb.c b/gas/sb.c
similarity index 100%
rename from binutils/binutils-2.21/gas/sb.c
rename to gas/sb.c
diff --git a/binutils/binutils-2.21/gas/sb.h b/gas/sb.h
similarity index 100%
rename from binutils/binutils-2.21/gas/sb.h
rename to gas/sb.h
diff --git a/binutils/binutils-2.21/gas/stabs.c b/gas/stabs.c
similarity index 100%
rename from binutils/binutils-2.21/gas/stabs.c
rename to gas/stabs.c
diff --git a/binutils/binutils-2.21/gas/stamp-h.in b/gas/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/gas/stamp-h.in
rename to gas/stamp-h.in
diff --git a/binutils/binutils-2.21/gas/struc-symbol.h b/gas/struc-symbol.h
similarity index 100%
rename from binutils/binutils-2.21/gas/struc-symbol.h
rename to gas/struc-symbol.h
diff --git a/binutils/binutils-2.21/gas/subsegs.c b/gas/subsegs.c
similarity index 100%
rename from binutils/binutils-2.21/gas/subsegs.c
rename to gas/subsegs.c
diff --git a/binutils/binutils-2.21/gas/subsegs.h b/gas/subsegs.h
similarity index 100%
rename from binutils/binutils-2.21/gas/subsegs.h
rename to gas/subsegs.h
diff --git a/binutils/binutils-2.21/gas/symbols.c b/gas/symbols.c
similarity index 100%
rename from binutils/binutils-2.21/gas/symbols.c
rename to gas/symbols.c
diff --git a/binutils/binutils-2.21/gas/symbols.h b/gas/symbols.h
similarity index 100%
rename from binutils/binutils-2.21/gas/symbols.h
rename to gas/symbols.h
diff --git a/binutils/binutils-2.21/gas/tc.h b/gas/tc.h
similarity index 100%
rename from binutils/binutils-2.21/gas/tc.h
rename to gas/tc.h
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog
rename to gas/testsuite/ChangeLog
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2004 b/gas/testsuite/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2004
rename to gas/testsuite/ChangeLog-2004
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2005 b/gas/testsuite/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2005
rename to gas/testsuite/ChangeLog-2005
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2006 b/gas/testsuite/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2006
rename to gas/testsuite/ChangeLog-2006
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2007 b/gas/testsuite/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2007
rename to gas/testsuite/ChangeLog-2007
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2008 b/gas/testsuite/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2008
rename to gas/testsuite/ChangeLog-2008
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-2009 b/gas/testsuite/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-2009
rename to gas/testsuite/ChangeLog-2009
diff --git a/binutils/binutils-2.21/gas/testsuite/ChangeLog-9303 b/gas/testsuite/ChangeLog-9303
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/ChangeLog-9303
rename to gas/testsuite/ChangeLog-9303
diff --git a/binutils/binutils-2.21/gas/testsuite/config/default.exp b/gas/testsuite/config/default.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/config/default.exp
rename to gas/testsuite/config/default.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align.d b/gas/testsuite/gas/all/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align.d
rename to gas/testsuite/gas/all/align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align.s b/gas/testsuite/gas/all/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align.s
rename to gas/testsuite/gas/all/align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align2.d b/gas/testsuite/gas/all/align2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align2.d
rename to gas/testsuite/gas/all/align2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/align2.s b/gas/testsuite/gas/all/align2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/align2.s
rename to gas/testsuite/gas/all/align2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.d b/gas/testsuite/gas/all/altmac2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.d
rename to gas/testsuite/gas/all/altmac2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.s b/gas/testsuite/gas/all/altmac2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmac2.s
rename to gas/testsuite/gas/all/altmac2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.d b/gas/testsuite/gas/all/altmacro.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.d
rename to gas/testsuite/gas/all/altmacro.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.s b/gas/testsuite/gas/all/altmacro.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/altmacro.s
rename to gas/testsuite/gas/all/altmacro.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign-bad.s b/gas/testsuite/gas/all/assign-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign-bad.s
rename to gas/testsuite/gas/all/assign-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign-ok.s b/gas/testsuite/gas/all/assign-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign-ok.s
rename to gas/testsuite/gas/all/assign-ok.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign.d b/gas/testsuite/gas/all/assign.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign.d
rename to gas/testsuite/gas/all/assign.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/assign.s b/gas/testsuite/gas/all/assign.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/assign.s
rename to gas/testsuite/gas/all/assign.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/byte.d b/gas/testsuite/gas/all/byte.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/byte.d
rename to gas/testsuite/gas/all/byte.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/byte.l b/gas/testsuite/gas/all/byte.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/byte.l
rename to gas/testsuite/gas/all/byte.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/byte.s b/gas/testsuite/gas/all/byte.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/byte.s
rename to gas/testsuite/gas/all/byte.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.d b/gas/testsuite/gas/all/cofftag.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.d
rename to gas/testsuite/gas/all/cofftag.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.s b/gas/testsuite/gas/all/cofftag.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cofftag.s
rename to gas/testsuite/gas/all/cofftag.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/comment.s b/gas/testsuite/gas/all/comment.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/comment.s
rename to gas/testsuite/gas/all/comment.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cond.l b/gas/testsuite/gas/all/cond.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cond.l
rename to gas/testsuite/gas/all/cond.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/cond.s b/gas/testsuite/gas/all/cond.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/cond.s
rename to gas/testsuite/gas/all/cond.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/diff1.s b/gas/testsuite/gas/all/diff1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/diff1.s
rename to gas/testsuite/gas/all/diff1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equ-bad.s b/gas/testsuite/gas/all/equ-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equ-bad.s
rename to gas/testsuite/gas/all/equ-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equ-ok.s b/gas/testsuite/gas/all/equ-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equ-ok.s
rename to gas/testsuite/gas/all/equ-ok.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equiv1.s b/gas/testsuite/gas/all/equiv1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equiv1.s
rename to gas/testsuite/gas/all/equiv1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/equiv2.s b/gas/testsuite/gas/all/equiv2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/equiv2.s
rename to gas/testsuite/gas/all/equiv2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eqv-bad.s b/gas/testsuite/gas/all/eqv-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eqv-bad.s
rename to gas/testsuite/gas/all/eqv-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eqv-ok.s b/gas/testsuite/gas/all/eqv-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eqv-ok.s
rename to gas/testsuite/gas/all/eqv-ok.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/err-1.s b/gas/testsuite/gas/all/err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/err-1.s
rename to gas/testsuite/gas/all/err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eval.d b/gas/testsuite/gas/all/eval.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eval.d
rename to gas/testsuite/gas/all/eval.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/eval.s b/gas/testsuite/gas/all/eval.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/eval.s
rename to gas/testsuite/gas/all/eval.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/excl.s b/gas/testsuite/gas/all/excl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/excl.s
rename to gas/testsuite/gas/all/excl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/fastcall.s b/gas/testsuite/gas/all/fastcall.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/fastcall.s
rename to gas/testsuite/gas/all/fastcall.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/float.s b/gas/testsuite/gas/all/float.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/float.s
rename to gas/testsuite/gas/all/float.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/forward.d b/gas/testsuite/gas/all/forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/forward.d
rename to gas/testsuite/gas/all/forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/forward.s b/gas/testsuite/gas/all/forward.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/forward.s
rename to gas/testsuite/gas/all/forward.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.d b/gas/testsuite/gas/all/fwdexp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.d
rename to gas/testsuite/gas/all/fwdexp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.s b/gas/testsuite/gas/all/fwdexp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/fwdexp.s
rename to gas/testsuite/gas/all/fwdexp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/gas.exp
rename to gas/testsuite/gas/all/gas.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/incbin.d b/gas/testsuite/gas/all/incbin.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/incbin.d
rename to gas/testsuite/gas/all/incbin.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/incbin.dat b/gas/testsuite/gas/all/incbin.dat
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/incbin.dat
rename to gas/testsuite/gas/all/incbin.dat
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/incbin.s b/gas/testsuite/gas/all/incbin.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/incbin.s
rename to gas/testsuite/gas/all/incbin.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/itbl b/gas/testsuite/gas/all/itbl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/itbl
rename to gas/testsuite/gas/all/itbl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/itbl-test.c b/gas/testsuite/gas/all/itbl-test.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/itbl-test.c
rename to gas/testsuite/gas/all/itbl-test.c
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/itbl.s b/gas/testsuite/gas/all/itbl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/itbl.s
rename to gas/testsuite/gas/all/itbl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/octa.d b/gas/testsuite/gas/all/octa.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/octa.d
rename to gas/testsuite/gas/all/octa.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/octa.s b/gas/testsuite/gas/all/octa.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/octa.s
rename to gas/testsuite/gas/all/octa.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/p1480.s b/gas/testsuite/gas/all/p1480.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/p1480.s
rename to gas/testsuite/gas/all/p1480.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/p2425.s b/gas/testsuite/gas/all/p2425.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/p2425.s
rename to gas/testsuite/gas/all/p2425.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/quad.d b/gas/testsuite/gas/all/quad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/quad.d
rename to gas/testsuite/gas/all/quad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/quad.s b/gas/testsuite/gas/all/quad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/quad.s
rename to gas/testsuite/gas/all/quad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef.d b/gas/testsuite/gas/all/redef.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef.d
rename to gas/testsuite/gas/all/redef.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef.s b/gas/testsuite/gas/all/redef.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef.s
rename to gas/testsuite/gas/all/redef.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef2.d b/gas/testsuite/gas/all/redef2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef2.d
rename to gas/testsuite/gas/all/redef2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef2.s b/gas/testsuite/gas/all/redef2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef2.s
rename to gas/testsuite/gas/all/redef2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef3.d b/gas/testsuite/gas/all/redef3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef3.d
rename to gas/testsuite/gas/all/redef3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef3.s b/gas/testsuite/gas/all/redef3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef3.s
rename to gas/testsuite/gas/all/redef3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef4.s b/gas/testsuite/gas/all/redef4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef4.s
rename to gas/testsuite/gas/all/redef4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/redef5.s b/gas/testsuite/gas/all/redef5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/redef5.s
rename to gas/testsuite/gas/all/redef5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/relax.d b/gas/testsuite/gas/all/relax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/relax.d
rename to gas/testsuite/gas/all/relax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/relax.s b/gas/testsuite/gas/all/relax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/relax.s
rename to gas/testsuite/gas/all/relax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.d b/gas/testsuite/gas/all/sleb128.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.d
rename to gas/testsuite/gas/all/sleb128.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.s b/gas/testsuite/gas/all/sleb128.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/sleb128.s
rename to gas/testsuite/gas/all/sleb128.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/string.d b/gas/testsuite/gas/all/string.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/string.d
rename to gas/testsuite/gas/all/string.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/string.s b/gas/testsuite/gas/all/string.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/string.s
rename to gas/testsuite/gas/all/string.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/struct.d b/gas/testsuite/gas/all/struct.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/struct.d
rename to gas/testsuite/gas/all/struct.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/struct.s b/gas/testsuite/gas/all/struct.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/struct.s
rename to gas/testsuite/gas/all/struct.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/test-example.c b/gas/testsuite/gas/all/test-example.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/test-example.c
rename to gas/testsuite/gas/all/test-example.c
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/test-gen.c b/gas/testsuite/gas/all/test-gen.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/test-gen.c
rename to gas/testsuite/gas/all/test-gen.c
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/warn-1.s b/gas/testsuite/gas/all/warn-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/warn-1.s
rename to gas/testsuite/gas/all/warn-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.d
rename to gas/testsuite/gas/all/weakref1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.s b/gas/testsuite/gas/all/weakref1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1.s
rename to gas/testsuite/gas/all/weakref1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1g.d b/gas/testsuite/gas/all/weakref1g.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1g.d
rename to gas/testsuite/gas/all/weakref1g.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1l.d b/gas/testsuite/gas/all/weakref1l.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1l.d
rename to gas/testsuite/gas/all/weakref1l.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1u.d b/gas/testsuite/gas/all/weakref1u.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1u.d
rename to gas/testsuite/gas/all/weakref1u.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref1w.d b/gas/testsuite/gas/all/weakref1w.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref1w.d
rename to gas/testsuite/gas/all/weakref1w.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref2.s b/gas/testsuite/gas/all/weakref2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref2.s
rename to gas/testsuite/gas/all/weakref2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref3.s b/gas/testsuite/gas/all/weakref3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref3.s
rename to gas/testsuite/gas/all/weakref3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/weakref4.s b/gas/testsuite/gas/all/weakref4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/weakref4.s
rename to gas/testsuite/gas/all/weakref4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/all/x930509.s b/gas/testsuite/gas/all/x930509.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/all/x930509.s
rename to gas/testsuite/gas/all/x930509.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/alpha.exp b/gas/testsuite/gas/alpha/alpha.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/alpha.exp
rename to gas/testsuite/gas/alpha/alpha.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.d b/gas/testsuite/gas/alpha/elf-reloc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.d
rename to gas/testsuite/gas/alpha/elf-reloc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.s b/gas/testsuite/gas/alpha/elf-reloc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-1.s
rename to gas/testsuite/gas/alpha/elf-reloc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.l b/gas/testsuite/gas/alpha/elf-reloc-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.l
rename to gas/testsuite/gas/alpha/elf-reloc-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.s b/gas/testsuite/gas/alpha/elf-reloc-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-2.s
rename to gas/testsuite/gas/alpha/elf-reloc-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.l b/gas/testsuite/gas/alpha/elf-reloc-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.l
rename to gas/testsuite/gas/alpha/elf-reloc-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.s b/gas/testsuite/gas/alpha/elf-reloc-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-3.s
rename to gas/testsuite/gas/alpha/elf-reloc-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.d b/gas/testsuite/gas/alpha/elf-reloc-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.d
rename to gas/testsuite/gas/alpha/elf-reloc-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.s b/gas/testsuite/gas/alpha/elf-reloc-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-4.s
rename to gas/testsuite/gas/alpha/elf-reloc-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.d b/gas/testsuite/gas/alpha/elf-reloc-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.d
rename to gas/testsuite/gas/alpha/elf-reloc-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.s b/gas/testsuite/gas/alpha/elf-reloc-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-5.s
rename to gas/testsuite/gas/alpha/elf-reloc-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.l b/gas/testsuite/gas/alpha/elf-reloc-6.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.l
rename to gas/testsuite/gas/alpha/elf-reloc-6.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.s b/gas/testsuite/gas/alpha/elf-reloc-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-6.s
rename to gas/testsuite/gas/alpha/elf-reloc-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.d b/gas/testsuite/gas/alpha/elf-reloc-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.d
rename to gas/testsuite/gas/alpha/elf-reloc-7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.s b/gas/testsuite/gas/alpha/elf-reloc-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-7.s
rename to gas/testsuite/gas/alpha/elf-reloc-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.d b/gas/testsuite/gas/alpha/elf-reloc-8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.d
rename to gas/testsuite/gas/alpha/elf-reloc-8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.s b/gas/testsuite/gas/alpha/elf-reloc-8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-reloc-8.s
rename to gas/testsuite/gas/alpha/elf-reloc-8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.d b/gas/testsuite/gas/alpha/elf-tls-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.d
rename to gas/testsuite/gas/alpha/elf-tls-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.s b/gas/testsuite/gas/alpha/elf-tls-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-1.s
rename to gas/testsuite/gas/alpha/elf-tls-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.l b/gas/testsuite/gas/alpha/elf-tls-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.l
rename to gas/testsuite/gas/alpha/elf-tls-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.s b/gas/testsuite/gas/alpha/elf-tls-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-2.s
rename to gas/testsuite/gas/alpha/elf-tls-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.l b/gas/testsuite/gas/alpha/elf-tls-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.l
rename to gas/testsuite/gas/alpha/elf-tls-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.s b/gas/testsuite/gas/alpha/elf-tls-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-tls-3.s
rename to gas/testsuite/gas/alpha/elf-tls-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.d b/gas/testsuite/gas/alpha/elf-usepv-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.d
rename to gas/testsuite/gas/alpha/elf-usepv-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.s b/gas/testsuite/gas/alpha/elf-usepv-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-1.s
rename to gas/testsuite/gas/alpha/elf-usepv-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.l b/gas/testsuite/gas/alpha/elf-usepv-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.l
rename to gas/testsuite/gas/alpha/elf-usepv-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.s b/gas/testsuite/gas/alpha/elf-usepv-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/elf-usepv-2.s
rename to gas/testsuite/gas/alpha/elf-usepv-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.d b/gas/testsuite/gas/alpha/fp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.d
rename to gas/testsuite/gas/alpha/fp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.s b/gas/testsuite/gas/alpha/fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/fp.s
rename to gas/testsuite/gas/alpha/fp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.d b/gas/testsuite/gas/alpha/unop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.d
rename to gas/testsuite/gas/alpha/unop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.s b/gas/testsuite/gas/alpha/unop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/alpha/unop.s
rename to gas/testsuite/gas/alpha/unop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/adc.d b/gas/testsuite/gas/arc/adc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/adc.d
rename to gas/testsuite/gas/arc/adc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/adc.s b/gas/testsuite/gas/arc/adc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/adc.s
rename to gas/testsuite/gas/arc/adc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/add.d b/gas/testsuite/gas/arc/add.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/add.d
rename to gas/testsuite/gas/arc/add.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/add.s b/gas/testsuite/gas/arc/add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/add.s
rename to gas/testsuite/gas/arc/add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/alias.d b/gas/testsuite/gas/arc/alias.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/alias.d
rename to gas/testsuite/gas/arc/alias.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/alias.s b/gas/testsuite/gas/arc/alias.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/alias.s
rename to gas/testsuite/gas/arc/alias.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/and.d b/gas/testsuite/gas/arc/and.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/and.d
rename to gas/testsuite/gas/arc/and.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/and.s b/gas/testsuite/gas/arc/and.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/and.s
rename to gas/testsuite/gas/arc/and.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/arc.exp b/gas/testsuite/gas/arc/arc.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/arc.exp
rename to gas/testsuite/gas/arc/arc.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asl.d b/gas/testsuite/gas/arc/asl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asl.d
rename to gas/testsuite/gas/arc/asl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asl.s b/gas/testsuite/gas/arc/asl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asl.s
rename to gas/testsuite/gas/arc/asl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asr.d b/gas/testsuite/gas/arc/asr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asr.d
rename to gas/testsuite/gas/arc/asr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/asr.s b/gas/testsuite/gas/arc/asr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/asr.s
rename to gas/testsuite/gas/arc/asr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/b.d b/gas/testsuite/gas/arc/b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/b.d
rename to gas/testsuite/gas/arc/b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/b.s b/gas/testsuite/gas/arc/b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/b.s
rename to gas/testsuite/gas/arc/b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bic.d b/gas/testsuite/gas/arc/bic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bic.d
rename to gas/testsuite/gas/arc/bic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bic.s b/gas/testsuite/gas/arc/bic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bic.s
rename to gas/testsuite/gas/arc/bic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bl.d b/gas/testsuite/gas/arc/bl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bl.d
rename to gas/testsuite/gas/arc/bl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/bl.s b/gas/testsuite/gas/arc/bl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/bl.s
rename to gas/testsuite/gas/arc/bl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/branch.d b/gas/testsuite/gas/arc/branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/branch.d
rename to gas/testsuite/gas/arc/branch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/branch.s b/gas/testsuite/gas/arc/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/branch.s
rename to gas/testsuite/gas/arc/branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/brk.d b/gas/testsuite/gas/arc/brk.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/brk.d
rename to gas/testsuite/gas/arc/brk.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/brk.s b/gas/testsuite/gas/arc/brk.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/brk.s
rename to gas/testsuite/gas/arc/brk.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extb.d b/gas/testsuite/gas/arc/extb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extb.d
rename to gas/testsuite/gas/arc/extb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extb.s b/gas/testsuite/gas/arc/extb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extb.s
rename to gas/testsuite/gas/arc/extb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.d b/gas/testsuite/gas/arc/extensions.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.d
rename to gas/testsuite/gas/arc/extensions.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.s b/gas/testsuite/gas/arc/extensions.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extensions.s
rename to gas/testsuite/gas/arc/extensions.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extw.d b/gas/testsuite/gas/arc/extw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extw.d
rename to gas/testsuite/gas/arc/extw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/extw.s b/gas/testsuite/gas/arc/extw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/extw.s
rename to gas/testsuite/gas/arc/extw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/flag.d b/gas/testsuite/gas/arc/flag.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/flag.d
rename to gas/testsuite/gas/arc/flag.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/flag.s b/gas/testsuite/gas/arc/flag.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/flag.s
rename to gas/testsuite/gas/arc/flag.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.d b/gas/testsuite/gas/arc/insn3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.d
rename to gas/testsuite/gas/arc/insn3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.s b/gas/testsuite/gas/arc/insn3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/insn3.s
rename to gas/testsuite/gas/arc/insn3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/j.d b/gas/testsuite/gas/arc/j.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/j.d
rename to gas/testsuite/gas/arc/j.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/j.s b/gas/testsuite/gas/arc/j.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/j.s
rename to gas/testsuite/gas/arc/j.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/jl.d b/gas/testsuite/gas/arc/jl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/jl.d
rename to gas/testsuite/gas/arc/jl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/jl.s b/gas/testsuite/gas/arc/jl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/jl.s
rename to gas/testsuite/gas/arc/jl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld.d b/gas/testsuite/gas/arc/ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld.d
rename to gas/testsuite/gas/arc/ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld.s b/gas/testsuite/gas/arc/ld.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld.s
rename to gas/testsuite/gas/arc/ld.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.d b/gas/testsuite/gas/arc/ld2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.d
rename to gas/testsuite/gas/arc/ld2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.s b/gas/testsuite/gas/arc/ld2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ld2.s
rename to gas/testsuite/gas/arc/ld2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lp.d b/gas/testsuite/gas/arc/lp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lp.d
rename to gas/testsuite/gas/arc/lp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lp.s b/gas/testsuite/gas/arc/lp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lp.s
rename to gas/testsuite/gas/arc/lp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.d b/gas/testsuite/gas/arc/lsr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.d
rename to gas/testsuite/gas/arc/lsr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.s b/gas/testsuite/gas/arc/lsr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/lsr.s
rename to gas/testsuite/gas/arc/lsr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/math.d b/gas/testsuite/gas/arc/math.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/math.d
rename to gas/testsuite/gas/arc/math.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/math.s b/gas/testsuite/gas/arc/math.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/math.s
rename to gas/testsuite/gas/arc/math.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/mov.d b/gas/testsuite/gas/arc/mov.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/mov.d
rename to gas/testsuite/gas/arc/mov.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/mov.s b/gas/testsuite/gas/arc/mov.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/mov.s
rename to gas/testsuite/gas/arc/mov.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/nop.d b/gas/testsuite/gas/arc/nop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/nop.d
rename to gas/testsuite/gas/arc/nop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/nop.s b/gas/testsuite/gas/arc/nop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/nop.s
rename to gas/testsuite/gas/arc/nop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/or.d b/gas/testsuite/gas/arc/or.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/or.d
rename to gas/testsuite/gas/arc/or.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/or.s b/gas/testsuite/gas/arc/or.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/or.s
rename to gas/testsuite/gas/arc/or.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.d b/gas/testsuite/gas/arc/rlc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.d
rename to gas/testsuite/gas/arc/rlc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.s b/gas/testsuite/gas/arc/rlc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rlc.s
rename to gas/testsuite/gas/arc/rlc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ror.d b/gas/testsuite/gas/arc/ror.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ror.d
rename to gas/testsuite/gas/arc/ror.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/ror.s b/gas/testsuite/gas/arc/ror.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/ror.s
rename to gas/testsuite/gas/arc/ror.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.d b/gas/testsuite/gas/arc/rrc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.d
rename to gas/testsuite/gas/arc/rrc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.s b/gas/testsuite/gas/arc/rrc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/rrc.s
rename to gas/testsuite/gas/arc/rrc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.d b/gas/testsuite/gas/arc/sbc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.d
rename to gas/testsuite/gas/arc/sbc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.s b/gas/testsuite/gas/arc/sbc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sbc.s
rename to gas/testsuite/gas/arc/sbc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.d b/gas/testsuite/gas/arc/sexb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.d
rename to gas/testsuite/gas/arc/sexb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.s b/gas/testsuite/gas/arc/sexb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexb.s
rename to gas/testsuite/gas/arc/sexb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.d b/gas/testsuite/gas/arc/sexw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.d
rename to gas/testsuite/gas/arc/sexw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.s b/gas/testsuite/gas/arc/sexw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sexw.s
rename to gas/testsuite/gas/arc/sexw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.d b/gas/testsuite/gas/arc/sleep.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.d
rename to gas/testsuite/gas/arc/sleep.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.s b/gas/testsuite/gas/arc/sleep.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sleep.s
rename to gas/testsuite/gas/arc/sleep.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.d b/gas/testsuite/gas/arc/sshift.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.d
rename to gas/testsuite/gas/arc/sshift.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.s b/gas/testsuite/gas/arc/sshift.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sshift.s
rename to gas/testsuite/gas/arc/sshift.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/st.d b/gas/testsuite/gas/arc/st.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/st.d
rename to gas/testsuite/gas/arc/st.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/st.s b/gas/testsuite/gas/arc/st.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/st.s
rename to gas/testsuite/gas/arc/st.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sub.d b/gas/testsuite/gas/arc/sub.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sub.d
rename to gas/testsuite/gas/arc/sub.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/sub.s b/gas/testsuite/gas/arc/sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/sub.s
rename to gas/testsuite/gas/arc/sub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/swi.d b/gas/testsuite/gas/arc/swi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/swi.d
rename to gas/testsuite/gas/arc/swi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/swi.s b/gas/testsuite/gas/arc/swi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/swi.s
rename to gas/testsuite/gas/arc/swi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/warn.exp b/gas/testsuite/gas/arc/warn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/warn.exp
rename to gas/testsuite/gas/arc/warn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/warn.s b/gas/testsuite/gas/arc/warn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/warn.s
rename to gas/testsuite/gas/arc/warn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/xor.d b/gas/testsuite/gas/arc/xor.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/xor.d
rename to gas/testsuite/gas/arc/xor.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arc/xor.s b/gas/testsuite/gas/arc/xor.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arc/xor.s
rename to gas/testsuite/gas/arc/xor.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.d b/gas/testsuite/gas/arm/abs12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.d
rename to gas/testsuite/gas/arm/abs12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.s b/gas/testsuite/gas/arm/abs12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/abs12.s
rename to gas/testsuite/gas/arm/abs12.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.d b/gas/testsuite/gas/arm/addsw-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.d
rename to gas/testsuite/gas/arm/addsw-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.l b/gas/testsuite/gas/arm/addsw-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.l
rename to gas/testsuite/gas/arm/addsw-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.s b/gas/testsuite/gas/arm/addsw-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/addsw-bad.s
rename to gas/testsuite/gas/arm/addsw-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.d b/gas/testsuite/gas/arm/adr-invalid.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.d
rename to gas/testsuite/gas/arm/adr-invalid.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.l b/gas/testsuite/gas/arm/adr-invalid.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.l
rename to gas/testsuite/gas/arm/adr-invalid.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.s b/gas/testsuite/gas/arm/adr-invalid.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adr-invalid.s
rename to gas/testsuite/gas/arm/adr-invalid.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.d b/gas/testsuite/gas/arm/adrl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.d
rename to gas/testsuite/gas/arm/adrl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.s b/gas/testsuite/gas/arm/adrl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/adrl.s
rename to gas/testsuite/gas/arm/adrl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align.d b/gas/testsuite/gas/arm/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align.d
rename to gas/testsuite/gas/arm/align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align.s b/gas/testsuite/gas/arm/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align.s
rename to gas/testsuite/gas/arm/align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align64.d b/gas/testsuite/gas/arm/align64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align64.d
rename to gas/testsuite/gas/arm/align64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/align64.s b/gas/testsuite/gas/arm/align64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/align64.s
rename to gas/testsuite/gas/arm/align64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t-eabi.d b/gas/testsuite/gas/arm/arch4t-eabi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t-eabi.d
rename to gas/testsuite/gas/arm/arch4t-eabi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.d
rename to gas/testsuite/gas/arm/arch4t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.s b/gas/testsuite/gas/arm/arch4t.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch4t.s
rename to gas/testsuite/gas/arm/arch4t.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.d b/gas/testsuite/gas/arm/arch5tej.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.d
rename to gas/testsuite/gas/arm/arch5tej.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.s b/gas/testsuite/gas/arm/arch5tej.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch5tej.s
rename to gas/testsuite/gas/arm/arch5tej.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.d b/gas/testsuite/gas/arm/arch6zk.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.d
rename to gas/testsuite/gas/arm/arch6zk.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.s b/gas/testsuite/gas/arm/arch6zk.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch6zk.s
rename to gas/testsuite/gas/arm/arch6zk.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7.d
rename to gas/testsuite/gas/arm/arch7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7.s b/gas/testsuite/gas/arm/arch7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7.s
rename to gas/testsuite/gas/arm/arch7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7a-mp.d b/gas/testsuite/gas/arm/arch7a-mp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7a-mp.d
rename to gas/testsuite/gas/arm/arch7a-mp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7ar-mp.s b/gas/testsuite/gas/arm/arch7ar-mp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7ar-mp.s
rename to gas/testsuite/gas/arm/arch7ar-mp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em-bad.d b/gas/testsuite/gas/arm/arch7em-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em-bad.d
rename to gas/testsuite/gas/arm/arch7em-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em-bad.l b/gas/testsuite/gas/arm/arch7em-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em-bad.l
rename to gas/testsuite/gas/arm/arch7em-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em.d b/gas/testsuite/gas/arm/arch7em.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em.d
rename to gas/testsuite/gas/arm/arch7em.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em.s b/gas/testsuite/gas/arm/arch7em.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7em.s
rename to gas/testsuite/gas/arm/arch7em.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7m-bad.d b/gas/testsuite/gas/arm/arch7m-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7m-bad.d
rename to gas/testsuite/gas/arm/arch7m-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7m-bad.l b/gas/testsuite/gas/arm/arch7m-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7m-bad.l
rename to gas/testsuite/gas/arm/arch7m-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7m-bad.s b/gas/testsuite/gas/arm/arch7m-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7m-bad.s
rename to gas/testsuite/gas/arm/arch7m-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arch7r-mp.d b/gas/testsuite/gas/arm/arch7r-mp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arch7r-mp.d
rename to gas/testsuite/gas/arm/arch7r-mp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6.d b/gas/testsuite/gas/arm/archv6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6.d
rename to gas/testsuite/gas/arm/archv6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6.s b/gas/testsuite/gas/arm/archv6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6.s
rename to gas/testsuite/gas/arm/archv6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6m.d b/gas/testsuite/gas/arm/archv6m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6m.d
rename to gas/testsuite/gas/arm/archv6m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6m.s b/gas/testsuite/gas/arm/archv6m.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6m.s
rename to gas/testsuite/gas/arm/archv6m.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m-bad.d b/gas/testsuite/gas/arm/archv6s-m-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m-bad.d
rename to gas/testsuite/gas/arm/archv6s-m-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m-bad.l b/gas/testsuite/gas/arm/archv6s-m-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m-bad.l
rename to gas/testsuite/gas/arm/archv6s-m-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m.d b/gas/testsuite/gas/arm/archv6s-m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m.d
rename to gas/testsuite/gas/arm/archv6s-m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m.s b/gas/testsuite/gas/arm/archv6s-m.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6s-m.s
rename to gas/testsuite/gas/arm/archv6s-m.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2-bad.d b/gas/testsuite/gas/arm/archv6t2-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2-bad.d
rename to gas/testsuite/gas/arm/archv6t2-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2-bad.l b/gas/testsuite/gas/arm/archv6t2-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2-bad.l
rename to gas/testsuite/gas/arm/archv6t2-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2-bad.s b/gas/testsuite/gas/arm/archv6t2-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2-bad.s
rename to gas/testsuite/gas/arm/archv6t2-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2.d b/gas/testsuite/gas/arm/archv6t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2.d
rename to gas/testsuite/gas/arm/archv6t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2.s b/gas/testsuite/gas/arm/archv6t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/archv6t2.s
rename to gas/testsuite/gas/arm/archv6t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-2.d b/gas/testsuite/gas/arm/arm-it-auto-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-2.d
rename to gas/testsuite/gas/arm/arm-it-auto-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-2.s b/gas/testsuite/gas/arm/arm-it-auto-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-2.s
rename to gas/testsuite/gas/arm/arm-it-auto-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-3.d b/gas/testsuite/gas/arm/arm-it-auto-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-3.d
rename to gas/testsuite/gas/arm/arm-it-auto-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-3.s b/gas/testsuite/gas/arm/arm-it-auto-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto-3.s
rename to gas/testsuite/gas/arm/arm-it-auto-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto.d b/gas/testsuite/gas/arm/arm-it-auto.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto.d
rename to gas/testsuite/gas/arm/arm-it-auto.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto.s b/gas/testsuite/gas/arm/arm-it-auto.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-auto.s
rename to gas/testsuite/gas/arm/arm-it-auto.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-2.d b/gas/testsuite/gas/arm/arm-it-bad-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-2.d
rename to gas/testsuite/gas/arm/arm-it-bad-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-2.l b/gas/testsuite/gas/arm/arm-it-bad-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-2.l
rename to gas/testsuite/gas/arm/arm-it-bad-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-2.s b/gas/testsuite/gas/arm/arm-it-bad-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-2.s
rename to gas/testsuite/gas/arm/arm-it-bad-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-3.d b/gas/testsuite/gas/arm/arm-it-bad-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-3.d
rename to gas/testsuite/gas/arm/arm-it-bad-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-3.l b/gas/testsuite/gas/arm/arm-it-bad-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-3.l
rename to gas/testsuite/gas/arm/arm-it-bad-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-3.s b/gas/testsuite/gas/arm/arm-it-bad-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad-3.s
rename to gas/testsuite/gas/arm/arm-it-bad-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad.d b/gas/testsuite/gas/arm/arm-it-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad.d
rename to gas/testsuite/gas/arm/arm-it-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad.l b/gas/testsuite/gas/arm/arm-it-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad.l
rename to gas/testsuite/gas/arm/arm-it-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad.s b/gas/testsuite/gas/arm/arm-it-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it-bad.s
rename to gas/testsuite/gas/arm/arm-it-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it.d b/gas/testsuite/gas/arm/arm-it.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it.d
rename to gas/testsuite/gas/arm/arm-it.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it.s b/gas/testsuite/gas/arm/arm-it.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm-it.s
rename to gas/testsuite/gas/arm/arm-it.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm.exp
rename to gas/testsuite/gas/arm/arm.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm3-bad.d b/gas/testsuite/gas/arm/arm3-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm3-bad.d
rename to gas/testsuite/gas/arm/arm3-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm3-bad.l b/gas/testsuite/gas/arm/arm3-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm3-bad.l
rename to gas/testsuite/gas/arm/arm3-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm3-bad.s b/gas/testsuite/gas/arm/arm3-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm3-bad.s
rename to gas/testsuite/gas/arm/arm3-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm3.d b/gas/testsuite/gas/arm/arm3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm3.d
rename to gas/testsuite/gas/arm/arm3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm3.s b/gas/testsuite/gas/arm/arm3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm3.s
rename to gas/testsuite/gas/arm/arm3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm6.d b/gas/testsuite/gas/arm/arm6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm6.d
rename to gas/testsuite/gas/arm/arm6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm6.s b/gas/testsuite/gas/arm/arm6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm6.s
rename to gas/testsuite/gas/arm/arm6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm7-bad.d b/gas/testsuite/gas/arm/arm7-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm7-bad.d
rename to gas/testsuite/gas/arm/arm7-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm7-bad.l b/gas/testsuite/gas/arm/arm7-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm7-bad.l
rename to gas/testsuite/gas/arm/arm7-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm7-bad.s b/gas/testsuite/gas/arm/arm7-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm7-bad.s
rename to gas/testsuite/gas/arm/arm7-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm7dm.d b/gas/testsuite/gas/arm/arm7dm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm7dm.d
rename to gas/testsuite/gas/arm/arm7dm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm7dm.s b/gas/testsuite/gas/arm/arm7dm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm7dm.s
rename to gas/testsuite/gas/arm/arm7dm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm7t.d
rename to gas/testsuite/gas/arm/arm7t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/arm7t.s b/gas/testsuite/gas/arm/arm7t.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/arm7t.s
rename to gas/testsuite/gas/arm/arm7t.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv1-bad.d b/gas/testsuite/gas/arm/armv1-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv1-bad.d
rename to gas/testsuite/gas/arm/armv1-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv1-bad.l b/gas/testsuite/gas/arm/armv1-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv1-bad.l
rename to gas/testsuite/gas/arm/armv1-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv1-bad.s b/gas/testsuite/gas/arm/armv1-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv1-bad.s
rename to gas/testsuite/gas/arm/armv1-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv1.d b/gas/testsuite/gas/arm/armv1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv1.d
rename to gas/testsuite/gas/arm/armv1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv1.l b/gas/testsuite/gas/arm/armv1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv1.l
rename to gas/testsuite/gas/arm/armv1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv1.s b/gas/testsuite/gas/arm/armv1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv1.s
rename to gas/testsuite/gas/arm/armv1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv2-mp-bad.d b/gas/testsuite/gas/arm/armv2-mp-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv2-mp-bad.d
rename to gas/testsuite/gas/arm/armv2-mp-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv2-mp-bad.l b/gas/testsuite/gas/arm/armv2-mp-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv2-mp-bad.l
rename to gas/testsuite/gas/arm/armv2-mp-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+idiv.d b/gas/testsuite/gas/arm/armv7-a+idiv.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+idiv.d
rename to gas/testsuite/gas/arm/armv7-a+idiv.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+idiv.s b/gas/testsuite/gas/arm/armv7-a+idiv.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+idiv.s
rename to gas/testsuite/gas/arm/armv7-a+idiv.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+virt.d b/gas/testsuite/gas/arm/armv7-a+virt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+virt.d
rename to gas/testsuite/gas/arm/armv7-a+virt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+virt.s b/gas/testsuite/gas/arm/armv7-a+virt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/armv7-a+virt.s
rename to gas/testsuite/gas/arm/armv7-a+virt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-cpu-directive.d b/gas/testsuite/gas/arm/attr-cpu-directive.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-cpu-directive.d
rename to gas/testsuite/gas/arm/attr-cpu-directive.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-cpu-directive.s b/gas/testsuite/gas/arm/attr-cpu-directive.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-cpu-directive.s
rename to gas/testsuite/gas/arm/attr-cpu-directive.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-default.d b/gas/testsuite/gas/arm/attr-default.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-default.d
rename to gas/testsuite/gas/arm/attr-default.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-all.d b/gas/testsuite/gas/arm/attr-march-all.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-all.d
rename to gas/testsuite/gas/arm/attr-march-all.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv1.d b/gas/testsuite/gas/arm/attr-march-armv1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv1.d
rename to gas/testsuite/gas/arm/attr-march-armv1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv2.d b/gas/testsuite/gas/arm/attr-march-armv2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv2.d
rename to gas/testsuite/gas/arm/attr-march-armv2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv2a.d b/gas/testsuite/gas/arm/attr-march-armv2a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv2a.d
rename to gas/testsuite/gas/arm/attr-march-armv2a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv2s.d b/gas/testsuite/gas/arm/attr-march-armv2s.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv2s.d
rename to gas/testsuite/gas/arm/attr-march-armv2s.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv3.d b/gas/testsuite/gas/arm/attr-march-armv3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv3.d
rename to gas/testsuite/gas/arm/attr-march-armv3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv3m.d b/gas/testsuite/gas/arm/attr-march-armv3m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv3m.d
rename to gas/testsuite/gas/arm/attr-march-armv3m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4.d b/gas/testsuite/gas/arm/attr-march-armv4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4.d
rename to gas/testsuite/gas/arm/attr-march-armv4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4t.d b/gas/testsuite/gas/arm/attr-march-armv4t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4t.d
rename to gas/testsuite/gas/arm/attr-march-armv4t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4txm.d b/gas/testsuite/gas/arm/attr-march-armv4txm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4txm.d
rename to gas/testsuite/gas/arm/attr-march-armv4txm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4xm.d b/gas/testsuite/gas/arm/attr-march-armv4xm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv4xm.d
rename to gas/testsuite/gas/arm/attr-march-armv4xm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5.d b/gas/testsuite/gas/arm/attr-march-armv5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5.d
rename to gas/testsuite/gas/arm/attr-march-armv5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5t.d b/gas/testsuite/gas/arm/attr-march-armv5t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5t.d
rename to gas/testsuite/gas/arm/attr-march-armv5t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5te.d b/gas/testsuite/gas/arm/attr-march-armv5te.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5te.d
rename to gas/testsuite/gas/arm/attr-march-armv5te.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5tej.d b/gas/testsuite/gas/arm/attr-march-armv5tej.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5tej.d
rename to gas/testsuite/gas/arm/attr-march-armv5tej.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5texp.d b/gas/testsuite/gas/arm/attr-march-armv5texp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5texp.d
rename to gas/testsuite/gas/arm/attr-march-armv5texp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5txm.d b/gas/testsuite/gas/arm/attr-march-armv5txm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv5txm.d
rename to gas/testsuite/gas/arm/attr-march-armv5txm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6-m+os.d b/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
rename to gas/testsuite/gas/arm/attr-march-armv6-m+os.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6-m.d b/gas/testsuite/gas/arm/attr-march-armv6-m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6-m.d
rename to gas/testsuite/gas/arm/attr-march-armv6-m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6.d b/gas/testsuite/gas/arm/attr-march-armv6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6.d
rename to gas/testsuite/gas/arm/attr-march-armv6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6j.d b/gas/testsuite/gas/arm/attr-march-armv6j.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6j.d
rename to gas/testsuite/gas/arm/attr-march-armv6j.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6k+sec.d b/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
rename to gas/testsuite/gas/arm/attr-march-armv6k+sec.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6k.d b/gas/testsuite/gas/arm/attr-march-armv6k.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6k.d
rename to gas/testsuite/gas/arm/attr-march-armv6k.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6kt2.d b/gas/testsuite/gas/arm/attr-march-armv6kt2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6kt2.d
rename to gas/testsuite/gas/arm/attr-march-armv6kt2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6s-m.d b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6s-m.d
rename to gas/testsuite/gas/arm/attr-march-armv6s-m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6t2.d b/gas/testsuite/gas/arm/attr-march-armv6t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6t2.d
rename to gas/testsuite/gas/arm/attr-march-armv6t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6z.d b/gas/testsuite/gas/arm/attr-march-armv6z.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6z.d
rename to gas/testsuite/gas/arm/attr-march-armv6z.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6zk.d b/gas/testsuite/gas/arm/attr-march-armv6zk.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6zk.d
rename to gas/testsuite/gas/arm/attr-march-armv6zk.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6zkt2.d b/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
rename to gas/testsuite/gas/arm/attr-march-armv6zkt2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6zt2.d b/gas/testsuite/gas/arm/attr-march-armv6zt2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv6zt2.d
rename to gas/testsuite/gas/arm/attr-march-armv6zt2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d b/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
rename to gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d b/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
rename to gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d b/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
rename to gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d b/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
rename to gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d b/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
rename to gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a.d b/gas/testsuite/gas/arm/attr-march-armv7-a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-a.d
rename to gas/testsuite/gas/arm/attr-march-armv7-a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-m.d b/gas/testsuite/gas/arm/attr-march-armv7-m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-m.d
rename to gas/testsuite/gas/arm/attr-march-armv7-m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d b/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
rename to gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-r.d b/gas/testsuite/gas/arm/attr-march-armv7-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7-r.d
rename to gas/testsuite/gas/arm/attr-march-armv7-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7.d b/gas/testsuite/gas/arm/attr-march-armv7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7.d
rename to gas/testsuite/gas/arm/attr-march-armv7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7a.d b/gas/testsuite/gas/arm/attr-march-armv7a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7a.d
rename to gas/testsuite/gas/arm/attr-march-armv7a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7em.d b/gas/testsuite/gas/arm/attr-march-armv7em.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7em.d
rename to gas/testsuite/gas/arm/attr-march-armv7em.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7m.d b/gas/testsuite/gas/arm/attr-march-armv7m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7m.d
rename to gas/testsuite/gas/arm/attr-march-armv7m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7r.d b/gas/testsuite/gas/arm/attr-march-armv7r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-armv7r.d
rename to gas/testsuite/gas/arm/attr-march-armv7r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-iwmmxt.d b/gas/testsuite/gas/arm/attr-march-iwmmxt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-iwmmxt.d
rename to gas/testsuite/gas/arm/attr-march-iwmmxt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-iwmmxt2.d b/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
rename to gas/testsuite/gas/arm/attr-march-iwmmxt2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-xscale.d b/gas/testsuite/gas/arm/attr-march-xscale.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-march-xscale.d
rename to gas/testsuite/gas/arm/attr-march-xscale.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mcpu.d b/gas/testsuite/gas/arm/attr-mcpu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mcpu.d
rename to gas/testsuite/gas/arm/attr-mcpu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
rename to gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
rename to gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
rename to gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
rename to gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d b/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
rename to gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpa.d b/gas/testsuite/gas/arm/attr-mfpu-fpa.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpa.d
rename to gas/testsuite/gas/arm/attr-mfpu-fpa.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpa10.d b/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
rename to gas/testsuite/gas/arm/attr-mfpu-fpa10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpa11.d b/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
rename to gas/testsuite/gas/arm/attr-mfpu-fpa11.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpe.d b/gas/testsuite/gas/arm/attr-mfpu-fpe.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpe.d
rename to gas/testsuite/gas/arm/attr-mfpu-fpe.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpe2.d b/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
rename to gas/testsuite/gas/arm/attr-mfpu-fpe2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpe3.d b/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
rename to gas/testsuite/gas/arm/attr-mfpu-fpe3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-maverick.d b/gas/testsuite/gas/arm/attr-mfpu-maverick.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-maverick.d
rename to gas/testsuite/gas/arm/attr-mfpu-maverick.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
rename to gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-neon.d b/gas/testsuite/gas/arm/attr-mfpu-neon.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-neon.d
rename to gas/testsuite/gas/arm/attr-mfpu-neon.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-softfpa.d b/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
rename to gas/testsuite/gas/arm/attr-mfpu-softfpa.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
rename to gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-softvfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
rename to gas/testsuite/gas/arm/attr-mfpu-softvfp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp.d b/gas/testsuite/gas/arm/attr-mfpu-vfp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp10.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfp10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp3.d b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfp3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp9.d b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfp9.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
rename to gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-names.d b/gas/testsuite/gas/arm/attr-names.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-names.d
rename to gas/testsuite/gas/arm/attr-names.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-names.s b/gas/testsuite/gas/arm/attr-names.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-names.s
rename to gas/testsuite/gas/arm/attr-names.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-order.d b/gas/testsuite/gas/arm/attr-order.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-order.d
rename to gas/testsuite/gas/arm/attr-order.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-order.s b/gas/testsuite/gas/arm/attr-order.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-order.s
rename to gas/testsuite/gas/arm/attr-order.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-cpu-directive.d b/gas/testsuite/gas/arm/attr-override-cpu-directive.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-cpu-directive.d
rename to gas/testsuite/gas/arm/attr-override-cpu-directive.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-cpu-directive.s b/gas/testsuite/gas/arm/attr-override-cpu-directive.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-cpu-directive.s
rename to gas/testsuite/gas/arm/attr-override-cpu-directive.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-mcpu.d b/gas/testsuite/gas/arm/attr-override-mcpu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-mcpu.d
rename to gas/testsuite/gas/arm/attr-override-mcpu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-mcpu.s b/gas/testsuite/gas/arm/attr-override-mcpu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-override-mcpu.s
rename to gas/testsuite/gas/arm/attr-override-mcpu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-syntax.d b/gas/testsuite/gas/arm/attr-syntax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-syntax.d
rename to gas/testsuite/gas/arm/attr-syntax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/attr-syntax.s b/gas/testsuite/gas/arm/attr-syntax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/attr-syntax.s
rename to gas/testsuite/gas/arm/attr-syntax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/backslash-at.d b/gas/testsuite/gas/arm/backslash-at.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/backslash-at.d
rename to gas/testsuite/gas/arm/backslash-at.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/backslash-at.s b/gas/testsuite/gas/arm/backslash-at.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/backslash-at.s
rename to gas/testsuite/gas/arm/backslash-at.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad-thumb.d b/gas/testsuite/gas/arm/barrier-bad-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad-thumb.d
rename to gas/testsuite/gas/arm/barrier-bad-thumb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad-thumb.l b/gas/testsuite/gas/arm/barrier-bad-thumb.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad-thumb.l
rename to gas/testsuite/gas/arm/barrier-bad-thumb.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad-thumb.s b/gas/testsuite/gas/arm/barrier-bad-thumb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad-thumb.s
rename to gas/testsuite/gas/arm/barrier-bad-thumb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad.d b/gas/testsuite/gas/arm/barrier-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad.d
rename to gas/testsuite/gas/arm/barrier-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad.l b/gas/testsuite/gas/arm/barrier-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad.l
rename to gas/testsuite/gas/arm/barrier-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad.s b/gas/testsuite/gas/arm/barrier-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-bad.s
rename to gas/testsuite/gas/arm/barrier-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-thumb.d b/gas/testsuite/gas/arm/barrier-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-thumb.d
rename to gas/testsuite/gas/arm/barrier-thumb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-thumb.s b/gas/testsuite/gas/arm/barrier-thumb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier-thumb.s
rename to gas/testsuite/gas/arm/barrier-thumb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier.d b/gas/testsuite/gas/arm/barrier.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier.d
rename to gas/testsuite/gas/arm/barrier.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/barrier.s b/gas/testsuite/gas/arm/barrier.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/barrier.s
rename to gas/testsuite/gas/arm/barrier.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/bignum1.d b/gas/testsuite/gas/arm/bignum1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/bignum1.d
rename to gas/testsuite/gas/arm/bignum1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/bignum1.s b/gas/testsuite/gas/arm/bignum1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/bignum1.s
rename to gas/testsuite/gas/arm/bignum1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/bl-local-v4t.d b/gas/testsuite/gas/arm/bl-local-v4t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/bl-local-v4t.d
rename to gas/testsuite/gas/arm/bl-local-v4t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/bl-local-v4t.s b/gas/testsuite/gas/arm/bl-local-v4t.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/bl-local-v4t.s
rename to gas/testsuite/gas/arm/bl-local-v4t.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/blank.s b/gas/testsuite/gas/arm/blank.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/blank.s
rename to gas/testsuite/gas/arm/blank.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local-thumb.l b/gas/testsuite/gas/arm/blx-local-thumb.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local-thumb.l
rename to gas/testsuite/gas/arm/blx-local-thumb.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local.d b/gas/testsuite/gas/arm/blx-local.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local.d
rename to gas/testsuite/gas/arm/blx-local.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local.l b/gas/testsuite/gas/arm/blx-local.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local.l
rename to gas/testsuite/gas/arm/blx-local.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local.s b/gas/testsuite/gas/arm/blx-local.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/blx-local.s
rename to gas/testsuite/gas/arm/blx-local.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/branch-reloc.d b/gas/testsuite/gas/arm/branch-reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/branch-reloc.d
rename to gas/testsuite/gas/arm/branch-reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/branch-reloc.l b/gas/testsuite/gas/arm/branch-reloc.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/branch-reloc.l
rename to gas/testsuite/gas/arm/branch-reloc.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/branch-reloc.s b/gas/testsuite/gas/arm/branch-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/branch-reloc.s
rename to gas/testsuite/gas/arm/branch-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/copro.d b/gas/testsuite/gas/arm/copro.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/copro.d
rename to gas/testsuite/gas/arm/copro.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/copro.s b/gas/testsuite/gas/arm/copro.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/copro.s
rename to gas/testsuite/gas/arm/copro.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/depr-swp.d b/gas/testsuite/gas/arm/depr-swp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/depr-swp.d
rename to gas/testsuite/gas/arm/depr-swp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/depr-swp.l b/gas/testsuite/gas/arm/depr-swp.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/depr-swp.l
rename to gas/testsuite/gas/arm/depr-swp.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/depr-swp.s b/gas/testsuite/gas/arm/depr-swp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/depr-swp.s
rename to gas/testsuite/gas/arm/depr-swp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data.d b/gas/testsuite/gas/arm/dis-data.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data.d
rename to gas/testsuite/gas/arm/dis-data.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data.s b/gas/testsuite/gas/arm/dis-data.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data.s
rename to gas/testsuite/gas/arm/dis-data.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data2.d b/gas/testsuite/gas/arm/dis-data2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data2.d
rename to gas/testsuite/gas/arm/dis-data2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data2.s b/gas/testsuite/gas/arm/dis-data2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data2.s
rename to gas/testsuite/gas/arm/dis-data2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data3.d b/gas/testsuite/gas/arm/dis-data3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data3.d
rename to gas/testsuite/gas/arm/dis-data3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data3.s b/gas/testsuite/gas/arm/dis-data3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/dis-data3.s
rename to gas/testsuite/gas/arm/dis-data3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/eabi_attr_1.d b/gas/testsuite/gas/arm/eabi_attr_1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/eabi_attr_1.d
rename to gas/testsuite/gas/arm/eabi_attr_1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/eabi_attr_1.s b/gas/testsuite/gas/arm/eabi_attr_1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/eabi_attr_1.s
rename to gas/testsuite/gas/arm/eabi_attr_1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/el_segundo.d b/gas/testsuite/gas/arm/el_segundo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/el_segundo.d
rename to gas/testsuite/gas/arm/el_segundo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/el_segundo.s b/gas/testsuite/gas/arm/el_segundo.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/el_segundo.s
rename to gas/testsuite/gas/arm/el_segundo.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/float.d b/gas/testsuite/gas/arm/float.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/float.d
rename to gas/testsuite/gas/arm/float.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/float.s b/gas/testsuite/gas/arm/float.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/float.s
rename to gas/testsuite/gas/arm/float.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fp-save.d b/gas/testsuite/gas/arm/fp-save.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fp-save.d
rename to gas/testsuite/gas/arm/fp-save.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fp-save.s b/gas/testsuite/gas/arm/fp-save.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fp-save.s
rename to gas/testsuite/gas/arm/fp-save.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-dyadic.d b/gas/testsuite/gas/arm/fpa-dyadic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-dyadic.d
rename to gas/testsuite/gas/arm/fpa-dyadic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-dyadic.s b/gas/testsuite/gas/arm/fpa-dyadic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-dyadic.s
rename to gas/testsuite/gas/arm/fpa-dyadic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-mem.d b/gas/testsuite/gas/arm/fpa-mem.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-mem.d
rename to gas/testsuite/gas/arm/fpa-mem.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-mem.s b/gas/testsuite/gas/arm/fpa-mem.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-mem.s
rename to gas/testsuite/gas/arm/fpa-mem.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-monadic.d b/gas/testsuite/gas/arm/fpa-monadic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-monadic.d
rename to gas/testsuite/gas/arm/fpa-monadic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-monadic.s b/gas/testsuite/gas/arm/fpa-monadic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/fpa-monadic.s
rename to gas/testsuite/gas/arm/fpa-monadic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/got_prel.d b/gas/testsuite/gas/arm/got_prel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/got_prel.d
rename to gas/testsuite/gas/arm/got_prel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/got_prel.s b/gas/testsuite/gas/arm/got_prel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/got_prel.s
rename to gas/testsuite/gas/arm/got_prel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
rename to gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.l b/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.l
rename to gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.s b/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.s
rename to gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d
rename to gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.l b/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.l
rename to gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.s b/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.s
rename to gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu.d b/gas/testsuite/gas/arm/group-reloc-alu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu.d
rename to gas/testsuite/gas/arm/group-reloc-alu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu.s b/gas/testsuite/gas/arm/group-reloc-alu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-alu.s
rename to gas/testsuite/gas/arm/group-reloc-alu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
rename to gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l
rename to gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s b/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s
rename to gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d
rename to gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l
rename to gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s b/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s
rename to gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc.d b/gas/testsuite/gas/arm/group-reloc-ldc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc.d
rename to gas/testsuite/gas/arm/group-reloc-ldc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc.s b/gas/testsuite/gas/arm/group-reloc-ldc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldc.s
rename to gas/testsuite/gas/arm/group-reloc-ldc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
rename to gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.l b/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.l
rename to gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.s b/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.s
rename to gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d
rename to gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.l b/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.l
rename to gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.s b/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.s
rename to gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr.d b/gas/testsuite/gas/arm/group-reloc-ldr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr.d
rename to gas/testsuite/gas/arm/group-reloc-ldr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr.s b/gas/testsuite/gas/arm/group-reloc-ldr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldr.s
rename to gas/testsuite/gas/arm/group-reloc-ldr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
rename to gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.l b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.l
rename to gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s b/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s
rename to gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d b/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d
rename to gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.l b/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.l
rename to gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.s b/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.s
rename to gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs.d b/gas/testsuite/gas/arm/group-reloc-ldrs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs.d
rename to gas/testsuite/gas/arm/group-reloc-ldrs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs.s b/gas/testsuite/gas/arm/group-reloc-ldrs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/group-reloc-ldrs.s
rename to gas/testsuite/gas/arm/group-reloc-ldrs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-neon.d b/gas/testsuite/gas/arm/half-prec-neon.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-neon.d
rename to gas/testsuite/gas/arm/half-prec-neon.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-neon.s b/gas/testsuite/gas/arm/half-prec-neon.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-neon.s
rename to gas/testsuite/gas/arm/half-prec-neon.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-psyntax.d b/gas/testsuite/gas/arm/half-prec-psyntax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-psyntax.d
rename to gas/testsuite/gas/arm/half-prec-psyntax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-psyntax.s b/gas/testsuite/gas/arm/half-prec-psyntax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-psyntax.s
rename to gas/testsuite/gas/arm/half-prec-psyntax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-vfpv3.d b/gas/testsuite/gas/arm/half-prec-vfpv3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-vfpv3.d
rename to gas/testsuite/gas/arm/half-prec-vfpv3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-vfpv3.s b/gas/testsuite/gas/arm/half-prec-vfpv3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/half-prec-vfpv3.s
rename to gas/testsuite/gas/arm/half-prec-vfpv3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/immed.d b/gas/testsuite/gas/arm/immed.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/immed.d
rename to gas/testsuite/gas/arm/immed.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/immed.s b/gas/testsuite/gas/arm/immed.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/immed.s
rename to gas/testsuite/gas/arm/immed.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-a.d b/gas/testsuite/gas/arm/insn-error-a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-a.d
rename to gas/testsuite/gas/arm/insn-error-a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-a.l b/gas/testsuite/gas/arm/insn-error-a.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-a.l
rename to gas/testsuite/gas/arm/insn-error-a.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-a.s b/gas/testsuite/gas/arm/insn-error-a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-a.s
rename to gas/testsuite/gas/arm/insn-error-a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-t.d b/gas/testsuite/gas/arm/insn-error-t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-t.d
rename to gas/testsuite/gas/arm/insn-error-t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-t.l b/gas/testsuite/gas/arm/insn-error-t.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-t.l
rename to gas/testsuite/gas/arm/insn-error-t.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-t.s b/gas/testsuite/gas/arm/insn-error-t.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/insn-error-t.s
rename to gas/testsuite/gas/arm/insn-error-t.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-2.d b/gas/testsuite/gas/arm/inst-po-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-2.d
rename to gas/testsuite/gas/arm/inst-po-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-2.l b/gas/testsuite/gas/arm/inst-po-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-2.l
rename to gas/testsuite/gas/arm/inst-po-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-2.s b/gas/testsuite/gas/arm/inst-po-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-2.s
rename to gas/testsuite/gas/arm/inst-po-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-3.d b/gas/testsuite/gas/arm/inst-po-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-3.d
rename to gas/testsuite/gas/arm/inst-po-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-3.s b/gas/testsuite/gas/arm/inst-po-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-3.s
rename to gas/testsuite/gas/arm/inst-po-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-be.d b/gas/testsuite/gas/arm/inst-po-be.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po-be.d
rename to gas/testsuite/gas/arm/inst-po-be.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po.d b/gas/testsuite/gas/arm/inst-po.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po.d
rename to gas/testsuite/gas/arm/inst-po.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po.s b/gas/testsuite/gas/arm/inst-po.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst-po.s
rename to gas/testsuite/gas/arm/inst-po.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst.d
rename to gas/testsuite/gas/arm/inst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/inst.s b/gas/testsuite/gas/arm/inst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/inst.s
rename to gas/testsuite/gas/arm/inst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/itblock.s b/gas/testsuite/gas/arm/itblock.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/itblock.s
rename to gas/testsuite/gas/arm/itblock.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad.d b/gas/testsuite/gas/arm/iwmmxt-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad.d
rename to gas/testsuite/gas/arm/iwmmxt-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad.l b/gas/testsuite/gas/arm/iwmmxt-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad.l
rename to gas/testsuite/gas/arm/iwmmxt-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad.s b/gas/testsuite/gas/arm/iwmmxt-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad.s
rename to gas/testsuite/gas/arm/iwmmxt-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad2.d b/gas/testsuite/gas/arm/iwmmxt-bad2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad2.d
rename to gas/testsuite/gas/arm/iwmmxt-bad2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad2.l b/gas/testsuite/gas/arm/iwmmxt-bad2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad2.l
rename to gas/testsuite/gas/arm/iwmmxt-bad2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad2.s b/gas/testsuite/gas/arm/iwmmxt-bad2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-bad2.s
rename to gas/testsuite/gas/arm/iwmmxt-bad2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-wldsttbh.d b/gas/testsuite/gas/arm/iwmmxt-wldsttbh.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-wldsttbh.d
rename to gas/testsuite/gas/arm/iwmmxt-wldsttbh.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-wldsttbh.s b/gas/testsuite/gas/arm/iwmmxt-wldsttbh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt-wldsttbh.s
rename to gas/testsuite/gas/arm/iwmmxt-wldsttbh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt.d b/gas/testsuite/gas/arm/iwmmxt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt.d
rename to gas/testsuite/gas/arm/iwmmxt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt.s b/gas/testsuite/gas/arm/iwmmxt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt.s
rename to gas/testsuite/gas/arm/iwmmxt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt2.d b/gas/testsuite/gas/arm/iwmmxt2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt2.d
rename to gas/testsuite/gas/arm/iwmmxt2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt2.s b/gas/testsuite/gas/arm/iwmmxt2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/iwmmxt2.s
rename to gas/testsuite/gas/arm/iwmmxt2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/ldconst.d b/gas/testsuite/gas/arm/ldconst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/ldconst.d
rename to gas/testsuite/gas/arm/ldconst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/ldconst.s b/gas/testsuite/gas/arm/ldconst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/ldconst.s
rename to gas/testsuite/gas/arm/ldconst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/ldst-pc.d b/gas/testsuite/gas/arm/ldst-pc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/ldst-pc.d
rename to gas/testsuite/gas/arm/ldst-pc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/ldst-pc.s b/gas/testsuite/gas/arm/ldst-pc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/ldst-pc.s
rename to gas/testsuite/gas/arm/ldst-pc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/le-fpconst.d b/gas/testsuite/gas/arm/le-fpconst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/le-fpconst.d
rename to gas/testsuite/gas/arm/le-fpconst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/le-fpconst.s b/gas/testsuite/gas/arm/le-fpconst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/le-fpconst.s
rename to gas/testsuite/gas/arm/le-fpconst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_function.d b/gas/testsuite/gas/arm/local_function.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_function.d
rename to gas/testsuite/gas/arm/local_function.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_function.s b/gas/testsuite/gas/arm/local_function.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_function.s
rename to gas/testsuite/gas/arm/local_function.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_coff.d b/gas/testsuite/gas/arm/local_label_coff.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_coff.d
rename to gas/testsuite/gas/arm/local_label_coff.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_coff.s b/gas/testsuite/gas/arm/local_label_coff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_coff.s
rename to gas/testsuite/gas/arm/local_label_coff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_elf.d b/gas/testsuite/gas/arm/local_label_elf.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_elf.d
rename to gas/testsuite/gas/arm/local_label_elf.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_elf.s b/gas/testsuite/gas/arm/local_label_elf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_elf.s
rename to gas/testsuite/gas/arm/local_label_elf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_wince.d b/gas/testsuite/gas/arm/local_label_wince.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_wince.d
rename to gas/testsuite/gas/arm/local_label_wince.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_wince.s b/gas/testsuite/gas/arm/local_label_wince.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/local_label_wince.s
rename to gas/testsuite/gas/arm/local_label_wince.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/macro1.d b/gas/testsuite/gas/arm/macro1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/macro1.d
rename to gas/testsuite/gas/arm/macro1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/macro1.s b/gas/testsuite/gas/arm/macro1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/macro1.s
rename to gas/testsuite/gas/arm/macro1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapdir.d b/gas/testsuite/gas/arm/mapdir.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapdir.d
rename to gas/testsuite/gas/arm/mapdir.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapdir.s b/gas/testsuite/gas/arm/mapdir.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapdir.s
rename to gas/testsuite/gas/arm/mapdir.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapmisc.d b/gas/testsuite/gas/arm/mapmisc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapmisc.d
rename to gas/testsuite/gas/arm/mapmisc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapmisc.dat b/gas/testsuite/gas/arm/mapmisc.dat
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapmisc.dat
rename to gas/testsuite/gas/arm/mapmisc.dat
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapmisc.s b/gas/testsuite/gas/arm/mapmisc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapmisc.s
rename to gas/testsuite/gas/arm/mapmisc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping.d b/gas/testsuite/gas/arm/mapping.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping.d
rename to gas/testsuite/gas/arm/mapping.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping.s b/gas/testsuite/gas/arm/mapping.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping.s
rename to gas/testsuite/gas/arm/mapping.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping2.d b/gas/testsuite/gas/arm/mapping2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping2.d
rename to gas/testsuite/gas/arm/mapping2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping2.s b/gas/testsuite/gas/arm/mapping2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping2.s
rename to gas/testsuite/gas/arm/mapping2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping3.d b/gas/testsuite/gas/arm/mapping3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping3.d
rename to gas/testsuite/gas/arm/mapping3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping3.s b/gas/testsuite/gas/arm/mapping3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping3.s
rename to gas/testsuite/gas/arm/mapping3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping4.d b/gas/testsuite/gas/arm/mapping4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping4.d
rename to gas/testsuite/gas/arm/mapping4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapping4.s b/gas/testsuite/gas/arm/mapping4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapping4.s
rename to gas/testsuite/gas/arm/mapping4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapsecs.d b/gas/testsuite/gas/arm/mapsecs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapsecs.d
rename to gas/testsuite/gas/arm/mapsecs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapsecs.s b/gas/testsuite/gas/arm/mapsecs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapsecs.s
rename to gas/testsuite/gas/arm/mapsecs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapshort-eabi.d b/gas/testsuite/gas/arm/mapshort-eabi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapshort-eabi.d
rename to gas/testsuite/gas/arm/mapshort-eabi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapshort-elf.d b/gas/testsuite/gas/arm/mapshort-elf.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapshort-elf.d
rename to gas/testsuite/gas/arm/mapshort-elf.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mapshort.s b/gas/testsuite/gas/arm/mapshort.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mapshort.s
rename to gas/testsuite/gas/arm/mapshort.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/maverick.c b/gas/testsuite/gas/arm/maverick.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/maverick.c
rename to gas/testsuite/gas/arm/maverick.c
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/maverick.d b/gas/testsuite/gas/arm/maverick.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/maverick.d
rename to gas/testsuite/gas/arm/maverick.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/maverick.s b/gas/testsuite/gas/arm/maverick.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/maverick.s
rename to gas/testsuite/gas/arm/maverick.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/missing.d b/gas/testsuite/gas/arm/missing.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/missing.d
rename to gas/testsuite/gas/arm/missing.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/missing.l b/gas/testsuite/gas/arm/missing.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/missing.l
rename to gas/testsuite/gas/arm/missing.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/missing.s b/gas/testsuite/gas/arm/missing.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/missing.s
rename to gas/testsuite/gas/arm/missing.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/movw-local.d b/gas/testsuite/gas/arm/movw-local.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/movw-local.d
rename to gas/testsuite/gas/arm/movw-local.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/movw-local.s b/gas/testsuite/gas/arm/movw-local.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/movw-local.s
rename to gas/testsuite/gas/arm/movw-local.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm-bad.d b/gas/testsuite/gas/arm/msr-imm-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm-bad.d
rename to gas/testsuite/gas/arm/msr-imm-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm-bad.l b/gas/testsuite/gas/arm/msr-imm-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm-bad.l
rename to gas/testsuite/gas/arm/msr-imm-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm.d b/gas/testsuite/gas/arm/msr-imm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm.d
rename to gas/testsuite/gas/arm/msr-imm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm.s b/gas/testsuite/gas/arm/msr-imm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-imm.s
rename to gas/testsuite/gas/arm/msr-imm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg-bad.d b/gas/testsuite/gas/arm/msr-reg-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg-bad.d
rename to gas/testsuite/gas/arm/msr-reg-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg-bad.l b/gas/testsuite/gas/arm/msr-reg-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg-bad.l
rename to gas/testsuite/gas/arm/msr-reg-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg-thumb.d b/gas/testsuite/gas/arm/msr-reg-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg-thumb.d
rename to gas/testsuite/gas/arm/msr-reg-thumb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg.d b/gas/testsuite/gas/arm/msr-reg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg.d
rename to gas/testsuite/gas/arm/msr-reg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg.s b/gas/testsuite/gas/arm/msr-reg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/msr-reg.s
rename to gas/testsuite/gas/arm/msr-reg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap-v6.d b/gas/testsuite/gas/arm/mul-overlap-v6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap-v6.d
rename to gas/testsuite/gas/arm/mul-overlap-v6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap-v6.s b/gas/testsuite/gas/arm/mul-overlap-v6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap-v6.s
rename to gas/testsuite/gas/arm/mul-overlap-v6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap.d b/gas/testsuite/gas/arm/mul-overlap.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap.d
rename to gas/testsuite/gas/arm/mul-overlap.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap.l b/gas/testsuite/gas/arm/mul-overlap.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap.l
rename to gas/testsuite/gas/arm/mul-overlap.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap.s b/gas/testsuite/gas/arm/mul-overlap.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/mul-overlap.s
rename to gas/testsuite/gas/arm/mul-overlap.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-addressing-bad.d b/gas/testsuite/gas/arm/neon-addressing-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-addressing-bad.d
rename to gas/testsuite/gas/arm/neon-addressing-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-addressing-bad.l b/gas/testsuite/gas/arm/neon-addressing-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-addressing-bad.l
rename to gas/testsuite/gas/arm/neon-addressing-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-addressing-bad.s b/gas/testsuite/gas/arm/neon-addressing-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-addressing-bad.s
rename to gas/testsuite/gas/arm/neon-addressing-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad-inc.s b/gas/testsuite/gas/arm/neon-cond-bad-inc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad-inc.s
rename to gas/testsuite/gas/arm/neon-cond-bad-inc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad.d b/gas/testsuite/gas/arm/neon-cond-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad.d
rename to gas/testsuite/gas/arm/neon-cond-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad.l b/gas/testsuite/gas/arm/neon-cond-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad.l
rename to gas/testsuite/gas/arm/neon-cond-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad.s b/gas/testsuite/gas/arm/neon-cond-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad.s
rename to gas/testsuite/gas/arm/neon-cond-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad_t2.d b/gas/testsuite/gas/arm/neon-cond-bad_t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad_t2.d
rename to gas/testsuite/gas/arm/neon-cond-bad_t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad_t2.s b/gas/testsuite/gas/arm/neon-cond-bad_t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond-bad_t2.s
rename to gas/testsuite/gas/arm/neon-cond-bad_t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond.d b/gas/testsuite/gas/arm/neon-cond.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond.d
rename to gas/testsuite/gas/arm/neon-cond.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond.s b/gas/testsuite/gas/arm/neon-cond.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cond.s
rename to gas/testsuite/gas/arm/neon-cond.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-const.d b/gas/testsuite/gas/arm/neon-const.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-const.d
rename to gas/testsuite/gas/arm/neon-const.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-const.s b/gas/testsuite/gas/arm/neon-const.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-const.s
rename to gas/testsuite/gas/arm/neon-const.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cov.d b/gas/testsuite/gas/arm/neon-cov.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cov.d
rename to gas/testsuite/gas/arm/neon-cov.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cov.s b/gas/testsuite/gas/arm/neon-cov.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-cov.s
rename to gas/testsuite/gas/arm/neon-cov.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-fma-cov.d b/gas/testsuite/gas/arm/neon-fma-cov.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-fma-cov.d
rename to gas/testsuite/gas/arm/neon-fma-cov.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-fma-cov.s b/gas/testsuite/gas/arm/neon-fma-cov.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-fma-cov.s
rename to gas/testsuite/gas/arm/neon-fma-cov.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-align-bad.d b/gas/testsuite/gas/arm/neon-ldst-align-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-align-bad.d
rename to gas/testsuite/gas/arm/neon-ldst-align-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-align-bad.l b/gas/testsuite/gas/arm/neon-ldst-align-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-align-bad.l
rename to gas/testsuite/gas/arm/neon-ldst-align-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-align-bad.s b/gas/testsuite/gas/arm/neon-ldst-align-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-align-bad.s
rename to gas/testsuite/gas/arm/neon-ldst-align-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-es.d b/gas/testsuite/gas/arm/neon-ldst-es.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-es.d
rename to gas/testsuite/gas/arm/neon-ldst-es.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-es.s b/gas/testsuite/gas/arm/neon-ldst-es.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-es.s
rename to gas/testsuite/gas/arm/neon-ldst-es.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-rm.d b/gas/testsuite/gas/arm/neon-ldst-rm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-rm.d
rename to gas/testsuite/gas/arm/neon-ldst-rm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-rm.s b/gas/testsuite/gas/arm/neon-ldst-rm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-ldst-rm.s
rename to gas/testsuite/gas/arm/neon-ldst-rm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-logic.d b/gas/testsuite/gas/arm/neon-logic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-logic.d
rename to gas/testsuite/gas/arm/neon-logic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-logic.s b/gas/testsuite/gas/arm/neon-logic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-logic.s
rename to gas/testsuite/gas/arm/neon-logic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-omit.d b/gas/testsuite/gas/arm/neon-omit.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-omit.d
rename to gas/testsuite/gas/arm/neon-omit.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-omit.s b/gas/testsuite/gas/arm/neon-omit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-omit.s
rename to gas/testsuite/gas/arm/neon-omit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-psyn.d b/gas/testsuite/gas/arm/neon-psyn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-psyn.d
rename to gas/testsuite/gas/arm/neon-psyn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-psyn.s b/gas/testsuite/gas/arm/neon-psyn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-psyn.s
rename to gas/testsuite/gas/arm/neon-psyn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-suffix-bad.d b/gas/testsuite/gas/arm/neon-suffix-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-suffix-bad.d
rename to gas/testsuite/gas/arm/neon-suffix-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-suffix-bad.l b/gas/testsuite/gas/arm/neon-suffix-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-suffix-bad.l
rename to gas/testsuite/gas/arm/neon-suffix-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/neon-suffix-bad.s b/gas/testsuite/gas/arm/neon-suffix-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/neon-suffix-bad.s
rename to gas/testsuite/gas/arm/neon-suffix-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/noarm.d b/gas/testsuite/gas/arm/noarm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/noarm.d
rename to gas/testsuite/gas/arm/noarm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/noarm.l b/gas/testsuite/gas/arm/noarm.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/noarm.l
rename to gas/testsuite/gas/arm/noarm.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/noarm.s b/gas/testsuite/gas/arm/noarm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/noarm.s
rename to gas/testsuite/gas/arm/noarm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/nomapping.d b/gas/testsuite/gas/arm/nomapping.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/nomapping.d
rename to gas/testsuite/gas/arm/nomapping.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/nomapping.s b/gas/testsuite/gas/arm/nomapping.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/nomapping.s
rename to gas/testsuite/gas/arm/nomapping.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/offset.d b/gas/testsuite/gas/arm/offset.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/offset.d
rename to gas/testsuite/gas/arm/offset.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/offset.s b/gas/testsuite/gas/arm/offset.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/offset.s
rename to gas/testsuite/gas/arm/offset.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pic.d b/gas/testsuite/gas/arm/pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pic.d
rename to gas/testsuite/gas/arm/pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pic.s b/gas/testsuite/gas/arm/pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pic.s
rename to gas/testsuite/gas/arm/pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pic_vxworks.d b/gas/testsuite/gas/arm/pic_vxworks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pic_vxworks.d
rename to gas/testsuite/gas/arm/pic_vxworks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/plt-1.d b/gas/testsuite/gas/arm/plt-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/plt-1.d
rename to gas/testsuite/gas/arm/plt-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/plt-1.s b/gas/testsuite/gas/arm/plt-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/plt-1.s
rename to gas/testsuite/gas/arm/plt-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-1.d b/gas/testsuite/gas/arm/pr12198-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-1.d
rename to gas/testsuite/gas/arm/pr12198-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-1.s b/gas/testsuite/gas/arm/pr12198-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-1.s
rename to gas/testsuite/gas/arm/pr12198-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-2.d b/gas/testsuite/gas/arm/pr12198-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-2.d
rename to gas/testsuite/gas/arm/pr12198-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-2.s b/gas/testsuite/gas/arm/pr12198-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pr12198-2.s
rename to gas/testsuite/gas/arm/pr12198-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pr9722.d b/gas/testsuite/gas/arm/pr9722.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pr9722.d
rename to gas/testsuite/gas/arm/pr9722.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/pr9722.s b/gas/testsuite/gas/arm/pr9722.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/pr9722.s
rename to gas/testsuite/gas/arm/pr9722.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/r15-bad.d b/gas/testsuite/gas/arm/r15-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/r15-bad.d
rename to gas/testsuite/gas/arm/r15-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/r15-bad.l b/gas/testsuite/gas/arm/r15-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/r15-bad.l
rename to gas/testsuite/gas/arm/r15-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/r15-bad.s b/gas/testsuite/gas/arm/r15-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/r15-bad.s
rename to gas/testsuite/gas/arm/r15-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/reg-alias.d b/gas/testsuite/gas/arm/reg-alias.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/reg-alias.d
rename to gas/testsuite/gas/arm/reg-alias.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/reg-alias.s b/gas/testsuite/gas/arm/reg-alias.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/reg-alias.s
rename to gas/testsuite/gas/arm/reg-alias.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/relax_branch_align.d b/gas/testsuite/gas/arm/relax_branch_align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/relax_branch_align.d
rename to gas/testsuite/gas/arm/relax_branch_align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/relax_branch_align.s b/gas/testsuite/gas/arm/relax_branch_align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/relax_branch_align.s
rename to gas/testsuite/gas/arm/relax_branch_align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/relax_load_align.d b/gas/testsuite/gas/arm/relax_load_align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/relax_load_align.d
rename to gas/testsuite/gas/arm/relax_load_align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/relax_load_align.s b/gas/testsuite/gas/arm/relax_load_align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/relax_load_align.s
rename to gas/testsuite/gas/arm/relax_load_align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/reloc-bad.d b/gas/testsuite/gas/arm/reloc-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/reloc-bad.d
rename to gas/testsuite/gas/arm/reloc-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/reloc-bad.l b/gas/testsuite/gas/arm/reloc-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/reloc-bad.l
rename to gas/testsuite/gas/arm/reloc-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/reloc-bad.s b/gas/testsuite/gas/arm/reloc-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/reloc-bad.s
rename to gas/testsuite/gas/arm/reloc-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/req.d b/gas/testsuite/gas/arm/req.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/req.d
rename to gas/testsuite/gas/arm/req.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/req.l b/gas/testsuite/gas/arm/req.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/req.l
rename to gas/testsuite/gas/arm/req.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/req.s b/gas/testsuite/gas/arm/req.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/req.s
rename to gas/testsuite/gas/arm/req.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-usage-t.d b/gas/testsuite/gas/arm/sp-pc-usage-t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-usage-t.d
rename to gas/testsuite/gas/arm/sp-pc-usage-t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-usage-t.s b/gas/testsuite/gas/arm/sp-pc-usage-t.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-usage-t.s
rename to gas/testsuite/gas/arm/sp-pc-usage-t.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad-t.d b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad-t.d
rename to gas/testsuite/gas/arm/sp-pc-validations-bad-t.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad-t.l b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad-t.l
rename to gas/testsuite/gas/arm/sp-pc-validations-bad-t.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad-t.s b/gas/testsuite/gas/arm/sp-pc-validations-bad-t.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad-t.s
rename to gas/testsuite/gas/arm/sp-pc-validations-bad-t.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad.d b/gas/testsuite/gas/arm/sp-pc-validations-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad.d
rename to gas/testsuite/gas/arm/sp-pc-validations-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad.l b/gas/testsuite/gas/arm/sp-pc-validations-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad.l
rename to gas/testsuite/gas/arm/sp-pc-validations-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad.s b/gas/testsuite/gas/arm/sp-pc-validations-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/sp-pc-validations-bad.s
rename to gas/testsuite/gas/arm/sp-pc-validations-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/srs-arm.d b/gas/testsuite/gas/arm/srs-arm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/srs-arm.d
rename to gas/testsuite/gas/arm/srs-arm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/srs-arm.l b/gas/testsuite/gas/arm/srs-arm.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/srs-arm.l
rename to gas/testsuite/gas/arm/srs-arm.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/srs-arm.s b/gas/testsuite/gas/arm/srs-arm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/srs-arm.s
rename to gas/testsuite/gas/arm/srs-arm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/srs-t2.d b/gas/testsuite/gas/arm/srs-t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/srs-t2.d
rename to gas/testsuite/gas/arm/srs-t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/srs-t2.l b/gas/testsuite/gas/arm/srs-t2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/srs-t2.l
rename to gas/testsuite/gas/arm/srs-t2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/srs-t2.s b/gas/testsuite/gas/arm/srs-t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/srs-t2.s
rename to gas/testsuite/gas/arm/srs-t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/svc.d b/gas/testsuite/gas/arm/svc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/svc.d
rename to gas/testsuite/gas/arm/svc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/svc.s b/gas/testsuite/gas/arm/svc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/svc.s
rename to gas/testsuite/gas/arm/svc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/t16-bad.d b/gas/testsuite/gas/arm/t16-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/t16-bad.d
rename to gas/testsuite/gas/arm/t16-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/t16-bad.l b/gas/testsuite/gas/arm/t16-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/t16-bad.l
rename to gas/testsuite/gas/arm/t16-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/t16-bad.s b/gas/testsuite/gas/arm/t16-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/t16-bad.s
rename to gas/testsuite/gas/arm/t16-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/target-reloc-1.d b/gas/testsuite/gas/arm/target-reloc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/target-reloc-1.d
rename to gas/testsuite/gas/arm/target-reloc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/target-reloc-1.s b/gas/testsuite/gas/arm/target-reloc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/target-reloc-1.s
rename to gas/testsuite/gas/arm/target-reloc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat.d b/gas/testsuite/gas/arm/tcompat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat.d
rename to gas/testsuite/gas/arm/tcompat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat.s b/gas/testsuite/gas/arm/tcompat.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat.s
rename to gas/testsuite/gas/arm/tcompat.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat2.d b/gas/testsuite/gas/arm/tcompat2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat2.d
rename to gas/testsuite/gas/arm/tcompat2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat2.s b/gas/testsuite/gas/arm/tcompat2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/tcompat2.s
rename to gas/testsuite/gas/arm/tcompat2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-eabi.d b/gas/testsuite/gas/arm/thumb-eabi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-eabi.d
rename to gas/testsuite/gas/arm/thumb-eabi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-nop.d b/gas/testsuite/gas/arm/thumb-nop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-nop.d
rename to gas/testsuite/gas/arm/thumb-nop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-nop.s b/gas/testsuite/gas/arm/thumb-nop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-nop.s
rename to gas/testsuite/gas/arm/thumb-nop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-bad.d b/gas/testsuite/gas/arm/thumb-w-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-bad.d
rename to gas/testsuite/gas/arm/thumb-w-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-bad.l b/gas/testsuite/gas/arm/thumb-w-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-bad.l
rename to gas/testsuite/gas/arm/thumb-w-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-bad.s b/gas/testsuite/gas/arm/thumb-w-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-bad.s
rename to gas/testsuite/gas/arm/thumb-w-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-good.d b/gas/testsuite/gas/arm/thumb-w-good.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-good.d
rename to gas/testsuite/gas/arm/thumb-w-good.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-good.s b/gas/testsuite/gas/arm/thumb-w-good.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb-w-good.s
rename to gas/testsuite/gas/arm/thumb-w-good.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb.d
rename to gas/testsuite/gas/arm/thumb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb.s b/gas/testsuite/gas/arm/thumb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb.s
rename to gas/testsuite/gas/arm/thumb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb1_unified.d b/gas/testsuite/gas/arm/thumb1_unified.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb1_unified.d
rename to gas/testsuite/gas/arm/thumb1_unified.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb1_unified.s b/gas/testsuite/gas/arm/thumb1_unified.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb1_unified.s
rename to gas/testsuite/gas/arm/thumb1_unified.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_add.d b/gas/testsuite/gas/arm/thumb2_add.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_add.d
rename to gas/testsuite/gas/arm/thumb2_add.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_add.s b/gas/testsuite/gas/arm/thumb2_add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_add.s
rename to gas/testsuite/gas/arm/thumb2_add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bad_reg.d b/gas/testsuite/gas/arm/thumb2_bad_reg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bad_reg.d
rename to gas/testsuite/gas/arm/thumb2_bad_reg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bad_reg.l b/gas/testsuite/gas/arm/thumb2_bad_reg.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bad_reg.l
rename to gas/testsuite/gas/arm/thumb2_bad_reg.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bad_reg.s b/gas/testsuite/gas/arm/thumb2_bad_reg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bad_reg.s
rename to gas/testsuite/gas/arm/thumb2_bad_reg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bcond.d b/gas/testsuite/gas/arm/thumb2_bcond.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bcond.d
rename to gas/testsuite/gas/arm/thumb2_bcond.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bcond.s b/gas/testsuite/gas/arm/thumb2_bcond.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_bcond.s
rename to gas/testsuite/gas/arm/thumb2_bcond.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_invert.d b/gas/testsuite/gas/arm/thumb2_invert.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_invert.d
rename to gas/testsuite/gas/arm/thumb2_invert.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_invert.s b/gas/testsuite/gas/arm/thumb2_invert.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_invert.s
rename to gas/testsuite/gas/arm/thumb2_invert.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it.d b/gas/testsuite/gas/arm/thumb2_it.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it.d
rename to gas/testsuite/gas/arm/thumb2_it.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it.s b/gas/testsuite/gas/arm/thumb2_it.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it.s
rename to gas/testsuite/gas/arm/thumb2_it.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_auto.d b/gas/testsuite/gas/arm/thumb2_it_auto.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_auto.d
rename to gas/testsuite/gas/arm/thumb2_it_auto.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad.d b/gas/testsuite/gas/arm/thumb2_it_bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad.d
rename to gas/testsuite/gas/arm/thumb2_it_bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad.l b/gas/testsuite/gas/arm/thumb2_it_bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad.l
rename to gas/testsuite/gas/arm/thumb2_it_bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad.s b/gas/testsuite/gas/arm/thumb2_it_bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad.s
rename to gas/testsuite/gas/arm/thumb2_it_bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad_auto.d b/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_it_bad_auto.d
rename to gas/testsuite/gas/arm/thumb2_it_bad_auto.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm.d b/gas/testsuite/gas/arm/thumb2_ldmstm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm.d
rename to gas/testsuite/gas/arm/thumb2_ldmstm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm.s b/gas/testsuite/gas/arm/thumb2_ldmstm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm.s
rename to gas/testsuite/gas/arm/thumb2_ldmstm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm_bad.d b/gas/testsuite/gas/arm/thumb2_ldmstm_bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm_bad.d
rename to gas/testsuite/gas/arm/thumb2_ldmstm_bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm_bad.l b/gas/testsuite/gas/arm/thumb2_ldmstm_bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm_bad.l
rename to gas/testsuite/gas/arm/thumb2_ldmstm_bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm_bad.s b/gas/testsuite/gas/arm/thumb2_ldmstm_bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_ldmstm_bad.s
rename to gas/testsuite/gas/arm/thumb2_ldmstm_bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul-bad.d b/gas/testsuite/gas/arm/thumb2_mul-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul-bad.d
rename to gas/testsuite/gas/arm/thumb2_mul-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul-bad.l b/gas/testsuite/gas/arm/thumb2_mul-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul-bad.l
rename to gas/testsuite/gas/arm/thumb2_mul-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul-bad.s b/gas/testsuite/gas/arm/thumb2_mul-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul-bad.s
rename to gas/testsuite/gas/arm/thumb2_mul-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul.d b/gas/testsuite/gas/arm/thumb2_mul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul.d
rename to gas/testsuite/gas/arm/thumb2_mul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul.s b/gas/testsuite/gas/arm/thumb2_mul.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_mul.s
rename to gas/testsuite/gas/arm/thumb2_mul.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_pool.d b/gas/testsuite/gas/arm/thumb2_pool.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_pool.d
rename to gas/testsuite/gas/arm/thumb2_pool.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_pool.s b/gas/testsuite/gas/arm/thumb2_pool.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_pool.s
rename to gas/testsuite/gas/arm/thumb2_pool.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_relax.d b/gas/testsuite/gas/arm/thumb2_relax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_relax.d
rename to gas/testsuite/gas/arm/thumb2_relax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_relax.s b/gas/testsuite/gas/arm/thumb2_relax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb2_relax.s
rename to gas/testsuite/gas/arm/thumb2_relax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb32.d
rename to gas/testsuite/gas/arm/thumb32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb32.l b/gas/testsuite/gas/arm/thumb32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb32.l
rename to gas/testsuite/gas/arm/thumb32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumb32.s b/gas/testsuite/gas/arm/thumb32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumb32.s
rename to gas/testsuite/gas/arm/thumb32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbrel.d b/gas/testsuite/gas/arm/thumbrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbrel.d
rename to gas/testsuite/gas/arm/thumbrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbrel.s b/gas/testsuite/gas/arm/thumbrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbrel.s
rename to gas/testsuite/gas/arm/thumbrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6.d b/gas/testsuite/gas/arm/thumbv6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6.d
rename to gas/testsuite/gas/arm/thumbv6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6.s b/gas/testsuite/gas/arm/thumbv6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6.s
rename to gas/testsuite/gas/arm/thumbv6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6k.d b/gas/testsuite/gas/arm/thumbv6k.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6k.d
rename to gas/testsuite/gas/arm/thumbv6k.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6k.s b/gas/testsuite/gas/arm/thumbv6k.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbv6k.s
rename to gas/testsuite/gas/arm/thumbv6k.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbver.d b/gas/testsuite/gas/arm/thumbver.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbver.d
rename to gas/testsuite/gas/arm/thumbver.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/thumbver.s b/gas/testsuite/gas/arm/thumbver.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/thumbver.s
rename to gas/testsuite/gas/arm/thumbver.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/tls.d b/gas/testsuite/gas/arm/tls.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/tls.d
rename to gas/testsuite/gas/arm/tls.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/tls.s b/gas/testsuite/gas/arm/tls.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/tls.s
rename to gas/testsuite/gas/arm/tls.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/tls_vxworks.d b/gas/testsuite/gas/arm/tls_vxworks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/tls_vxworks.d
rename to gas/testsuite/gas/arm/tls_vxworks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/undefined.d b/gas/testsuite/gas/arm/undefined.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/undefined.d
rename to gas/testsuite/gas/arm/undefined.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/undefined.l b/gas/testsuite/gas/arm/undefined.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/undefined.l
rename to gas/testsuite/gas/arm/undefined.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/undefined.s b/gas/testsuite/gas/arm/undefined.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/undefined.s
rename to gas/testsuite/gas/arm/undefined.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/undefined_coff.d b/gas/testsuite/gas/arm/undefined_coff.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/undefined_coff.d
rename to gas/testsuite/gas/arm/undefined_coff.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/undefined_coff.l b/gas/testsuite/gas/arm/undefined_coff.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/undefined_coff.l
rename to gas/testsuite/gas/arm/undefined_coff.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/undefined_coff.s b/gas/testsuite/gas/arm/undefined_coff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/undefined_coff.s
rename to gas/testsuite/gas/arm/undefined_coff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/unpredictable.d b/gas/testsuite/gas/arm/unpredictable.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/unpredictable.d
rename to gas/testsuite/gas/arm/unpredictable.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/unpredictable.s b/gas/testsuite/gas/arm/unpredictable.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/unpredictable.s
rename to gas/testsuite/gas/arm/unpredictable.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/unwind.d
rename to gas/testsuite/gas/arm/unwind.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/unwind.s b/gas/testsuite/gas/arm/unwind.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/unwind.s
rename to gas/testsuite/gas/arm/unwind.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/unwind_vxworks.d b/gas/testsuite/gas/arm/unwind_vxworks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/unwind_vxworks.d
rename to gas/testsuite/gas/arm/unwind_vxworks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/v4bx.d b/gas/testsuite/gas/arm/v4bx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/v4bx.d
rename to gas/testsuite/gas/arm/v4bx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/v4bx.s b/gas/testsuite/gas/arm/v4bx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/v4bx.s
rename to gas/testsuite/gas/arm/v4bx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfma1.d b/gas/testsuite/gas/arm/vfma1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfma1.d
rename to gas/testsuite/gas/arm/vfma1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfma1.s b/gas/testsuite/gas/arm/vfma1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfma1.s
rename to gas/testsuite/gas/arm/vfma1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad.d b/gas/testsuite/gas/arm/vfp-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad.d
rename to gas/testsuite/gas/arm/vfp-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad.l b/gas/testsuite/gas/arm/vfp-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad.l
rename to gas/testsuite/gas/arm/vfp-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad.s b/gas/testsuite/gas/arm/vfp-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad.s
rename to gas/testsuite/gas/arm/vfp-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad_t2.d b/gas/testsuite/gas/arm/vfp-bad_t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad_t2.d
rename to gas/testsuite/gas/arm/vfp-bad_t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad_t2.l b/gas/testsuite/gas/arm/vfp-bad_t2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad_t2.l
rename to gas/testsuite/gas/arm/vfp-bad_t2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad_t2.s b/gas/testsuite/gas/arm/vfp-bad_t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-bad_t2.s
rename to gas/testsuite/gas/arm/vfp-bad_t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-arm.d b/gas/testsuite/gas/arm/vfp-fma-arm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-arm.d
rename to gas/testsuite/gas/arm/vfp-fma-arm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-arm.s b/gas/testsuite/gas/arm/vfp-fma-arm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-arm.s
rename to gas/testsuite/gas/arm/vfp-fma-arm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-inc.s b/gas/testsuite/gas/arm/vfp-fma-inc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-inc.s
rename to gas/testsuite/gas/arm/vfp-fma-inc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-thumb.d b/gas/testsuite/gas/arm/vfp-fma-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-thumb.d
rename to gas/testsuite/gas/arm/vfp-fma-thumb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-thumb.s b/gas/testsuite/gas/arm/vfp-fma-thumb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-fma-thumb.s
rename to gas/testsuite/gas/arm/vfp-fma-thumb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-overlap.d b/gas/testsuite/gas/arm/vfp-neon-overlap.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-overlap.d
rename to gas/testsuite/gas/arm/vfp-neon-overlap.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-overlap.s b/gas/testsuite/gas/arm/vfp-neon-overlap.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-overlap.s
rename to gas/testsuite/gas/arm/vfp-neon-overlap.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax-inc.s b/gas/testsuite/gas/arm/vfp-neon-syntax-inc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax-inc.s
rename to gas/testsuite/gas/arm/vfp-neon-syntax-inc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax.d b/gas/testsuite/gas/arm/vfp-neon-syntax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax.d
rename to gas/testsuite/gas/arm/vfp-neon-syntax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax.s b/gas/testsuite/gas/arm/vfp-neon-syntax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax.s
rename to gas/testsuite/gas/arm/vfp-neon-syntax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
rename to gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax_t2.s b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp-neon-syntax_t2.s
rename to gas/testsuite/gas/arm/vfp-neon-syntax_t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1.d b/gas/testsuite/gas/arm/vfp1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1.d
rename to gas/testsuite/gas/arm/vfp1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1.s b/gas/testsuite/gas/arm/vfp1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1.s
rename to gas/testsuite/gas/arm/vfp1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1_t2.d b/gas/testsuite/gas/arm/vfp1_t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1_t2.d
rename to gas/testsuite/gas/arm/vfp1_t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1_t2.s b/gas/testsuite/gas/arm/vfp1_t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1_t2.s
rename to gas/testsuite/gas/arm/vfp1_t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD.d b/gas/testsuite/gas/arm/vfp1xD.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD.d
rename to gas/testsuite/gas/arm/vfp1xD.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD.s b/gas/testsuite/gas/arm/vfp1xD.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD.s
rename to gas/testsuite/gas/arm/vfp1xD.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD_t2.d b/gas/testsuite/gas/arm/vfp1xD_t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD_t2.d
rename to gas/testsuite/gas/arm/vfp1xD_t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD_t2.s b/gas/testsuite/gas/arm/vfp1xD_t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp1xD_t2.s
rename to gas/testsuite/gas/arm/vfp1xD_t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2.d b/gas/testsuite/gas/arm/vfp2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2.d
rename to gas/testsuite/gas/arm/vfp2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2.s b/gas/testsuite/gas/arm/vfp2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2.s
rename to gas/testsuite/gas/arm/vfp2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2_t2.d b/gas/testsuite/gas/arm/vfp2_t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2_t2.d
rename to gas/testsuite/gas/arm/vfp2_t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2_t2.s b/gas/testsuite/gas/arm/vfp2_t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfp2_t2.s
rename to gas/testsuite/gas/arm/vfp2_t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-32drs.d b/gas/testsuite/gas/arm/vfpv3-32drs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-32drs.d
rename to gas/testsuite/gas/arm/vfpv3-32drs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-32drs.s b/gas/testsuite/gas/arm/vfpv3-32drs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-32drs.s
rename to gas/testsuite/gas/arm/vfpv3-32drs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-const-conv.d b/gas/testsuite/gas/arm/vfpv3-const-conv.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-const-conv.d
rename to gas/testsuite/gas/arm/vfpv3-const-conv.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-const-conv.s b/gas/testsuite/gas/arm/vfpv3-const-conv.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-const-conv.s
rename to gas/testsuite/gas/arm/vfpv3-const-conv.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-d16-bad.d b/gas/testsuite/gas/arm/vfpv3-d16-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-d16-bad.d
rename to gas/testsuite/gas/arm/vfpv3-d16-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-d16-bad.l b/gas/testsuite/gas/arm/vfpv3-d16-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3-d16-bad.l
rename to gas/testsuite/gas/arm/vfpv3-d16-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3xd.d b/gas/testsuite/gas/arm/vfpv3xd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3xd.d
rename to gas/testsuite/gas/arm/vfpv3xd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3xd.s b/gas/testsuite/gas/arm/vfpv3xd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vfpv3xd.s
rename to gas/testsuite/gas/arm/vfpv3xd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldm-arm.d b/gas/testsuite/gas/arm/vldm-arm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldm-arm.d
rename to gas/testsuite/gas/arm/vldm-arm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldm-thumb-bad.d b/gas/testsuite/gas/arm/vldm-thumb-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldm-thumb-bad.d
rename to gas/testsuite/gas/arm/vldm-thumb-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldm-thumb-bad.l b/gas/testsuite/gas/arm/vldm-thumb-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldm-thumb-bad.l
rename to gas/testsuite/gas/arm/vldm-thumb-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldm.s b/gas/testsuite/gas/arm/vldm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldm.s
rename to gas/testsuite/gas/arm/vldm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-arm-bad.d b/gas/testsuite/gas/arm/vldmw-arm-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-arm-bad.d
rename to gas/testsuite/gas/arm/vldmw-arm-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-bad.l b/gas/testsuite/gas/arm/vldmw-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-bad.l
rename to gas/testsuite/gas/arm/vldmw-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-bad.s b/gas/testsuite/gas/arm/vldmw-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-bad.s
rename to gas/testsuite/gas/arm/vldmw-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-thumb-bad.d b/gas/testsuite/gas/arm/vldmw-thumb-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldmw-thumb-bad.d
rename to gas/testsuite/gas/arm/vldmw-thumb-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldr.d b/gas/testsuite/gas/arm/vldr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldr.d
rename to gas/testsuite/gas/arm/vldr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vldr.s b/gas/testsuite/gas/arm/vldr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vldr.s
rename to gas/testsuite/gas/arm/vldr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-arm-bad.d b/gas/testsuite/gas/arm/vstr-arm-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-arm-bad.d
rename to gas/testsuite/gas/arm/vstr-arm-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-arm-bad.l b/gas/testsuite/gas/arm/vstr-arm-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-arm-bad.l
rename to gas/testsuite/gas/arm/vstr-arm-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-bad.s b/gas/testsuite/gas/arm/vstr-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-bad.s
rename to gas/testsuite/gas/arm/vstr-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-thumb-bad.d b/gas/testsuite/gas/arm/vstr-thumb-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-thumb-bad.d
rename to gas/testsuite/gas/arm/vstr-thumb-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-thumb-bad.l b/gas/testsuite/gas/arm/vstr-thumb-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/vstr-thumb-bad.l
rename to gas/testsuite/gas/arm/vstr-thumb-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-1.d b/gas/testsuite/gas/arm/weakdef-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-1.d
rename to gas/testsuite/gas/arm/weakdef-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-1.s b/gas/testsuite/gas/arm/weakdef-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-1.s
rename to gas/testsuite/gas/arm/weakdef-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-2.d b/gas/testsuite/gas/arm/weakdef-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-2.d
rename to gas/testsuite/gas/arm/weakdef-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-2.l b/gas/testsuite/gas/arm/weakdef-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-2.l
rename to gas/testsuite/gas/arm/weakdef-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-2.s b/gas/testsuite/gas/arm/weakdef-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/weakdef-2.s
rename to gas/testsuite/gas/arm/weakdef-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/wince.d b/gas/testsuite/gas/arm/wince.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/wince.d
rename to gas/testsuite/gas/arm/wince.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/wince.s b/gas/testsuite/gas/arm/wince.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/wince.s
rename to gas/testsuite/gas/arm/wince.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/wince_inst.d b/gas/testsuite/gas/arm/wince_inst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/wince_inst.d
rename to gas/testsuite/gas/arm/wince_inst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/xscale.d b/gas/testsuite/gas/arm/xscale.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/xscale.d
rename to gas/testsuite/gas/arm/xscale.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/arm/xscale.s b/gas/testsuite/gas/arm/xscale.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/arm/xscale.s
rename to gas/testsuite/gas/arm/xscale.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/16bit_illegals.d b/gas/testsuite/gas/bfin/16bit_illegals.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/16bit_illegals.d
rename to gas/testsuite/gas/bfin/16bit_illegals.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/16bit_illegals.s b/gas/testsuite/gas/bfin/16bit_illegals.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/16bit_illegals.s
rename to gas/testsuite/gas/bfin/16bit_illegals.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/arith_mode.d b/gas/testsuite/gas/bfin/arith_mode.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/arith_mode.d
rename to gas/testsuite/gas/bfin/arith_mode.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/arith_mode.s b/gas/testsuite/gas/bfin/arith_mode.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/arith_mode.s
rename to gas/testsuite/gas/bfin/arith_mode.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/arithmetic.d b/gas/testsuite/gas/bfin/arithmetic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/arithmetic.d
rename to gas/testsuite/gas/bfin/arithmetic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/arithmetic.s b/gas/testsuite/gas/bfin/arithmetic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/arithmetic.s
rename to gas/testsuite/gas/bfin/arithmetic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/bfin.exp b/gas/testsuite/gas/bfin/bfin.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/bfin.exp
rename to gas/testsuite/gas/bfin/bfin.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/bit.d b/gas/testsuite/gas/bfin/bit.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/bit.d
rename to gas/testsuite/gas/bfin/bit.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/bit.s b/gas/testsuite/gas/bfin/bit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/bit.s
rename to gas/testsuite/gas/bfin/bit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/bit2.d b/gas/testsuite/gas/bfin/bit2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/bit2.d
rename to gas/testsuite/gas/bfin/bit2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/bit2.s b/gas/testsuite/gas/bfin/bit2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/bit2.s
rename to gas/testsuite/gas/bfin/bit2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/cache.d b/gas/testsuite/gas/bfin/cache.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/cache.d
rename to gas/testsuite/gas/bfin/cache.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/cache.s b/gas/testsuite/gas/bfin/cache.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/cache.s
rename to gas/testsuite/gas/bfin/cache.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/cache2.d b/gas/testsuite/gas/bfin/cache2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/cache2.d
rename to gas/testsuite/gas/bfin/cache2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/cache2.s b/gas/testsuite/gas/bfin/cache2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/cache2.s
rename to gas/testsuite/gas/bfin/cache2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code.d b/gas/testsuite/gas/bfin/control_code.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code.d
rename to gas/testsuite/gas/bfin/control_code.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code.s b/gas/testsuite/gas/bfin/control_code.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code.s
rename to gas/testsuite/gas/bfin/control_code.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code2.d b/gas/testsuite/gas/bfin/control_code2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code2.d
rename to gas/testsuite/gas/bfin/control_code2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code2.s b/gas/testsuite/gas/bfin/control_code2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/control_code2.s
rename to gas/testsuite/gas/bfin/control_code2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/error.exp b/gas/testsuite/gas/bfin/error.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/error.exp
rename to gas/testsuite/gas/bfin/error.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/event.d b/gas/testsuite/gas/bfin/event.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/event.d
rename to gas/testsuite/gas/bfin/event.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/event.s b/gas/testsuite/gas/bfin/event.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/event.s
rename to gas/testsuite/gas/bfin/event.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/event2.d b/gas/testsuite/gas/bfin/event2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/event2.d
rename to gas/testsuite/gas/bfin/event2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/event2.s b/gas/testsuite/gas/bfin/event2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/event2.s
rename to gas/testsuite/gas/bfin/event2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_comparison_errors.l b/gas/testsuite/gas/bfin/expected_comparison_errors.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_comparison_errors.l
rename to gas/testsuite/gas/bfin/expected_comparison_errors.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_comparison_errors.s b/gas/testsuite/gas/bfin/expected_comparison_errors.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_comparison_errors.s
rename to gas/testsuite/gas/bfin/expected_comparison_errors.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_errors.l b/gas/testsuite/gas/bfin/expected_errors.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_errors.l
rename to gas/testsuite/gas/bfin/expected_errors.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_errors.s b/gas/testsuite/gas/bfin/expected_errors.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_errors.s
rename to gas/testsuite/gas/bfin/expected_errors.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_move_errors.l b/gas/testsuite/gas/bfin/expected_move_errors.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_move_errors.l
rename to gas/testsuite/gas/bfin/expected_move_errors.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_move_errors.s b/gas/testsuite/gas/bfin/expected_move_errors.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/expected_move_errors.s
rename to gas/testsuite/gas/bfin/expected_move_errors.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/flow.d b/gas/testsuite/gas/bfin/flow.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/flow.d
rename to gas/testsuite/gas/bfin/flow.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/flow.s b/gas/testsuite/gas/bfin/flow.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/flow.s
rename to gas/testsuite/gas/bfin/flow.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/flow2.d b/gas/testsuite/gas/bfin/flow2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/flow2.d
rename to gas/testsuite/gas/bfin/flow2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/flow2.s b/gas/testsuite/gas/bfin/flow2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/flow2.s
rename to gas/testsuite/gas/bfin/flow2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/invalid_arith_mode.l b/gas/testsuite/gas/bfin/invalid_arith_mode.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/invalid_arith_mode.l
rename to gas/testsuite/gas/bfin/invalid_arith_mode.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/invalid_arith_mode.s b/gas/testsuite/gas/bfin/invalid_arith_mode.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/invalid_arith_mode.s
rename to gas/testsuite/gas/bfin/invalid_arith_mode.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/line_number.l b/gas/testsuite/gas/bfin/line_number.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/line_number.l
rename to gas/testsuite/gas/bfin/line_number.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/line_number.s b/gas/testsuite/gas/bfin/line_number.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/line_number.s
rename to gas/testsuite/gas/bfin/line_number.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/load.d b/gas/testsuite/gas/bfin/load.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/load.d
rename to gas/testsuite/gas/bfin/load.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/load.s b/gas/testsuite/gas/bfin/load.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/load.s
rename to gas/testsuite/gas/bfin/load.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/logical.d b/gas/testsuite/gas/bfin/logical.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/logical.d
rename to gas/testsuite/gas/bfin/logical.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/logical.s b/gas/testsuite/gas/bfin/logical.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/logical.s
rename to gas/testsuite/gas/bfin/logical.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/logical2.d b/gas/testsuite/gas/bfin/logical2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/logical2.d
rename to gas/testsuite/gas/bfin/logical2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/logical2.s b/gas/testsuite/gas/bfin/logical2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/logical2.s
rename to gas/testsuite/gas/bfin/logical2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop.d b/gas/testsuite/gas/bfin/loop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop.d
rename to gas/testsuite/gas/bfin/loop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop.s b/gas/testsuite/gas/bfin/loop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop.s
rename to gas/testsuite/gas/bfin/loop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop2.d b/gas/testsuite/gas/bfin/loop2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop2.d
rename to gas/testsuite/gas/bfin/loop2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop2.s b/gas/testsuite/gas/bfin/loop2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop2.s
rename to gas/testsuite/gas/bfin/loop2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop3.d b/gas/testsuite/gas/bfin/loop3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop3.d
rename to gas/testsuite/gas/bfin/loop3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop3.s b/gas/testsuite/gas/bfin/loop3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop3.s
rename to gas/testsuite/gas/bfin/loop3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label.d b/gas/testsuite/gas/bfin/loop_label.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label.d
rename to gas/testsuite/gas/bfin/loop_label.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label.s b/gas/testsuite/gas/bfin/loop_label.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label.s
rename to gas/testsuite/gas/bfin/loop_label.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label2.d b/gas/testsuite/gas/bfin/loop_label2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label2.d
rename to gas/testsuite/gas/bfin/loop_label2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label2.s b/gas/testsuite/gas/bfin/loop_label2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_label2.s
rename to gas/testsuite/gas/bfin/loop_label2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_temps.d b/gas/testsuite/gas/bfin/loop_temps.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_temps.d
rename to gas/testsuite/gas/bfin/loop_temps.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_temps.s b/gas/testsuite/gas/bfin/loop_temps.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/loop_temps.s
rename to gas/testsuite/gas/bfin/loop_temps.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/misc.d b/gas/testsuite/gas/bfin/misc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/misc.d
rename to gas/testsuite/gas/bfin/misc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/misc.s b/gas/testsuite/gas/bfin/misc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/misc.s
rename to gas/testsuite/gas/bfin/misc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/move.d b/gas/testsuite/gas/bfin/move.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/move.d
rename to gas/testsuite/gas/bfin/move.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/move.s b/gas/testsuite/gas/bfin/move.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/move.s
rename to gas/testsuite/gas/bfin/move.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/move2.d b/gas/testsuite/gas/bfin/move2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/move2.d
rename to gas/testsuite/gas/bfin/move2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/move2.s b/gas/testsuite/gas/bfin/move2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/move2.s
rename to gas/testsuite/gas/bfin/move2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel.d b/gas/testsuite/gas/bfin/parallel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel.d
rename to gas/testsuite/gas/bfin/parallel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel.s b/gas/testsuite/gas/bfin/parallel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel.s
rename to gas/testsuite/gas/bfin/parallel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel2.d b/gas/testsuite/gas/bfin/parallel2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel2.d
rename to gas/testsuite/gas/bfin/parallel2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel2.s b/gas/testsuite/gas/bfin/parallel2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel2.s
rename to gas/testsuite/gas/bfin/parallel2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel3.d b/gas/testsuite/gas/bfin/parallel3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel3.d
rename to gas/testsuite/gas/bfin/parallel3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel3.s b/gas/testsuite/gas/bfin/parallel3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel3.s
rename to gas/testsuite/gas/bfin/parallel3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel4.d b/gas/testsuite/gas/bfin/parallel4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel4.d
rename to gas/testsuite/gas/bfin/parallel4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel4.s b/gas/testsuite/gas/bfin/parallel4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel4.s
rename to gas/testsuite/gas/bfin/parallel4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel5.s b/gas/testsuite/gas/bfin/parallel5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel5.s
rename to gas/testsuite/gas/bfin/parallel5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel_illegal.d b/gas/testsuite/gas/bfin/parallel_illegal.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel_illegal.d
rename to gas/testsuite/gas/bfin/parallel_illegal.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel_illegal.s b/gas/testsuite/gas/bfin/parallel_illegal.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/parallel_illegal.s
rename to gas/testsuite/gas/bfin/parallel_illegal.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/pseudo.d b/gas/testsuite/gas/bfin/pseudo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/pseudo.d
rename to gas/testsuite/gas/bfin/pseudo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/pseudo.s b/gas/testsuite/gas/bfin/pseudo.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/pseudo.s
rename to gas/testsuite/gas/bfin/pseudo.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/reloc.d b/gas/testsuite/gas/bfin/reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/reloc.d
rename to gas/testsuite/gas/bfin/reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/reloc.s b/gas/testsuite/gas/bfin/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/reloc.s
rename to gas/testsuite/gas/bfin/reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/resource_conflict.l b/gas/testsuite/gas/bfin/resource_conflict.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/resource_conflict.l
rename to gas/testsuite/gas/bfin/resource_conflict.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/resource_conflict.s b/gas/testsuite/gas/bfin/resource_conflict.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/resource_conflict.s
rename to gas/testsuite/gas/bfin/resource_conflict.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/shift.d b/gas/testsuite/gas/bfin/shift.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/shift.d
rename to gas/testsuite/gas/bfin/shift.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/shift.s b/gas/testsuite/gas/bfin/shift.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/shift.s
rename to gas/testsuite/gas/bfin/shift.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/shift2.d b/gas/testsuite/gas/bfin/shift2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/shift2.d
rename to gas/testsuite/gas/bfin/shift2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/shift2.s b/gas/testsuite/gas/bfin/shift2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/shift2.s
rename to gas/testsuite/gas/bfin/shift2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/stack.d b/gas/testsuite/gas/bfin/stack.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/stack.d
rename to gas/testsuite/gas/bfin/stack.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/stack.s b/gas/testsuite/gas/bfin/stack.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/stack.s
rename to gas/testsuite/gas/bfin/stack.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/stack2.d b/gas/testsuite/gas/bfin/stack2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/stack2.d
rename to gas/testsuite/gas/bfin/stack2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/stack2.s b/gas/testsuite/gas/bfin/stack2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/stack2.s
rename to gas/testsuite/gas/bfin/stack2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/store.d b/gas/testsuite/gas/bfin/store.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/store.d
rename to gas/testsuite/gas/bfin/store.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/store.s b/gas/testsuite/gas/bfin/store.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/store.s
rename to gas/testsuite/gas/bfin/store.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/vector.d b/gas/testsuite/gas/bfin/vector.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/vector.d
rename to gas/testsuite/gas/bfin/vector.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/vector.s b/gas/testsuite/gas/bfin/vector.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/vector.s
rename to gas/testsuite/gas/bfin/vector.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/vector2.d b/gas/testsuite/gas/bfin/vector2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/vector2.d
rename to gas/testsuite/gas/bfin/vector2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/vector2.s b/gas/testsuite/gas/bfin/vector2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/vector2.s
rename to gas/testsuite/gas/bfin/vector2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/video.d b/gas/testsuite/gas/bfin/video.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/video.d
rename to gas/testsuite/gas/bfin/video.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/video.s b/gas/testsuite/gas/bfin/video.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/video.s
rename to gas/testsuite/gas/bfin/video.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/video2.d b/gas/testsuite/gas/bfin/video2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/video2.d
rename to gas/testsuite/gas/bfin/video2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/bfin/video2.s b/gas/testsuite/gas/bfin/video2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/bfin/video2.s
rename to gas/testsuite/gas/bfin/video2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-1.d b/gas/testsuite/gas/cfi/cfi-alpha-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-1.d
rename to gas/testsuite/gas/cfi/cfi-alpha-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-1.s b/gas/testsuite/gas/cfi/cfi-alpha-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-1.s
rename to gas/testsuite/gas/cfi/cfi-alpha-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-2.d b/gas/testsuite/gas/cfi/cfi-alpha-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-2.d
rename to gas/testsuite/gas/cfi/cfi-alpha-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-2.s b/gas/testsuite/gas/cfi/cfi-alpha-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-2.s
rename to gas/testsuite/gas/cfi/cfi-alpha-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-3.d b/gas/testsuite/gas/cfi/cfi-alpha-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-3.d
rename to gas/testsuite/gas/cfi/cfi-alpha-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-3.s b/gas/testsuite/gas/cfi/cfi-alpha-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-alpha-3.s
rename to gas/testsuite/gas/cfi/cfi-alpha-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-arm-1.d b/gas/testsuite/gas/cfi/cfi-arm-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-arm-1.d
rename to gas/testsuite/gas/cfi/cfi-arm-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-arm-1.s b/gas/testsuite/gas/cfi/cfi-arm-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-arm-1.s
rename to gas/testsuite/gas/cfi/cfi-arm-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-1.d b/gas/testsuite/gas/cfi/cfi-common-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-1.d
rename to gas/testsuite/gas/cfi/cfi-common-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-1.s b/gas/testsuite/gas/cfi/cfi-common-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-1.s
rename to gas/testsuite/gas/cfi/cfi-common-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-2.d b/gas/testsuite/gas/cfi/cfi-common-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-2.d
rename to gas/testsuite/gas/cfi/cfi-common-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-2.s b/gas/testsuite/gas/cfi/cfi-common-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-2.s
rename to gas/testsuite/gas/cfi/cfi-common-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-3.d b/gas/testsuite/gas/cfi/cfi-common-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-3.d
rename to gas/testsuite/gas/cfi/cfi-common-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-3.s b/gas/testsuite/gas/cfi/cfi-common-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-3.s
rename to gas/testsuite/gas/cfi/cfi-common-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-4.d b/gas/testsuite/gas/cfi/cfi-common-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-4.d
rename to gas/testsuite/gas/cfi/cfi-common-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-4.s b/gas/testsuite/gas/cfi/cfi-common-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-4.s
rename to gas/testsuite/gas/cfi/cfi-common-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-5.d b/gas/testsuite/gas/cfi/cfi-common-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-5.d
rename to gas/testsuite/gas/cfi/cfi-common-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-5.s b/gas/testsuite/gas/cfi/cfi-common-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-5.s
rename to gas/testsuite/gas/cfi/cfi-common-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-6.d b/gas/testsuite/gas/cfi/cfi-common-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-6.d
rename to gas/testsuite/gas/cfi/cfi-common-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-6.s b/gas/testsuite/gas/cfi/cfi-common-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-6.s
rename to gas/testsuite/gas/cfi/cfi-common-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-7.d b/gas/testsuite/gas/cfi/cfi-common-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-7.d
rename to gas/testsuite/gas/cfi/cfi-common-7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-7.s b/gas/testsuite/gas/cfi/cfi-common-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-common-7.s
rename to gas/testsuite/gas/cfi/cfi-common-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-diag-1.l b/gas/testsuite/gas/cfi/cfi-diag-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-diag-1.l
rename to gas/testsuite/gas/cfi/cfi-diag-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-diag-1.s b/gas/testsuite/gas/cfi/cfi-diag-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-diag-1.s
rename to gas/testsuite/gas/cfi/cfi-diag-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-hppa-1.d b/gas/testsuite/gas/cfi/cfi-hppa-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-hppa-1.d
rename to gas/testsuite/gas/cfi/cfi-hppa-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-hppa-1.s b/gas/testsuite/gas/cfi/cfi-hppa-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-hppa-1.s
rename to gas/testsuite/gas/cfi/cfi-hppa-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386-2.d b/gas/testsuite/gas/cfi/cfi-i386-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386-2.d
rename to gas/testsuite/gas/cfi/cfi-i386-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386-2.s b/gas/testsuite/gas/cfi/cfi-i386-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386-2.s
rename to gas/testsuite/gas/cfi/cfi-i386-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386.d b/gas/testsuite/gas/cfi/cfi-i386.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386.d
rename to gas/testsuite/gas/cfi/cfi-i386.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386.s b/gas/testsuite/gas/cfi/cfi-i386.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-i386.s
rename to gas/testsuite/gas/cfi/cfi-i386.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-m68k.d b/gas/testsuite/gas/cfi/cfi-m68k.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-m68k.d
rename to gas/testsuite/gas/cfi/cfi-m68k.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-m68k.s b/gas/testsuite/gas/cfi/cfi-m68k.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-m68k.s
rename to gas/testsuite/gas/cfi/cfi-m68k.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-mips-1.d b/gas/testsuite/gas/cfi/cfi-mips-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-mips-1.d
rename to gas/testsuite/gas/cfi/cfi-mips-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-mips-1.s b/gas/testsuite/gas/cfi/cfi-mips-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-mips-1.s
rename to gas/testsuite/gas/cfi/cfi-mips-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-ppc-1.d b/gas/testsuite/gas/cfi/cfi-ppc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-ppc-1.d
rename to gas/testsuite/gas/cfi/cfi-ppc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-ppc-1.s b/gas/testsuite/gas/cfi/cfi-ppc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-ppc-1.s
rename to gas/testsuite/gas/cfi/cfi-ppc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390-1.d b/gas/testsuite/gas/cfi/cfi-s390-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390-1.d
rename to gas/testsuite/gas/cfi/cfi-s390-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390-1.s b/gas/testsuite/gas/cfi/cfi-s390-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390-1.s
rename to gas/testsuite/gas/cfi/cfi-s390-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390x-1.d b/gas/testsuite/gas/cfi/cfi-s390x-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390x-1.d
rename to gas/testsuite/gas/cfi/cfi-s390x-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390x-1.s b/gas/testsuite/gas/cfi/cfi-s390x-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-s390x-1.s
rename to gas/testsuite/gas/cfi/cfi-s390x-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sh-1.d b/gas/testsuite/gas/cfi/cfi-sh-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sh-1.d
rename to gas/testsuite/gas/cfi/cfi-sh-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sh-1.s b/gas/testsuite/gas/cfi/cfi-sh-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sh-1.s
rename to gas/testsuite/gas/cfi/cfi-sh-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc-1.d b/gas/testsuite/gas/cfi/cfi-sparc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc-1.d
rename to gas/testsuite/gas/cfi/cfi-sparc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc-1.s b/gas/testsuite/gas/cfi/cfi-sparc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc-1.s
rename to gas/testsuite/gas/cfi/cfi-sparc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc64-1.d b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc64-1.d
rename to gas/testsuite/gas/cfi/cfi-sparc64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc64-1.s b/gas/testsuite/gas/cfi/cfi-sparc64-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-sparc64-1.s
rename to gas/testsuite/gas/cfi/cfi-sparc64-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-x86_64.d
rename to gas/testsuite/gas/cfi/cfi-x86_64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-x86_64.s b/gas/testsuite/gas/cfi/cfi-x86_64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi-x86_64.s
rename to gas/testsuite/gas/cfi/cfi-x86_64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/cfi.exp
rename to gas/testsuite/gas/cfi/cfi.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/reloc-pe-i386.d b/gas/testsuite/gas/cfi/reloc-pe-i386.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/reloc-pe-i386.d
rename to gas/testsuite/gas/cfi/reloc-pe-i386.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cfi/reloc-pe-i386.s b/gas/testsuite/gas/cfi/reloc-pe-i386.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cfi/reloc-pe-i386.s
rename to gas/testsuite/gas/cfi/reloc-pe-i386.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/add_test.d b/gas/testsuite/gas/cr16/add_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/add_test.d
rename to gas/testsuite/gas/cr16/add_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/add_test.s b/gas/testsuite/gas/cr16/add_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/add_test.s
rename to gas/testsuite/gas/cr16/add_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/and_test.d b/gas/testsuite/gas/cr16/and_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/and_test.d
rename to gas/testsuite/gas/cr16/and_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/and_test.s b/gas/testsuite/gas/cr16/and_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/and_test.s
rename to gas/testsuite/gas/cr16/and_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/ash_test.d b/gas/testsuite/gas/cr16/ash_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/ash_test.d
rename to gas/testsuite/gas/cr16/ash_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/ash_test.s b/gas/testsuite/gas/cr16/ash_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/ash_test.s
rename to gas/testsuite/gas/cr16/ash_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/bal_test.d b/gas/testsuite/gas/cr16/bal_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/bal_test.d
rename to gas/testsuite/gas/cr16/bal_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/bal_test.s b/gas/testsuite/gas/cr16/bal_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/bal_test.s
rename to gas/testsuite/gas/cr16/bal_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/bcc_test.d b/gas/testsuite/gas/cr16/bcc_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/bcc_test.d
rename to gas/testsuite/gas/cr16/bcc_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/bcc_test.s b/gas/testsuite/gas/cr16/bcc_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/bcc_test.s
rename to gas/testsuite/gas/cr16/bcc_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/beq0_test.d b/gas/testsuite/gas/cr16/beq0_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/beq0_test.d
rename to gas/testsuite/gas/cr16/beq0_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/beq0_test.s b/gas/testsuite/gas/cr16/beq0_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/beq0_test.s
rename to gas/testsuite/gas/cr16/beq0_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitb_test.d b/gas/testsuite/gas/cr16/cbitb_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitb_test.d
rename to gas/testsuite/gas/cr16/cbitb_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitb_test.s b/gas/testsuite/gas/cr16/cbitb_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitb_test.s
rename to gas/testsuite/gas/cr16/cbitb_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitw_test.d b/gas/testsuite/gas/cr16/cbitw_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitw_test.d
rename to gas/testsuite/gas/cr16/cbitw_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitw_test.s b/gas/testsuite/gas/cr16/cbitw_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cbitw_test.s
rename to gas/testsuite/gas/cr16/cbitw_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cinv_test.d b/gas/testsuite/gas/cr16/cinv_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cinv_test.d
rename to gas/testsuite/gas/cr16/cinv_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cinv_test.s b/gas/testsuite/gas/cr16/cinv_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cinv_test.s
rename to gas/testsuite/gas/cr16/cinv_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cmp_test.d b/gas/testsuite/gas/cr16/cmp_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cmp_test.d
rename to gas/testsuite/gas/cr16/cmp_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cmp_test.s b/gas/testsuite/gas/cr16/cmp_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cmp_test.s
rename to gas/testsuite/gas/cr16/cmp_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/cr16.exp b/gas/testsuite/gas/cr16/cr16.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/cr16.exp
rename to gas/testsuite/gas/cr16/cr16.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/excp_test.d b/gas/testsuite/gas/cr16/excp_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/excp_test.d
rename to gas/testsuite/gas/cr16/excp_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/excp_test.s b/gas/testsuite/gas/cr16/excp_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/excp_test.s
rename to gas/testsuite/gas/cr16/excp_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/jal_test.d b/gas/testsuite/gas/cr16/jal_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/jal_test.d
rename to gas/testsuite/gas/cr16/jal_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/jal_test.s b/gas/testsuite/gas/cr16/jal_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/jal_test.s
rename to gas/testsuite/gas/cr16/jal_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/jcc_test.d b/gas/testsuite/gas/cr16/jcc_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/jcc_test.d
rename to gas/testsuite/gas/cr16/jcc_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/jcc_test.s b/gas/testsuite/gas/cr16/jcc_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/jcc_test.s
rename to gas/testsuite/gas/cr16/jcc_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadb_test.d b/gas/testsuite/gas/cr16/loadb_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadb_test.d
rename to gas/testsuite/gas/cr16/loadb_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadb_test.s b/gas/testsuite/gas/cr16/loadb_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadb_test.s
rename to gas/testsuite/gas/cr16/loadb_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadd_test.d b/gas/testsuite/gas/cr16/loadd_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadd_test.d
rename to gas/testsuite/gas/cr16/loadd_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadd_test.s b/gas/testsuite/gas/cr16/loadd_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadd_test.s
rename to gas/testsuite/gas/cr16/loadd_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadm_test.d b/gas/testsuite/gas/cr16/loadm_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadm_test.d
rename to gas/testsuite/gas/cr16/loadm_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadm_test.s b/gas/testsuite/gas/cr16/loadm_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadm_test.s
rename to gas/testsuite/gas/cr16/loadm_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadw_test.d b/gas/testsuite/gas/cr16/loadw_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadw_test.d
rename to gas/testsuite/gas/cr16/loadw_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/loadw_test.s b/gas/testsuite/gas/cr16/loadw_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/loadw_test.s
rename to gas/testsuite/gas/cr16/loadw_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/lpsp_test.d b/gas/testsuite/gas/cr16/lpsp_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/lpsp_test.d
rename to gas/testsuite/gas/cr16/lpsp_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/lpsp_test.s b/gas/testsuite/gas/cr16/lpsp_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/lpsp_test.s
rename to gas/testsuite/gas/cr16/lpsp_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/lsh_test.d b/gas/testsuite/gas/cr16/lsh_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/lsh_test.d
rename to gas/testsuite/gas/cr16/lsh_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/lsh_test.s b/gas/testsuite/gas/cr16/lsh_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/lsh_test.s
rename to gas/testsuite/gas/cr16/lsh_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/mov_test.d b/gas/testsuite/gas/cr16/mov_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/mov_test.d
rename to gas/testsuite/gas/cr16/mov_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/mov_test.s b/gas/testsuite/gas/cr16/mov_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/mov_test.s
rename to gas/testsuite/gas/cr16/mov_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/mul_test.d b/gas/testsuite/gas/cr16/mul_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/mul_test.d
rename to gas/testsuite/gas/cr16/mul_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/mul_test.s b/gas/testsuite/gas/cr16/mul_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/mul_test.s
rename to gas/testsuite/gas/cr16/mul_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/or_test.d b/gas/testsuite/gas/cr16/or_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/or_test.d
rename to gas/testsuite/gas/cr16/or_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/or_test.s b/gas/testsuite/gas/cr16/or_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/or_test.s
rename to gas/testsuite/gas/cr16/or_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/pic.exp b/gas/testsuite/gas/cr16/pic.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/pic.exp
rename to gas/testsuite/gas/cr16/pic.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/pic1.d b/gas/testsuite/gas/cr16/pic1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/pic1.d
rename to gas/testsuite/gas/cr16/pic1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/pic1.s b/gas/testsuite/gas/cr16/pic1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/pic1.s
rename to gas/testsuite/gas/cr16/pic1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/pic2.d b/gas/testsuite/gas/cr16/pic2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/pic2.d
rename to gas/testsuite/gas/cr16/pic2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/pic2.s b/gas/testsuite/gas/cr16/pic2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/pic2.s
rename to gas/testsuite/gas/cr16/pic2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/pop_test.d b/gas/testsuite/gas/cr16/pop_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/pop_test.d
rename to gas/testsuite/gas/cr16/pop_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/pop_test.s b/gas/testsuite/gas/cr16/pop_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/pop_test.s
rename to gas/testsuite/gas/cr16/pop_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/popret_test.d b/gas/testsuite/gas/cr16/popret_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/popret_test.d
rename to gas/testsuite/gas/cr16/popret_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/popret_test.s b/gas/testsuite/gas/cr16/popret_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/popret_test.s
rename to gas/testsuite/gas/cr16/popret_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/push_test.d b/gas/testsuite/gas/cr16/push_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/push_test.d
rename to gas/testsuite/gas/cr16/push_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/push_test.s b/gas/testsuite/gas/cr16/push_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/push_test.s
rename to gas/testsuite/gas/cr16/push_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitb_test.d b/gas/testsuite/gas/cr16/sbitb_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitb_test.d
rename to gas/testsuite/gas/cr16/sbitb_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitb_test.s b/gas/testsuite/gas/cr16/sbitb_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitb_test.s
rename to gas/testsuite/gas/cr16/sbitb_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitw_test.d b/gas/testsuite/gas/cr16/sbitw_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitw_test.d
rename to gas/testsuite/gas/cr16/sbitw_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitw_test.s b/gas/testsuite/gas/cr16/sbitw_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/sbitw_test.s
rename to gas/testsuite/gas/cr16/sbitw_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/scc_test.d b/gas/testsuite/gas/cr16/scc_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/scc_test.d
rename to gas/testsuite/gas/cr16/scc_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/scc_test.s b/gas/testsuite/gas/cr16/scc_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/scc_test.s
rename to gas/testsuite/gas/cr16/scc_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/storb_test.d b/gas/testsuite/gas/cr16/storb_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/storb_test.d
rename to gas/testsuite/gas/cr16/storb_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/storb_test.s b/gas/testsuite/gas/cr16/storb_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/storb_test.s
rename to gas/testsuite/gas/cr16/storb_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/stord_test.d b/gas/testsuite/gas/cr16/stord_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/stord_test.d
rename to gas/testsuite/gas/cr16/stord_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/stord_test.s b/gas/testsuite/gas/cr16/stord_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/stord_test.s
rename to gas/testsuite/gas/cr16/stord_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/storm_test.d b/gas/testsuite/gas/cr16/storm_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/storm_test.d
rename to gas/testsuite/gas/cr16/storm_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/storm_test.s b/gas/testsuite/gas/cr16/storm_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/storm_test.s
rename to gas/testsuite/gas/cr16/storm_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/storw_test.d b/gas/testsuite/gas/cr16/storw_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/storw_test.d
rename to gas/testsuite/gas/cr16/storw_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/storw_test.s b/gas/testsuite/gas/cr16/storw_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/storw_test.s
rename to gas/testsuite/gas/cr16/storw_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/sub_test.d b/gas/testsuite/gas/cr16/sub_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/sub_test.d
rename to gas/testsuite/gas/cr16/sub_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/sub_test.s b/gas/testsuite/gas/cr16/sub_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/sub_test.s
rename to gas/testsuite/gas/cr16/sub_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/tbit_test.d b/gas/testsuite/gas/cr16/tbit_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/tbit_test.d
rename to gas/testsuite/gas/cr16/tbit_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/tbit_test.s b/gas/testsuite/gas/cr16/tbit_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/tbit_test.s
rename to gas/testsuite/gas/cr16/tbit_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitb_test.d b/gas/testsuite/gas/cr16/tbitb_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitb_test.d
rename to gas/testsuite/gas/cr16/tbitb_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitb_test.s b/gas/testsuite/gas/cr16/tbitb_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitb_test.s
rename to gas/testsuite/gas/cr16/tbitb_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitw_test.d b/gas/testsuite/gas/cr16/tbitw_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitw_test.d
rename to gas/testsuite/gas/cr16/tbitw_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitw_test.s b/gas/testsuite/gas/cr16/tbitw_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/tbitw_test.s
rename to gas/testsuite/gas/cr16/tbitw_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/xor_test.d b/gas/testsuite/gas/cr16/xor_test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/xor_test.d
rename to gas/testsuite/gas/cr16/xor_test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cr16/xor_test.s b/gas/testsuite/gas/cr16/xor_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cr16/xor_test.s
rename to gas/testsuite/gas/cr16/xor_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/abs32-1.s b/gas/testsuite/gas/cris/abs32-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/abs32-1.s
rename to gas/testsuite/gas/cris/abs32-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/addi.d b/gas/testsuite/gas/cris/addi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/addi.d
rename to gas/testsuite/gas/cris/addi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/addi.s b/gas/testsuite/gas/cris/addi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/addi.s
rename to gas/testsuite/gas/cris/addi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-1.s b/gas/testsuite/gas/cris/arch-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-1.s
rename to gas/testsuite/gas/cris/arch-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-2.s b/gas/testsuite/gas/cris/arch-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-2.s
rename to gas/testsuite/gas/cris/arch-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-3.s b/gas/testsuite/gas/cris/arch-err-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-3.s
rename to gas/testsuite/gas/cris/arch-err-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-4.s b/gas/testsuite/gas/cris/arch-err-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-4.s
rename to gas/testsuite/gas/cris/arch-err-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-5.s b/gas/testsuite/gas/cris/arch-err-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/arch-err-5.s
rename to gas/testsuite/gas/cris/arch-err-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/binop-cmpmove.d b/gas/testsuite/gas/cris/binop-cmpmove.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/binop-cmpmove.d
rename to gas/testsuite/gas/cris/binop-cmpmove.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/binop-cmpmovx.d b/gas/testsuite/gas/cris/binop-cmpmovx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/binop-cmpmovx.d
rename to gas/testsuite/gas/cris/binop-cmpmovx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/binop-extx.d b/gas/testsuite/gas/cris/binop-extx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/binop-extx.d
rename to gas/testsuite/gas/cris/binop-extx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/binop-segref.s b/gas/testsuite/gas/cris/binop-segref.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/binop-segref.s
rename to gas/testsuite/gas/cris/binop-segref.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/binop.d b/gas/testsuite/gas/cris/binop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/binop.d
rename to gas/testsuite/gas/cris/binop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/binop.s b/gas/testsuite/gas/cris/binop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/binop.s
rename to gas/testsuite/gas/cris/binop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/bork.d b/gas/testsuite/gas/cris/bork.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/bork.d
rename to gas/testsuite/gas/cris/bork.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/bork.s b/gas/testsuite/gas/cris/bork.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/bork.s
rename to gas/testsuite/gas/cris/bork.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/bound-err-1.s b/gas/testsuite/gas/cris/bound-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/bound-err-1.s
rename to gas/testsuite/gas/cris/bound-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/branch-warn-1.s b/gas/testsuite/gas/cris/branch-warn-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/branch-warn-1.s
rename to gas/testsuite/gas/cris/branch-warn-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/branch-warn-2.s b/gas/testsuite/gas/cris/branch-warn-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/branch-warn-2.s
rename to gas/testsuite/gas/cris/branch-warn-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/branch-warn-3.s b/gas/testsuite/gas/cris/branch-warn-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/branch-warn-3.s
rename to gas/testsuite/gas/cris/branch-warn-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/branch.d b/gas/testsuite/gas/cris/branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/branch.d
rename to gas/testsuite/gas/cris/branch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/branch.s b/gas/testsuite/gas/cris/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/branch.s
rename to gas/testsuite/gas/cris/branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/break.d b/gas/testsuite/gas/cris/break.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/break.d
rename to gas/testsuite/gas/cris/break.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/break.s b/gas/testsuite/gas/cris/break.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/break.s
rename to gas/testsuite/gas/cris/break.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-1.d b/gas/testsuite/gas/cris/brokw-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-1.d
rename to gas/testsuite/gas/cris/brokw-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-1.s b/gas/testsuite/gas/cris/brokw-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-1.s
rename to gas/testsuite/gas/cris/brokw-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-2.d b/gas/testsuite/gas/cris/brokw-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-2.d
rename to gas/testsuite/gas/cris/brokw-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-2.s b/gas/testsuite/gas/cris/brokw-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-2.s
rename to gas/testsuite/gas/cris/brokw-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-3.d b/gas/testsuite/gas/cris/brokw-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-3.d
rename to gas/testsuite/gas/cris/brokw-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-3.s b/gas/testsuite/gas/cris/brokw-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-3.s
rename to gas/testsuite/gas/cris/brokw-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-3b.s b/gas/testsuite/gas/cris/brokw-3b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/brokw-3b.s
rename to gas/testsuite/gas/cris/brokw-3b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/bwtest-err-1.s b/gas/testsuite/gas/cris/bwtest-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/bwtest-err-1.s
rename to gas/testsuite/gas/cris/bwtest-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/ccr.d b/gas/testsuite/gas/cris/ccr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/ccr.d
rename to gas/testsuite/gas/cris/ccr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/ccr.s b/gas/testsuite/gas/cris/ccr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/ccr.s
rename to gas/testsuite/gas/cris/ccr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/clear.d b/gas/testsuite/gas/cris/clear.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/clear.d
rename to gas/testsuite/gas/cris/clear.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/continue.d b/gas/testsuite/gas/cris/continue.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/continue.d
rename to gas/testsuite/gas/cris/continue.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/continue.s b/gas/testsuite/gas/cris/continue.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/continue.s
rename to gas/testsuite/gas/cris/continue.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/cris.exp b/gas/testsuite/gas/cris/cris.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/cris.exp
rename to gas/testsuite/gas/cris/cris.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/diffexp-ovwr.d b/gas/testsuite/gas/cris/diffexp-ovwr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/diffexp-ovwr.d
rename to gas/testsuite/gas/cris/diffexp-ovwr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/diffexp-ovwr.s b/gas/testsuite/gas/cris/diffexp-ovwr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/diffexp-ovwr.s
rename to gas/testsuite/gas/cris/diffexp-ovwr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/fragtest.d b/gas/testsuite/gas/cris/fragtest.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/fragtest.d
rename to gas/testsuite/gas/cris/fragtest.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/fragtest.s b/gas/testsuite/gas/cris/fragtest.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/fragtest.s
rename to gas/testsuite/gas/cris/fragtest.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/jump-type.d b/gas/testsuite/gas/cris/jump-type.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/jump-type.d
rename to gas/testsuite/gas/cris/jump-type.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/labfloat.d b/gas/testsuite/gas/cris/labfloat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/labfloat.d
rename to gas/testsuite/gas/cris/labfloat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/labfloat.s b/gas/testsuite/gas/cris/labfloat.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/labfloat.s
rename to gas/testsuite/gas/cris/labfloat.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/macroat.d b/gas/testsuite/gas/cris/macroat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/macroat.d
rename to gas/testsuite/gas/cris/macroat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/macroat.s b/gas/testsuite/gas/cris/macroat.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/macroat.s
rename to gas/testsuite/gas/cris/macroat.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/march-err-1.s b/gas/testsuite/gas/cris/march-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/march-err-1.s
rename to gas/testsuite/gas/cris/march-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/march-err-2.s b/gas/testsuite/gas/cris/march-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/march-err-2.s
rename to gas/testsuite/gas/cris/march-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/movem-to-reg.d b/gas/testsuite/gas/cris/movem-to-reg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/movem-to-reg.d
rename to gas/testsuite/gas/cris/movem-to-reg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/mulbug-err-1.s b/gas/testsuite/gas/cris/mulbug-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/mulbug-err-1.s
rename to gas/testsuite/gas/cris/mulbug-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/nosep.d b/gas/testsuite/gas/cris/nosep.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/nosep.d
rename to gas/testsuite/gas/cris/nosep.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/nosep.s b/gas/testsuite/gas/cris/nosep.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/nosep.s
rename to gas/testsuite/gas/cris/nosep.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/oneop-type.d b/gas/testsuite/gas/cris/oneop-type.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/oneop-type.d
rename to gas/testsuite/gas/cris/oneop-type.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/operand-err-1.s b/gas/testsuite/gas/cris/operand-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/operand-err-1.s
rename to gas/testsuite/gas/cris/operand-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pic-err-1.s b/gas/testsuite/gas/cris/pic-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pic-err-1.s
rename to gas/testsuite/gas/cris/pic-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/prefix.d b/gas/testsuite/gas/cris/prefix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/prefix.d
rename to gas/testsuite/gas/cris/prefix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/prefix.s b/gas/testsuite/gas/cris/prefix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/prefix.s
rename to gas/testsuite/gas/cris/prefix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/push-err-1.s b/gas/testsuite/gas/cris/push-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/push-err-1.s
rename to gas/testsuite/gas/cris/push-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/push-err-2.s b/gas/testsuite/gas/cris/push-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/push-err-2.s
rename to gas/testsuite/gas/cris/push-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-byte-sreg.d b/gas/testsuite/gas/cris/pushpop-byte-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-byte-sreg.d
rename to gas/testsuite/gas/cris/pushpop-byte-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-dcr1-sreg.d b/gas/testsuite/gas/cris/pushpop-dcr1-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-dcr1-sreg.d
rename to gas/testsuite/gas/cris/pushpop-dcr1-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-dword-sreg.d b/gas/testsuite/gas/cris/pushpop-dword-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-dword-sreg.d
rename to gas/testsuite/gas/cris/pushpop-dword-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-word-sreg.d b/gas/testsuite/gas/cris/pushpop-word-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop-word-sreg.d
rename to gas/testsuite/gas/cris/pushpop-word-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop.d b/gas/testsuite/gas/cris/pushpop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop.d
rename to gas/testsuite/gas/cris/pushpop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop.s b/gas/testsuite/gas/cris/pushpop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pushpop.s
rename to gas/testsuite/gas/cris/pushpop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/pushpopv32.s b/gas/testsuite/gas/cris/pushpopv32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/pushpopv32.s
rename to gas/testsuite/gas/cris/pushpopv32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/quick-s6.d b/gas/testsuite/gas/cris/quick-s6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/quick-s6.d
rename to gas/testsuite/gas/cris/quick-s6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/quick-u5.d b/gas/testsuite/gas/cris/quick-u5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/quick-u5.d
rename to gas/testsuite/gas/cris/quick-u5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/quick-u6.d b/gas/testsuite/gas/cris/quick-u6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/quick-u6.d
rename to gas/testsuite/gas/cris/quick-u6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/quick.s b/gas/testsuite/gas/cris/quick.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/quick.s
rename to gas/testsuite/gas/cris/quick.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/range-err-1.s b/gas/testsuite/gas/cris/range-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/range-err-1.s
rename to gas/testsuite/gas/cris/range-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/range-err-2.s b/gas/testsuite/gas/cris/range-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/range-err-2.s
rename to gas/testsuite/gas/cris/range-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-abs32-1.d b/gas/testsuite/gas/cris/rd-abs32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-abs32-1.d
rename to gas/testsuite/gas/cris/rd-abs32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-abs32-2.d b/gas/testsuite/gas/cris/rd-abs32-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-abs32-2.d
rename to gas/testsuite/gas/cris/rd-abs32-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-arch-1.d b/gas/testsuite/gas/cris/rd-arch-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-arch-1.d
rename to gas/testsuite/gas/cris/rd-arch-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-arch-2.d b/gas/testsuite/gas/cris/rd-arch-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-arch-2.d
rename to gas/testsuite/gas/cris/rd-arch-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-arch-3.d b/gas/testsuite/gas/cris/rd-arch-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-arch-3.d
rename to gas/testsuite/gas/cris/rd-arch-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst-pic.d b/gas/testsuite/gas/cris/rd-bcnst-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst-pic.d
rename to gas/testsuite/gas/cris/rd-bcnst-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst.d b/gas/testsuite/gas/cris/rd-bcnst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst.d
rename to gas/testsuite/gas/cris/rd-bcnst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst.s b/gas/testsuite/gas/cris/rd-bcnst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst.s
rename to gas/testsuite/gas/cris/rd-bcnst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst2-pic.d b/gas/testsuite/gas/cris/rd-bcnst2-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst2-pic.d
rename to gas/testsuite/gas/cris/rd-bcnst2-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst2.d b/gas/testsuite/gas/cris/rd-bcnst2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst2.d
rename to gas/testsuite/gas/cris/rd-bcnst2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst2.s b/gas/testsuite/gas/cris/rd-bcnst2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bcnst2.s
rename to gas/testsuite/gas/cris/rd-bcnst2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw1b.d b/gas/testsuite/gas/cris/rd-bkw1b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw1b.d
rename to gas/testsuite/gas/cris/rd-bkw1b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw2b.d b/gas/testsuite/gas/cris/rd-bkw2b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw2b.d
rename to gas/testsuite/gas/cris/rd-bkw2b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw3b.d b/gas/testsuite/gas/cris/rd-bkw3b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw3b.d
rename to gas/testsuite/gas/cris/rd-bkw3b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw4.d b/gas/testsuite/gas/cris/rd-bkw4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw4.d
rename to gas/testsuite/gas/cris/rd-bkw4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw4.s b/gas/testsuite/gas/cris/rd-bkw4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw4.s
rename to gas/testsuite/gas/cris/rd-bkw4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw4v32.d b/gas/testsuite/gas/cris/rd-bkw4v32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw4v32.d
rename to gas/testsuite/gas/cris/rd-bkw4v32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5.d b/gas/testsuite/gas/cris/rd-bkw5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5.d
rename to gas/testsuite/gas/cris/rd-bkw5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5.s b/gas/testsuite/gas/cris/rd-bkw5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5.s
rename to gas/testsuite/gas/cris/rd-bkw5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5b.d b/gas/testsuite/gas/cris/rd-bkw5b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5b.d
rename to gas/testsuite/gas/cris/rd-bkw5b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5bpic.d b/gas/testsuite/gas/cris/rd-bkw5bpic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5bpic.d
rename to gas/testsuite/gas/cris/rd-bkw5bpic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5bv32.d b/gas/testsuite/gas/cris/rd-bkw5bv32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5bv32.d
rename to gas/testsuite/gas/cris/rd-bkw5bv32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5bv32pic.d b/gas/testsuite/gas/cris/rd-bkw5bv32pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5bv32pic.d
rename to gas/testsuite/gas/cris/rd-bkw5bv32pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5pic.d b/gas/testsuite/gas/cris/rd-bkw5pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5pic.d
rename to gas/testsuite/gas/cris/rd-bkw5pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5v32.d b/gas/testsuite/gas/cris/rd-bkw5v32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5v32.d
rename to gas/testsuite/gas/cris/rd-bkw5v32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5v32pic.d b/gas/testsuite/gas/cris/rd-bkw5v32pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bkw5v32pic.d
rename to gas/testsuite/gas/cris/rd-bkw5v32pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound1.d b/gas/testsuite/gas/cris/rd-bound1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound1.d
rename to gas/testsuite/gas/cris/rd-bound1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound1.s b/gas/testsuite/gas/cris/rd-bound1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound1.s
rename to gas/testsuite/gas/cris/rd-bound1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound2.d b/gas/testsuite/gas/cris/rd-bound2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound2.d
rename to gas/testsuite/gas/cris/rd-bound2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound3.d b/gas/testsuite/gas/cris/rd-bound3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound3.d
rename to gas/testsuite/gas/cris/rd-bound3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound4.d b/gas/testsuite/gas/cris/rd-bound4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-bound4.d
rename to gas/testsuite/gas/cris/rd-bound4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-branch-pic.d b/gas/testsuite/gas/cris/rd-branch-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-branch-pic.d
rename to gas/testsuite/gas/cris/rd-branch-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-break32.d b/gas/testsuite/gas/cris/rd-break32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-break32.d
rename to gas/testsuite/gas/cris/rd-break32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-brokw-pic-1.d b/gas/testsuite/gas/cris/rd-brokw-pic-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-brokw-pic-1.d
rename to gas/testsuite/gas/cris/rd-brokw-pic-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-brokw-pic-2.d b/gas/testsuite/gas/cris/rd-brokw-pic-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-brokw-pic-2.d
rename to gas/testsuite/gas/cris/rd-brokw-pic-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-brokw-pic-3.d b/gas/testsuite/gas/cris/rd-brokw-pic-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-brokw-pic-3.d
rename to gas/testsuite/gas/cris/rd-brokw-pic-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dtpoffd1.d b/gas/testsuite/gas/cris/rd-dtpoffd1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dtpoffd1.d
rename to gas/testsuite/gas/cris/rd-dtpoffd1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dtpoffd1.s b/gas/testsuite/gas/cris/rd-dtpoffd1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dtpoffd1.s
rename to gas/testsuite/gas/cris/rd-dtpoffd1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-1.d b/gas/testsuite/gas/cris/rd-dw2-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-1.d
rename to gas/testsuite/gas/cris/rd-dw2-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-10.d b/gas/testsuite/gas/cris/rd-dw2-10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-10.d
rename to gas/testsuite/gas/cris/rd-dw2-10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-11.d b/gas/testsuite/gas/cris/rd-dw2-11.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-11.d
rename to gas/testsuite/gas/cris/rd-dw2-11.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-12.d b/gas/testsuite/gas/cris/rd-dw2-12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-12.d
rename to gas/testsuite/gas/cris/rd-dw2-12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-13.d b/gas/testsuite/gas/cris/rd-dw2-13.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-13.d
rename to gas/testsuite/gas/cris/rd-dw2-13.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-14.d b/gas/testsuite/gas/cris/rd-dw2-14.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-14.d
rename to gas/testsuite/gas/cris/rd-dw2-14.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-15.d b/gas/testsuite/gas/cris/rd-dw2-15.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-15.d
rename to gas/testsuite/gas/cris/rd-dw2-15.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-2.d b/gas/testsuite/gas/cris/rd-dw2-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-2.d
rename to gas/testsuite/gas/cris/rd-dw2-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-3.d b/gas/testsuite/gas/cris/rd-dw2-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-3.d
rename to gas/testsuite/gas/cris/rd-dw2-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-4.d b/gas/testsuite/gas/cris/rd-dw2-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-4.d
rename to gas/testsuite/gas/cris/rd-dw2-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-5.d b/gas/testsuite/gas/cris/rd-dw2-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-5.d
rename to gas/testsuite/gas/cris/rd-dw2-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-6.d b/gas/testsuite/gas/cris/rd-dw2-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-6.d
rename to gas/testsuite/gas/cris/rd-dw2-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-7.d b/gas/testsuite/gas/cris/rd-dw2-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-7.d
rename to gas/testsuite/gas/cris/rd-dw2-7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-8.d b/gas/testsuite/gas/cris/rd-dw2-8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-8.d
rename to gas/testsuite/gas/cris/rd-dw2-8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-9.d b/gas/testsuite/gas/cris/rd-dw2-9.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-dw2-9.d
rename to gas/testsuite/gas/cris/rd-dw2-9.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-fragtest-pic.d b/gas/testsuite/gas/cris/rd-fragtest-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-fragtest-pic.d
rename to gas/testsuite/gas/cris/rd-fragtest-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-mulbug-1.d b/gas/testsuite/gas/cris/rd-mulbug-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-mulbug-1.d
rename to gas/testsuite/gas/cris/rd-mulbug-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcplus.d b/gas/testsuite/gas/cris/rd-pcplus.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcplus.d
rename to gas/testsuite/gas/cris/rd-pcplus.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcplus.s b/gas/testsuite/gas/cris/rd-pcplus.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcplus.s
rename to gas/testsuite/gas/cris/rd-pcplus.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel1.d b/gas/testsuite/gas/cris/rd-pcrel1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel1.d
rename to gas/testsuite/gas/cris/rd-pcrel1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel1.s b/gas/testsuite/gas/cris/rd-pcrel1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel1.s
rename to gas/testsuite/gas/cris/rd-pcrel1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel2.d b/gas/testsuite/gas/cris/rd-pcrel2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel2.d
rename to gas/testsuite/gas/cris/rd-pcrel2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel2.s b/gas/testsuite/gas/cris/rd-pcrel2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pcrel2.s
rename to gas/testsuite/gas/cris/rd-pcrel2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-1.d b/gas/testsuite/gas/cris/rd-pic-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-1.d
rename to gas/testsuite/gas/cris/rd-pic-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-1.s b/gas/testsuite/gas/cris/rd-pic-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-1.s
rename to gas/testsuite/gas/cris/rd-pic-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-2.d b/gas/testsuite/gas/cris/rd-pic-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-2.d
rename to gas/testsuite/gas/cris/rd-pic-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-2.s b/gas/testsuite/gas/cris/rd-pic-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-pic-2.s
rename to gas/testsuite/gas/cris/rd-pic-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-ppv1032.d b/gas/testsuite/gas/cris/rd-ppv1032.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-ppv1032.d
rename to gas/testsuite/gas/cris/rd-ppv1032.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-ppv32.d b/gas/testsuite/gas/cris/rd-ppv32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-ppv32.d
rename to gas/testsuite/gas/cris/rd-ppv32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-regprefix-1.d b/gas/testsuite/gas/cris/rd-regprefix-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-regprefix-1.d
rename to gas/testsuite/gas/cris/rd-regprefix-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-regprefix-1.s b/gas/testsuite/gas/cris/rd-regprefix-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-regprefix-1.s
rename to gas/testsuite/gas/cris/rd-regprefix-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-regprefix-1b.d b/gas/testsuite/gas/cris/rd-regprefix-1b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-regprefix-1b.d
rename to gas/testsuite/gas/cris/rd-regprefix-1b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-spr-1.d b/gas/testsuite/gas/cris/rd-spr-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-spr-1.d
rename to gas/testsuite/gas/cris/rd-spr-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-spr-1.s b/gas/testsuite/gas/cris/rd-spr-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-spr-1.s
rename to gas/testsuite/gas/cris/rd-spr-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-1.d b/gas/testsuite/gas/cris/rd-tls-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-1.d
rename to gas/testsuite/gas/cris/rd-tls-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-1.s b/gas/testsuite/gas/cris/rd-tls-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-1.s
rename to gas/testsuite/gas/cris/rd-tls-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-2.d b/gas/testsuite/gas/cris/rd-tls-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-2.d
rename to gas/testsuite/gas/cris/rd-tls-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-2.s b/gas/testsuite/gas/cris/rd-tls-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-tls-2.s
rename to gas/testsuite/gas/cris/rd-tls-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-usp-1.d b/gas/testsuite/gas/cris/rd-usp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-usp-1.d
rename to gas/testsuite/gas/cris/rd-usp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-usp-1b.d b/gas/testsuite/gas/cris/rd-usp-1b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-usp-1b.d
rename to gas/testsuite/gas/cris/rd-usp-1b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v10_32o-1.d b/gas/testsuite/gas/cris/rd-v10_32o-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v10_32o-1.d
rename to gas/testsuite/gas/cris/rd-v10_32o-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v10_32o-2.d b/gas/testsuite/gas/cris/rd-v10_32o-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v10_32o-2.d
rename to gas/testsuite/gas/cris/rd-v10_32o-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v10_32o-2.s b/gas/testsuite/gas/cris/rd-v10_32o-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v10_32o-2.s
rename to gas/testsuite/gas/cris/rd-v10_32o-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b1.d b/gas/testsuite/gas/cris/rd-v32-b1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b1.d
rename to gas/testsuite/gas/cris/rd-v32-b1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b1.s b/gas/testsuite/gas/cris/rd-v32-b1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b1.s
rename to gas/testsuite/gas/cris/rd-v32-b1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b2.d b/gas/testsuite/gas/cris/rd-v32-b2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b2.d
rename to gas/testsuite/gas/cris/rd-v32-b2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b2.s b/gas/testsuite/gas/cris/rd-v32-b2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b2.s
rename to gas/testsuite/gas/cris/rd-v32-b2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b3.d b/gas/testsuite/gas/cris/rd-v32-b3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b3.d
rename to gas/testsuite/gas/cris/rd-v32-b3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b3.s b/gas/testsuite/gas/cris/rd-v32-b3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-b3.s
rename to gas/testsuite/gas/cris/rd-v32-b3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-f1.d b/gas/testsuite/gas/cris/rd-v32-f1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-f1.d
rename to gas/testsuite/gas/cris/rd-v32-f1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-f1.s b/gas/testsuite/gas/cris/rd-v32-f1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-f1.s
rename to gas/testsuite/gas/cris/rd-v32-f1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-i1.d b/gas/testsuite/gas/cris/rd-v32-i1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-i1.d
rename to gas/testsuite/gas/cris/rd-v32-i1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-i1.s b/gas/testsuite/gas/cris/rd-v32-i1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-i1.s
rename to gas/testsuite/gas/cris/rd-v32-i1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l1.d b/gas/testsuite/gas/cris/rd-v32-l1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l1.d
rename to gas/testsuite/gas/cris/rd-v32-l1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l1.s b/gas/testsuite/gas/cris/rd-v32-l1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l1.s
rename to gas/testsuite/gas/cris/rd-v32-l1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l3.d b/gas/testsuite/gas/cris/rd-v32-l3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l3.d
rename to gas/testsuite/gas/cris/rd-v32-l3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l3.s b/gas/testsuite/gas/cris/rd-v32-l3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l3.s
rename to gas/testsuite/gas/cris/rd-v32-l3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l4.d b/gas/testsuite/gas/cris/rd-v32-l4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l4.d
rename to gas/testsuite/gas/cris/rd-v32-l4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l4.s b/gas/testsuite/gas/cris/rd-v32-l4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32-l4.s
rename to gas/testsuite/gas/cris/rd-v32-l4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32o-1.d b/gas/testsuite/gas/cris/rd-v32o-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32o-1.d
rename to gas/testsuite/gas/cris/rd-v32o-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-1.d b/gas/testsuite/gas/cris/rd-v32s-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-1.d
rename to gas/testsuite/gas/cris/rd-v32s-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-2.d b/gas/testsuite/gas/cris/rd-v32s-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-2.d
rename to gas/testsuite/gas/cris/rd-v32s-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-2.s b/gas/testsuite/gas/cris/rd-v32s-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-2.s
rename to gas/testsuite/gas/cris/rd-v32s-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-3.d b/gas/testsuite/gas/cris/rd-v32s-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-3.d
rename to gas/testsuite/gas/cris/rd-v32s-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-3.s b/gas/testsuite/gas/cris/rd-v32s-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-3.s
rename to gas/testsuite/gas/cris/rd-v32s-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-4.d b/gas/testsuite/gas/cris/rd-v32s-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-4.d
rename to gas/testsuite/gas/cris/rd-v32s-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-4.s b/gas/testsuite/gas/cris/rd-v32s-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-v32s-4.s
rename to gas/testsuite/gas/cris/rd-v32s-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/rd-vao-1.d b/gas/testsuite/gas/cris/rd-vao-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/rd-vao-1.d
rename to gas/testsuite/gas/cris/rd-vao-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/reg-to-mem.d b/gas/testsuite/gas/cris/reg-to-mem.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/reg-to-mem.d
rename to gas/testsuite/gas/cris/reg-to-mem.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/regprefix-err-1.s b/gas/testsuite/gas/cris/regprefix-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/regprefix-err-1.s
rename to gas/testsuite/gas/cris/regprefix-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/regreg.d b/gas/testsuite/gas/cris/regreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/regreg.d
rename to gas/testsuite/gas/cris/regreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/regreg.s b/gas/testsuite/gas/cris/regreg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/regreg.s
rename to gas/testsuite/gas/cris/regreg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/return.d b/gas/testsuite/gas/cris/return.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/return.d
rename to gas/testsuite/gas/cris/return.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/return.s b/gas/testsuite/gas/cris/return.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/return.s
rename to gas/testsuite/gas/cris/return.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/scc.d b/gas/testsuite/gas/cris/scc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/scc.d
rename to gas/testsuite/gas/cris/scc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/scc.s b/gas/testsuite/gas/cris/scc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/scc.s
rename to gas/testsuite/gas/cris/scc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/sep-err-1.s b/gas/testsuite/gas/cris/sep-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/sep-err-1.s
rename to gas/testsuite/gas/cris/sep-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/sep-err-2.s b/gas/testsuite/gas/cris/sep-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/sep-err-2.s
rename to gas/testsuite/gas/cris/sep-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/sep-err-3.s b/gas/testsuite/gas/cris/sep-err-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/sep-err-3.s
rename to gas/testsuite/gas/cris/sep-err-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/separator.d b/gas/testsuite/gas/cris/separator.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/separator.d
rename to gas/testsuite/gas/cris/separator.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/separator.s b/gas/testsuite/gas/cris/separator.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/separator.s
rename to gas/testsuite/gas/cris/separator.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/shexpr-1.d b/gas/testsuite/gas/cris/shexpr-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/shexpr-1.d
rename to gas/testsuite/gas/cris/shexpr-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/shexpr-1.s b/gas/testsuite/gas/cris/shexpr-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/shexpr-1.s
rename to gas/testsuite/gas/cris/shexpr-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/sreg-to-x.d b/gas/testsuite/gas/cris/sreg-to-x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/sreg-to-x.d
rename to gas/testsuite/gas/cris/sreg-to-x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/string-1.d b/gas/testsuite/gas/cris/string-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/string-1.d
rename to gas/testsuite/gas/cris/string-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/string-1.s b/gas/testsuite/gas/cris/string-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/string-1.s
rename to gas/testsuite/gas/cris/string-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/string-2.d b/gas/testsuite/gas/cris/string-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/string-2.d
rename to gas/testsuite/gas/cris/string-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/string-2.s b/gas/testsuite/gas/cris/string-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/string-2.s
rename to gas/testsuite/gas/cris/string-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/test.d b/gas/testsuite/gas/cris/test.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/test.d
rename to gas/testsuite/gas/cris/test.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/tls-err-1.s b/gas/testsuite/gas/cris/tls-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/tls-err-1.s
rename to gas/testsuite/gas/cris/tls-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/tls-err-2.s b/gas/testsuite/gas/cris/tls-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/tls-err-2.s
rename to gas/testsuite/gas/cris/tls-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/tls-err-3.s b/gas/testsuite/gas/cris/tls-err-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/tls-err-3.s
rename to gas/testsuite/gas/cris/tls-err-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/unimplemented.d b/gas/testsuite/gas/cris/unimplemented.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/unimplemented.d
rename to gas/testsuite/gas/cris/unimplemented.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/unimplemented.s b/gas/testsuite/gas/cris/unimplemented.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/unimplemented.s
rename to gas/testsuite/gas/cris/unimplemented.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/unop-mem.d b/gas/testsuite/gas/cris/unop-mem.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/unop-mem.d
rename to gas/testsuite/gas/cris/unop-mem.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/unop.s b/gas/testsuite/gas/cris/unop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/unop.s
rename to gas/testsuite/gas/cris/unop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/us-err-1.s b/gas/testsuite/gas/cris/us-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/us-err-1.s
rename to gas/testsuite/gas/cris/us-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/us-err-2.s b/gas/testsuite/gas/cris/us-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/us-err-2.s
rename to gas/testsuite/gas/cris/us-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/us-err-3.s b/gas/testsuite/gas/cris/us-err-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/us-err-3.s
rename to gas/testsuite/gas/cris/us-err-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-1.s b/gas/testsuite/gas/cris/v32-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-1.s
rename to gas/testsuite/gas/cris/v32-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-10.s b/gas/testsuite/gas/cris/v32-err-10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-10.s
rename to gas/testsuite/gas/cris/v32-err-10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-11.s b/gas/testsuite/gas/cris/v32-err-11.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-11.s
rename to gas/testsuite/gas/cris/v32-err-11.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-2.s b/gas/testsuite/gas/cris/v32-err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-2.s
rename to gas/testsuite/gas/cris/v32-err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-3.s b/gas/testsuite/gas/cris/v32-err-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-3.s
rename to gas/testsuite/gas/cris/v32-err-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-4.s b/gas/testsuite/gas/cris/v32-err-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-4.s
rename to gas/testsuite/gas/cris/v32-err-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-5.s b/gas/testsuite/gas/cris/v32-err-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-5.s
rename to gas/testsuite/gas/cris/v32-err-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-6.s b/gas/testsuite/gas/cris/v32-err-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-6.s
rename to gas/testsuite/gas/cris/v32-err-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-7.s b/gas/testsuite/gas/cris/v32-err-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-7.s
rename to gas/testsuite/gas/cris/v32-err-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-8.s b/gas/testsuite/gas/cris/v32-err-8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-8.s
rename to gas/testsuite/gas/cris/v32-err-8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-9.s b/gas/testsuite/gas/cris/v32-err-9.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/v32-err-9.s
rename to gas/testsuite/gas/cris/v32-err-9.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-byte-sreg.d b/gas/testsuite/gas/cris/x-to-byte-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-byte-sreg.d
rename to gas/testsuite/gas/cris/x-to-byte-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-dcr1-sreg.d b/gas/testsuite/gas/cris/x-to-dcr1-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-dcr1-sreg.d
rename to gas/testsuite/gas/cris/x-to-dcr1-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-dword-sreg.d b/gas/testsuite/gas/cris/x-to-dword-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-dword-sreg.d
rename to gas/testsuite/gas/cris/x-to-dword-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-word-sreg.d b/gas/testsuite/gas/cris/x-to-word-sreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/cris/x-to-word-sreg.d
rename to gas/testsuite/gas/cris/x-to-word-sreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/allinsn.exp b/gas/testsuite/gas/crx/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/allinsn.exp
rename to gas/testsuite/gas/crx/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/arith_insn.d b/gas/testsuite/gas/crx/arith_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/arith_insn.d
rename to gas/testsuite/gas/crx/arith_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/arith_insn.s b/gas/testsuite/gas/crx/arith_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/arith_insn.s
rename to gas/testsuite/gas/crx/arith_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/beq_insn.d b/gas/testsuite/gas/crx/beq_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/beq_insn.d
rename to gas/testsuite/gas/crx/beq_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/beq_insn.s b/gas/testsuite/gas/crx/beq_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/beq_insn.s
rename to gas/testsuite/gas/crx/beq_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/bit_insn.d b/gas/testsuite/gas/crx/bit_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/bit_insn.d
rename to gas/testsuite/gas/crx/bit_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/bit_insn.s b/gas/testsuite/gas/crx/bit_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/bit_insn.s
rename to gas/testsuite/gas/crx/bit_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/br_insn.d b/gas/testsuite/gas/crx/br_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/br_insn.d
rename to gas/testsuite/gas/crx/br_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/br_insn.s b/gas/testsuite/gas/crx/br_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/br_insn.s
rename to gas/testsuite/gas/crx/br_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/cmov_insn.d b/gas/testsuite/gas/crx/cmov_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/cmov_insn.d
rename to gas/testsuite/gas/crx/cmov_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/cmov_insn.s b/gas/testsuite/gas/crx/cmov_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/cmov_insn.s
rename to gas/testsuite/gas/crx/cmov_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/cmpbr_insn.d b/gas/testsuite/gas/crx/cmpbr_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/cmpbr_insn.d
rename to gas/testsuite/gas/crx/cmpbr_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/cmpbr_insn.s b/gas/testsuite/gas/crx/cmpbr_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/cmpbr_insn.s
rename to gas/testsuite/gas/crx/cmpbr_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/cop_insn.d b/gas/testsuite/gas/crx/cop_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/cop_insn.d
rename to gas/testsuite/gas/crx/cop_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/cop_insn.s b/gas/testsuite/gas/crx/cop_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/cop_insn.s
rename to gas/testsuite/gas/crx/cop_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/gas-segfault.d b/gas/testsuite/gas/crx/gas-segfault.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/gas-segfault.d
rename to gas/testsuite/gas/crx/gas-segfault.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/gas-segfault.s b/gas/testsuite/gas/crx/gas-segfault.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/gas-segfault.s
rename to gas/testsuite/gas/crx/gas-segfault.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/jscond_insn.d b/gas/testsuite/gas/crx/jscond_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/jscond_insn.d
rename to gas/testsuite/gas/crx/jscond_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/jscond_insn.s b/gas/testsuite/gas/crx/jscond_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/jscond_insn.s
rename to gas/testsuite/gas/crx/jscond_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/list_insn.d b/gas/testsuite/gas/crx/list_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/list_insn.d
rename to gas/testsuite/gas/crx/list_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/list_insn.s b/gas/testsuite/gas/crx/list_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/list_insn.s
rename to gas/testsuite/gas/crx/list_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/load_stor_insn.d b/gas/testsuite/gas/crx/load_stor_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/load_stor_insn.d
rename to gas/testsuite/gas/crx/load_stor_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/load_stor_insn.s b/gas/testsuite/gas/crx/load_stor_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/load_stor_insn.s
rename to gas/testsuite/gas/crx/load_stor_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/misc_insn.d b/gas/testsuite/gas/crx/misc_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/misc_insn.d
rename to gas/testsuite/gas/crx/misc_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/misc_insn.s b/gas/testsuite/gas/crx/misc_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/misc_insn.s
rename to gas/testsuite/gas/crx/misc_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/no_op_insn.d b/gas/testsuite/gas/crx/no_op_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/no_op_insn.d
rename to gas/testsuite/gas/crx/no_op_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/no_op_insn.s b/gas/testsuite/gas/crx/no_op_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/no_op_insn.s
rename to gas/testsuite/gas/crx/no_op_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/shift_insn.d b/gas/testsuite/gas/crx/shift_insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/shift_insn.d
rename to gas/testsuite/gas/crx/shift_insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/crx/shift_insn.s b/gas/testsuite/gas/crx/shift_insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/crx/shift_insn.s
rename to gas/testsuite/gas/crx/shift_insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-001.d b/gas/testsuite/gas/d10v/address-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-001.d
rename to gas/testsuite/gas/d10v/address-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-001.s b/gas/testsuite/gas/d10v/address-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-001.s
rename to gas/testsuite/gas/d10v/address-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-002.l b/gas/testsuite/gas/d10v/address-002.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-002.l
rename to gas/testsuite/gas/d10v/address-002.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-002.s b/gas/testsuite/gas/d10v/address-002.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-002.s
rename to gas/testsuite/gas/d10v/address-002.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-003.l b/gas/testsuite/gas/d10v/address-003.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-003.l
rename to gas/testsuite/gas/d10v/address-003.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-003.s b/gas/testsuite/gas/d10v/address-003.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-003.s
rename to gas/testsuite/gas/d10v/address-003.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-004.l b/gas/testsuite/gas/d10v/address-004.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-004.l
rename to gas/testsuite/gas/d10v/address-004.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-004.s b/gas/testsuite/gas/d10v/address-004.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-004.s
rename to gas/testsuite/gas/d10v/address-004.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-005.l b/gas/testsuite/gas/d10v/address-005.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-005.l
rename to gas/testsuite/gas/d10v/address-005.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-005.s b/gas/testsuite/gas/d10v/address-005.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-005.s
rename to gas/testsuite/gas/d10v/address-005.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-006.l b/gas/testsuite/gas/d10v/address-006.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-006.l
rename to gas/testsuite/gas/d10v/address-006.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-006.s b/gas/testsuite/gas/d10v/address-006.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-006.s
rename to gas/testsuite/gas/d10v/address-006.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-007.l b/gas/testsuite/gas/d10v/address-007.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-007.l
rename to gas/testsuite/gas/d10v/address-007.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-007.s b/gas/testsuite/gas/d10v/address-007.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-007.s
rename to gas/testsuite/gas/d10v/address-007.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-008.l b/gas/testsuite/gas/d10v/address-008.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-008.l
rename to gas/testsuite/gas/d10v/address-008.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-008.s b/gas/testsuite/gas/d10v/address-008.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-008.s
rename to gas/testsuite/gas/d10v/address-008.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-009.l b/gas/testsuite/gas/d10v/address-009.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-009.l
rename to gas/testsuite/gas/d10v/address-009.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-009.s b/gas/testsuite/gas/d10v/address-009.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-009.s
rename to gas/testsuite/gas/d10v/address-009.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-010.l b/gas/testsuite/gas/d10v/address-010.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-010.l
rename to gas/testsuite/gas/d10v/address-010.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-010.s b/gas/testsuite/gas/d10v/address-010.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-010.s
rename to gas/testsuite/gas/d10v/address-010.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-011.l b/gas/testsuite/gas/d10v/address-011.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-011.l
rename to gas/testsuite/gas/d10v/address-011.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-011.s b/gas/testsuite/gas/d10v/address-011.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-011.s
rename to gas/testsuite/gas/d10v/address-011.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-012.l b/gas/testsuite/gas/d10v/address-012.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-012.l
rename to gas/testsuite/gas/d10v/address-012.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-012.s b/gas/testsuite/gas/d10v/address-012.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-012.s
rename to gas/testsuite/gas/d10v/address-012.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-013.l b/gas/testsuite/gas/d10v/address-013.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-013.l
rename to gas/testsuite/gas/d10v/address-013.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-013.s b/gas/testsuite/gas/d10v/address-013.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-013.s
rename to gas/testsuite/gas/d10v/address-013.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-014.l b/gas/testsuite/gas/d10v/address-014.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-014.l
rename to gas/testsuite/gas/d10v/address-014.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-014.s b/gas/testsuite/gas/d10v/address-014.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-014.s
rename to gas/testsuite/gas/d10v/address-014.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-015.l b/gas/testsuite/gas/d10v/address-015.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-015.l
rename to gas/testsuite/gas/d10v/address-015.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-015.s b/gas/testsuite/gas/d10v/address-015.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-015.s
rename to gas/testsuite/gas/d10v/address-015.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-016.l b/gas/testsuite/gas/d10v/address-016.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-016.l
rename to gas/testsuite/gas/d10v/address-016.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-016.s b/gas/testsuite/gas/d10v/address-016.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-016.s
rename to gas/testsuite/gas/d10v/address-016.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-017.l b/gas/testsuite/gas/d10v/address-017.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-017.l
rename to gas/testsuite/gas/d10v/address-017.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-017.s b/gas/testsuite/gas/d10v/address-017.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-017.s
rename to gas/testsuite/gas/d10v/address-017.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-018.l b/gas/testsuite/gas/d10v/address-018.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-018.l
rename to gas/testsuite/gas/d10v/address-018.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-018.s b/gas/testsuite/gas/d10v/address-018.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-018.s
rename to gas/testsuite/gas/d10v/address-018.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-019.l b/gas/testsuite/gas/d10v/address-019.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-019.l
rename to gas/testsuite/gas/d10v/address-019.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-019.s b/gas/testsuite/gas/d10v/address-019.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-019.s
rename to gas/testsuite/gas/d10v/address-019.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-020.l b/gas/testsuite/gas/d10v/address-020.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-020.l
rename to gas/testsuite/gas/d10v/address-020.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-020.s b/gas/testsuite/gas/d10v/address-020.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-020.s
rename to gas/testsuite/gas/d10v/address-020.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-021.l b/gas/testsuite/gas/d10v/address-021.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-021.l
rename to gas/testsuite/gas/d10v/address-021.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-021.s b/gas/testsuite/gas/d10v/address-021.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-021.s
rename to gas/testsuite/gas/d10v/address-021.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-022.l b/gas/testsuite/gas/d10v/address-022.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-022.l
rename to gas/testsuite/gas/d10v/address-022.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-022.s b/gas/testsuite/gas/d10v/address-022.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-022.s
rename to gas/testsuite/gas/d10v/address-022.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-023.l b/gas/testsuite/gas/d10v/address-023.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-023.l
rename to gas/testsuite/gas/d10v/address-023.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-023.s b/gas/testsuite/gas/d10v/address-023.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-023.s
rename to gas/testsuite/gas/d10v/address-023.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-024.l b/gas/testsuite/gas/d10v/address-024.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-024.l
rename to gas/testsuite/gas/d10v/address-024.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-024.s b/gas/testsuite/gas/d10v/address-024.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-024.s
rename to gas/testsuite/gas/d10v/address-024.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-025.l b/gas/testsuite/gas/d10v/address-025.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-025.l
rename to gas/testsuite/gas/d10v/address-025.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-025.s b/gas/testsuite/gas/d10v/address-025.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-025.s
rename to gas/testsuite/gas/d10v/address-025.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-026.l b/gas/testsuite/gas/d10v/address-026.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-026.l
rename to gas/testsuite/gas/d10v/address-026.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-026.s b/gas/testsuite/gas/d10v/address-026.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-026.s
rename to gas/testsuite/gas/d10v/address-026.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-027.l b/gas/testsuite/gas/d10v/address-027.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-027.l
rename to gas/testsuite/gas/d10v/address-027.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-027.s b/gas/testsuite/gas/d10v/address-027.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-027.s
rename to gas/testsuite/gas/d10v/address-027.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-028.l b/gas/testsuite/gas/d10v/address-028.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-028.l
rename to gas/testsuite/gas/d10v/address-028.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-028.s b/gas/testsuite/gas/d10v/address-028.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-028.s
rename to gas/testsuite/gas/d10v/address-028.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-029.l b/gas/testsuite/gas/d10v/address-029.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-029.l
rename to gas/testsuite/gas/d10v/address-029.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-029.s b/gas/testsuite/gas/d10v/address-029.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-029.s
rename to gas/testsuite/gas/d10v/address-029.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-030.l b/gas/testsuite/gas/d10v/address-030.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-030.l
rename to gas/testsuite/gas/d10v/address-030.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-030.s b/gas/testsuite/gas/d10v/address-030.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-030.s
rename to gas/testsuite/gas/d10v/address-030.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-031.l b/gas/testsuite/gas/d10v/address-031.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-031.l
rename to gas/testsuite/gas/d10v/address-031.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-031.s b/gas/testsuite/gas/d10v/address-031.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-031.s
rename to gas/testsuite/gas/d10v/address-031.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-032.l b/gas/testsuite/gas/d10v/address-032.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-032.l
rename to gas/testsuite/gas/d10v/address-032.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-032.s b/gas/testsuite/gas/d10v/address-032.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-032.s
rename to gas/testsuite/gas/d10v/address-032.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-033.l b/gas/testsuite/gas/d10v/address-033.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-033.l
rename to gas/testsuite/gas/d10v/address-033.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-033.s b/gas/testsuite/gas/d10v/address-033.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-033.s
rename to gas/testsuite/gas/d10v/address-033.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-034.l b/gas/testsuite/gas/d10v/address-034.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-034.l
rename to gas/testsuite/gas/d10v/address-034.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-034.s b/gas/testsuite/gas/d10v/address-034.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-034.s
rename to gas/testsuite/gas/d10v/address-034.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-035.l b/gas/testsuite/gas/d10v/address-035.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-035.l
rename to gas/testsuite/gas/d10v/address-035.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-035.s b/gas/testsuite/gas/d10v/address-035.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-035.s
rename to gas/testsuite/gas/d10v/address-035.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-036.l b/gas/testsuite/gas/d10v/address-036.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-036.l
rename to gas/testsuite/gas/d10v/address-036.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-036.s b/gas/testsuite/gas/d10v/address-036.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-036.s
rename to gas/testsuite/gas/d10v/address-036.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-037.l b/gas/testsuite/gas/d10v/address-037.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-037.l
rename to gas/testsuite/gas/d10v/address-037.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-037.s b/gas/testsuite/gas/d10v/address-037.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-037.s
rename to gas/testsuite/gas/d10v/address-037.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-038.l b/gas/testsuite/gas/d10v/address-038.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-038.l
rename to gas/testsuite/gas/d10v/address-038.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-038.s b/gas/testsuite/gas/d10v/address-038.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-038.s
rename to gas/testsuite/gas/d10v/address-038.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-039.l b/gas/testsuite/gas/d10v/address-039.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-039.l
rename to gas/testsuite/gas/d10v/address-039.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-039.s b/gas/testsuite/gas/d10v/address-039.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-039.s
rename to gas/testsuite/gas/d10v/address-039.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-040.l b/gas/testsuite/gas/d10v/address-040.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-040.l
rename to gas/testsuite/gas/d10v/address-040.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-040.s b/gas/testsuite/gas/d10v/address-040.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-040.s
rename to gas/testsuite/gas/d10v/address-040.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-041.l b/gas/testsuite/gas/d10v/address-041.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-041.l
rename to gas/testsuite/gas/d10v/address-041.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/address-041.s b/gas/testsuite/gas/d10v/address-041.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/address-041.s
rename to gas/testsuite/gas/d10v/address-041.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/control-001.d b/gas/testsuite/gas/d10v/control-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/control-001.d
rename to gas/testsuite/gas/d10v/control-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/control-001.s b/gas/testsuite/gas/d10v/control-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/control-001.s
rename to gas/testsuite/gas/d10v/control-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/d10v.exp b/gas/testsuite/gas/d10v/d10v.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/d10v.exp
rename to gas/testsuite/gas/d10v/d10v.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/error-001.d b/gas/testsuite/gas/d10v/error-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/error-001.d
rename to gas/testsuite/gas/d10v/error-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/error-001.s b/gas/testsuite/gas/d10v/error-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/error-001.s
rename to gas/testsuite/gas/d10v/error-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/error-002.d b/gas/testsuite/gas/d10v/error-002.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/error-002.d
rename to gas/testsuite/gas/d10v/error-002.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/error-002.s b/gas/testsuite/gas/d10v/error-002.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/error-002.s
rename to gas/testsuite/gas/d10v/error-002.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-001.d b/gas/testsuite/gas/d10v/immediate-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-001.d
rename to gas/testsuite/gas/d10v/immediate-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-001.s b/gas/testsuite/gas/d10v/immediate-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-001.s
rename to gas/testsuite/gas/d10v/immediate-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-002.d b/gas/testsuite/gas/d10v/immediate-002.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-002.d
rename to gas/testsuite/gas/d10v/immediate-002.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-002.s b/gas/testsuite/gas/d10v/immediate-002.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-002.s
rename to gas/testsuite/gas/d10v/immediate-002.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-003.d b/gas/testsuite/gas/d10v/immediate-003.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-003.d
rename to gas/testsuite/gas/d10v/immediate-003.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-003.s b/gas/testsuite/gas/d10v/immediate-003.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-003.s
rename to gas/testsuite/gas/d10v/immediate-003.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-004.d b/gas/testsuite/gas/d10v/immediate-004.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-004.d
rename to gas/testsuite/gas/d10v/immediate-004.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-004.s b/gas/testsuite/gas/d10v/immediate-004.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-004.s
rename to gas/testsuite/gas/d10v/immediate-004.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-005.d b/gas/testsuite/gas/d10v/immediate-005.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-005.d
rename to gas/testsuite/gas/d10v/immediate-005.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-005.s b/gas/testsuite/gas/d10v/immediate-005.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-005.s
rename to gas/testsuite/gas/d10v/immediate-005.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-006.d b/gas/testsuite/gas/d10v/immediate-006.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-006.d
rename to gas/testsuite/gas/d10v/immediate-006.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-006.s b/gas/testsuite/gas/d10v/immediate-006.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-006.s
rename to gas/testsuite/gas/d10v/immediate-006.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-007.d b/gas/testsuite/gas/d10v/immediate-007.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-007.d
rename to gas/testsuite/gas/d10v/immediate-007.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-007.s b/gas/testsuite/gas/d10v/immediate-007.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/immediate-007.s
rename to gas/testsuite/gas/d10v/immediate-007.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/inst.d b/gas/testsuite/gas/d10v/inst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/inst.d
rename to gas/testsuite/gas/d10v/inst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/inst.s b/gas/testsuite/gas/d10v/inst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/inst.s
rename to gas/testsuite/gas/d10v/inst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-001.d b/gas/testsuite/gas/d10v/instruction_packing-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-001.d
rename to gas/testsuite/gas/d10v/instruction_packing-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-001.s b/gas/testsuite/gas/d10v/instruction_packing-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-001.s
rename to gas/testsuite/gas/d10v/instruction_packing-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-002.d b/gas/testsuite/gas/d10v/instruction_packing-002.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-002.d
rename to gas/testsuite/gas/d10v/instruction_packing-002.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-002.s b/gas/testsuite/gas/d10v/instruction_packing-002.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-002.s
rename to gas/testsuite/gas/d10v/instruction_packing-002.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-003.d b/gas/testsuite/gas/d10v/instruction_packing-003.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-003.d
rename to gas/testsuite/gas/d10v/instruction_packing-003.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-003.s b/gas/testsuite/gas/d10v/instruction_packing-003.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-003.s
rename to gas/testsuite/gas/d10v/instruction_packing-003.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-004.d b/gas/testsuite/gas/d10v/instruction_packing-004.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-004.d
rename to gas/testsuite/gas/d10v/instruction_packing-004.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-004.s b/gas/testsuite/gas/d10v/instruction_packing-004.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-004.s
rename to gas/testsuite/gas/d10v/instruction_packing-004.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-005.d b/gas/testsuite/gas/d10v/instruction_packing-005.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-005.d
rename to gas/testsuite/gas/d10v/instruction_packing-005.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-005.s b/gas/testsuite/gas/d10v/instruction_packing-005.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-005.s
rename to gas/testsuite/gas/d10v/instruction_packing-005.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-006.d b/gas/testsuite/gas/d10v/instruction_packing-006.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-006.d
rename to gas/testsuite/gas/d10v/instruction_packing-006.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-006.s b/gas/testsuite/gas/d10v/instruction_packing-006.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-006.s
rename to gas/testsuite/gas/d10v/instruction_packing-006.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-007.d b/gas/testsuite/gas/d10v/instruction_packing-007.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-007.d
rename to gas/testsuite/gas/d10v/instruction_packing-007.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-007.s b/gas/testsuite/gas/d10v/instruction_packing-007.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-007.s
rename to gas/testsuite/gas/d10v/instruction_packing-007.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-008.d b/gas/testsuite/gas/d10v/instruction_packing-008.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-008.d
rename to gas/testsuite/gas/d10v/instruction_packing-008.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-009.d b/gas/testsuite/gas/d10v/instruction_packing-009.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-009.d
rename to gas/testsuite/gas/d10v/instruction_packing-009.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-010.d b/gas/testsuite/gas/d10v/instruction_packing-010.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing-010.d
rename to gas/testsuite/gas/d10v/instruction_packing-010.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing.d b/gas/testsuite/gas/d10v/instruction_packing.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing.d
rename to gas/testsuite/gas/d10v/instruction_packing.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing.s b/gas/testsuite/gas/d10v/instruction_packing.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/instruction_packing.s
rename to gas/testsuite/gas/d10v/instruction_packing.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/label-001.d b/gas/testsuite/gas/d10v/label-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/label-001.d
rename to gas/testsuite/gas/d10v/label-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/label-001.s b/gas/testsuite/gas/d10v/label-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/label-001.s
rename to gas/testsuite/gas/d10v/label-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-001.d b/gas/testsuite/gas/d10v/warning-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-001.d
rename to gas/testsuite/gas/d10v/warning-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-001.s b/gas/testsuite/gas/d10v/warning-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-001.s
rename to gas/testsuite/gas/d10v/warning-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-002.d b/gas/testsuite/gas/d10v/warning-002.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-002.d
rename to gas/testsuite/gas/d10v/warning-002.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-002.s b/gas/testsuite/gas/d10v/warning-002.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-002.s
rename to gas/testsuite/gas/d10v/warning-002.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-003.d b/gas/testsuite/gas/d10v/warning-003.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-003.d
rename to gas/testsuite/gas/d10v/warning-003.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-003.s b/gas/testsuite/gas/d10v/warning-003.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-003.s
rename to gas/testsuite/gas/d10v/warning-003.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-004.d b/gas/testsuite/gas/d10v/warning-004.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-004.d
rename to gas/testsuite/gas/d10v/warning-004.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-004.s b/gas/testsuite/gas/d10v/warning-004.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-004.s
rename to gas/testsuite/gas/d10v/warning-004.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-005.d b/gas/testsuite/gas/d10v/warning-005.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-005.d
rename to gas/testsuite/gas/d10v/warning-005.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-005.s b/gas/testsuite/gas/d10v/warning-005.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-005.s
rename to gas/testsuite/gas/d10v/warning-005.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-006.d b/gas/testsuite/gas/d10v/warning-006.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-006.d
rename to gas/testsuite/gas/d10v/warning-006.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-006.s b/gas/testsuite/gas/d10v/warning-006.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-006.s
rename to gas/testsuite/gas/d10v/warning-006.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-007.d b/gas/testsuite/gas/d10v/warning-007.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-007.d
rename to gas/testsuite/gas/d10v/warning-007.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-007.s b/gas/testsuite/gas/d10v/warning-007.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-007.s
rename to gas/testsuite/gas/d10v/warning-007.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-008.d b/gas/testsuite/gas/d10v/warning-008.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-008.d
rename to gas/testsuite/gas/d10v/warning-008.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-008.s b/gas/testsuite/gas/d10v/warning-008.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-008.s
rename to gas/testsuite/gas/d10v/warning-008.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-009.d b/gas/testsuite/gas/d10v/warning-009.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-009.d
rename to gas/testsuite/gas/d10v/warning-009.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-009.s b/gas/testsuite/gas/d10v/warning-009.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-009.s
rename to gas/testsuite/gas/d10v/warning-009.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-010.d b/gas/testsuite/gas/d10v/warning-010.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-010.d
rename to gas/testsuite/gas/d10v/warning-010.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-010.s b/gas/testsuite/gas/d10v/warning-010.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-010.s
rename to gas/testsuite/gas/d10v/warning-010.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-011.d b/gas/testsuite/gas/d10v/warning-011.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-011.d
rename to gas/testsuite/gas/d10v/warning-011.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-011.s b/gas/testsuite/gas/d10v/warning-011.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-011.s
rename to gas/testsuite/gas/d10v/warning-011.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-012.d b/gas/testsuite/gas/d10v/warning-012.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-012.d
rename to gas/testsuite/gas/d10v/warning-012.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-012.s b/gas/testsuite/gas/d10v/warning-012.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-012.s
rename to gas/testsuite/gas/d10v/warning-012.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-013.d b/gas/testsuite/gas/d10v/warning-013.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-013.d
rename to gas/testsuite/gas/d10v/warning-013.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-013.s b/gas/testsuite/gas/d10v/warning-013.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-013.s
rename to gas/testsuite/gas/d10v/warning-013.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-014.d b/gas/testsuite/gas/d10v/warning-014.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-014.d
rename to gas/testsuite/gas/d10v/warning-014.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-014.s b/gas/testsuite/gas/d10v/warning-014.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-014.s
rename to gas/testsuite/gas/d10v/warning-014.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-015.d b/gas/testsuite/gas/d10v/warning-015.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-015.d
rename to gas/testsuite/gas/d10v/warning-015.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-016.d b/gas/testsuite/gas/d10v/warning-016.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-016.d
rename to gas/testsuite/gas/d10v/warning-016.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-016.s b/gas/testsuite/gas/d10v/warning-016.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-016.s
rename to gas/testsuite/gas/d10v/warning-016.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-017.d b/gas/testsuite/gas/d10v/warning-017.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-017.d
rename to gas/testsuite/gas/d10v/warning-017.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-017.s b/gas/testsuite/gas/d10v/warning-017.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-017.s
rename to gas/testsuite/gas/d10v/warning-017.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-018.d b/gas/testsuite/gas/d10v/warning-018.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-018.d
rename to gas/testsuite/gas/d10v/warning-018.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-018.s b/gas/testsuite/gas/d10v/warning-018.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-018.s
rename to gas/testsuite/gas/d10v/warning-018.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-019.d b/gas/testsuite/gas/d10v/warning-019.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-019.d
rename to gas/testsuite/gas/d10v/warning-019.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-019.s b/gas/testsuite/gas/d10v/warning-019.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d10v/warning-019.s
rename to gas/testsuite/gas/d10v/warning-019.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/align.d b/gas/testsuite/gas/d30v/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/align.d
rename to gas/testsuite/gas/d30v/align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/align.s b/gas/testsuite/gas/d30v/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/align.s
rename to gas/testsuite/gas/d30v/align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/array.d b/gas/testsuite/gas/d30v/array.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/array.d
rename to gas/testsuite/gas/d30v/array.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/array.s b/gas/testsuite/gas/d30v/array.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/array.s
rename to gas/testsuite/gas/d30v/array.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/bittest.d b/gas/testsuite/gas/d30v/bittest.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/bittest.d
rename to gas/testsuite/gas/d30v/bittest.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/bittest.l b/gas/testsuite/gas/d30v/bittest.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/bittest.l
rename to gas/testsuite/gas/d30v/bittest.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/bittest.s b/gas/testsuite/gas/d30v/bittest.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/bittest.s
rename to gas/testsuite/gas/d30v/bittest.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/d30.exp b/gas/testsuite/gas/d30v/d30.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/d30.exp
rename to gas/testsuite/gas/d30v/d30.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/guard-debug.d b/gas/testsuite/gas/d30v/guard-debug.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/guard-debug.d
rename to gas/testsuite/gas/d30v/guard-debug.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/guard-debug.s b/gas/testsuite/gas/d30v/guard-debug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/guard-debug.s
rename to gas/testsuite/gas/d30v/guard-debug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/guard.d b/gas/testsuite/gas/d30v/guard.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/guard.d
rename to gas/testsuite/gas/d30v/guard.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/guard.s b/gas/testsuite/gas/d30v/guard.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/guard.s
rename to gas/testsuite/gas/d30v/guard.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/inst.d b/gas/testsuite/gas/d30v/inst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/inst.d
rename to gas/testsuite/gas/d30v/inst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/inst.s b/gas/testsuite/gas/d30v/inst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/inst.s
rename to gas/testsuite/gas/d30v/inst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/label-debug.d b/gas/testsuite/gas/d30v/label-debug.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/label-debug.d
rename to gas/testsuite/gas/d30v/label-debug.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/label-debug.s b/gas/testsuite/gas/d30v/label-debug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/label-debug.s
rename to gas/testsuite/gas/d30v/label-debug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/label.d b/gas/testsuite/gas/d30v/label.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/label.d
rename to gas/testsuite/gas/d30v/label.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/label.s b/gas/testsuite/gas/d30v/label.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/label.s
rename to gas/testsuite/gas/d30v/label.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/mul.d b/gas/testsuite/gas/d30v/mul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/mul.d
rename to gas/testsuite/gas/d30v/mul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/mul.s b/gas/testsuite/gas/d30v/mul.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/mul.s
rename to gas/testsuite/gas/d30v/mul.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/opt.d b/gas/testsuite/gas/d30v/opt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/opt.d
rename to gas/testsuite/gas/d30v/opt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/opt.s b/gas/testsuite/gas/d30v/opt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/opt.s
rename to gas/testsuite/gas/d30v/opt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/reloc.d b/gas/testsuite/gas/d30v/reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/reloc.d
rename to gas/testsuite/gas/d30v/reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/reloc.s b/gas/testsuite/gas/d30v/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/reloc.s
rename to gas/testsuite/gas/d30v/reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/serial.l b/gas/testsuite/gas/d30v/serial.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/serial.l
rename to gas/testsuite/gas/d30v/serial.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/serial.s b/gas/testsuite/gas/d30v/serial.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/serial.s
rename to gas/testsuite/gas/d30v/serial.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2.l b/gas/testsuite/gas/d30v/serial2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2.l
rename to gas/testsuite/gas/d30v/serial2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2.s b/gas/testsuite/gas/d30v/serial2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2.s
rename to gas/testsuite/gas/d30v/serial2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2O.l b/gas/testsuite/gas/d30v/serial2O.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2O.l
rename to gas/testsuite/gas/d30v/serial2O.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2O.s b/gas/testsuite/gas/d30v/serial2O.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/serial2O.s
rename to gas/testsuite/gas/d30v/serial2O.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/warn_oddreg.l b/gas/testsuite/gas/d30v/warn_oddreg.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/warn_oddreg.l
rename to gas/testsuite/gas/d30v/warn_oddreg.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/d30v/warn_oddreg.s b/gas/testsuite/gas/d30v/warn_oddreg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/d30v/warn_oddreg.s
rename to gas/testsuite/gas/d30v/warn_oddreg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/alltests.exp b/gas/testsuite/gas/dlx/alltests.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/alltests.exp
rename to gas/testsuite/gas/dlx/alltests.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/branch.d b/gas/testsuite/gas/dlx/branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/branch.d
rename to gas/testsuite/gas/dlx/branch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/branch.s b/gas/testsuite/gas/dlx/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/branch.s
rename to gas/testsuite/gas/dlx/branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/itype.d b/gas/testsuite/gas/dlx/itype.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/itype.d
rename to gas/testsuite/gas/dlx/itype.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/itype.s b/gas/testsuite/gas/dlx/itype.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/itype.s
rename to gas/testsuite/gas/dlx/itype.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/lhi.d b/gas/testsuite/gas/dlx/lhi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/lhi.d
rename to gas/testsuite/gas/dlx/lhi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/lhi.s b/gas/testsuite/gas/dlx/lhi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/lhi.s
rename to gas/testsuite/gas/dlx/lhi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/load.d b/gas/testsuite/gas/dlx/load.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/load.d
rename to gas/testsuite/gas/dlx/load.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/load.s b/gas/testsuite/gas/dlx/load.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/load.s
rename to gas/testsuite/gas/dlx/load.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/lohi.d b/gas/testsuite/gas/dlx/lohi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/lohi.d
rename to gas/testsuite/gas/dlx/lohi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/lohi.s b/gas/testsuite/gas/dlx/lohi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/lohi.s
rename to gas/testsuite/gas/dlx/lohi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/rtype.d b/gas/testsuite/gas/dlx/rtype.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/rtype.d
rename to gas/testsuite/gas/dlx/rtype.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/rtype.s b/gas/testsuite/gas/dlx/rtype.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/rtype.s
rename to gas/testsuite/gas/dlx/rtype.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/store.d b/gas/testsuite/gas/dlx/store.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/store.d
rename to gas/testsuite/gas/dlx/store.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/dlx/store.s b/gas/testsuite/gas/dlx/store.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/dlx/store.s
rename to gas/testsuite/gas/dlx/store.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/bad-section-flag.d b/gas/testsuite/gas/elf/bad-section-flag.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/bad-section-flag.d
rename to gas/testsuite/gas/elf/bad-section-flag.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/bad-section-flag.err b/gas/testsuite/gas/elf/bad-section-flag.err
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/bad-section-flag.err
rename to gas/testsuite/gas/elf/bad-section-flag.err
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/bad-section-flag.s b/gas/testsuite/gas/elf/bad-section-flag.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/bad-section-flag.s
rename to gas/testsuite/gas/elf/bad-section-flag.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-1.d b/gas/testsuite/gas/elf/dwarf2-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-1.d
rename to gas/testsuite/gas/elf/dwarf2-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-1.s b/gas/testsuite/gas/elf/dwarf2-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-1.s
rename to gas/testsuite/gas/elf/dwarf2-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-2.d b/gas/testsuite/gas/elf/dwarf2-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-2.d
rename to gas/testsuite/gas/elf/dwarf2-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-2.s b/gas/testsuite/gas/elf/dwarf2-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-2.s
rename to gas/testsuite/gas/elf/dwarf2-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-3.d b/gas/testsuite/gas/elf/dwarf2-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-3.d
rename to gas/testsuite/gas/elf/dwarf2-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-3.s b/gas/testsuite/gas/elf/dwarf2-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/dwarf2-3.s
rename to gas/testsuite/gas/elf/dwarf2-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/ehopt0.d b/gas/testsuite/gas/elf/ehopt0.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/ehopt0.d
rename to gas/testsuite/gas/elf/ehopt0.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/ehopt0.s b/gas/testsuite/gas/elf/ehopt0.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/ehopt0.s
rename to gas/testsuite/gas/elf/ehopt0.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/elf.exp
rename to gas/testsuite/gas/elf/elf.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/equ-reloc.d b/gas/testsuite/gas/elf/equ-reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/equ-reloc.d
rename to gas/testsuite/gas/elf/equ-reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/equ-reloc.s b/gas/testsuite/gas/elf/equ-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/equ-reloc.s
rename to gas/testsuite/gas/elf/equ-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/file.d b/gas/testsuite/gas/elf/file.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/file.d
rename to gas/testsuite/gas/elf/file.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/file.s b/gas/testsuite/gas/elf/file.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/file.s
rename to gas/testsuite/gas/elf/file.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/group0.s b/gas/testsuite/gas/elf/group0.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/group0.s
rename to gas/testsuite/gas/elf/group0.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/group0a.d b/gas/testsuite/gas/elf/group0a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/group0a.d
rename to gas/testsuite/gas/elf/group0a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/group0b.d b/gas/testsuite/gas/elf/group0b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/group0b.d
rename to gas/testsuite/gas/elf/group0b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/group0c.d b/gas/testsuite/gas/elf/group0c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/group0c.d
rename to gas/testsuite/gas/elf/group0c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/group1.s b/gas/testsuite/gas/elf/group1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/group1.s
rename to gas/testsuite/gas/elf/group1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/group1a.d b/gas/testsuite/gas/elf/group1a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/group1a.d
rename to gas/testsuite/gas/elf/group1a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/group1b.d b/gas/testsuite/gas/elf/group1b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/group1b.d
rename to gas/testsuite/gas/elf/group1b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/groupauto.s b/gas/testsuite/gas/elf/groupauto.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/groupauto.s
rename to gas/testsuite/gas/elf/groupauto.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/groupautoa.d b/gas/testsuite/gas/elf/groupautoa.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/groupautoa.d
rename to gas/testsuite/gas/elf/groupautoa.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/groupautob.d b/gas/testsuite/gas/elf/groupautob.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/groupautob.d
rename to gas/testsuite/gas/elf/groupautob.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/ifunc-1.d b/gas/testsuite/gas/elf/ifunc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/ifunc-1.d
rename to gas/testsuite/gas/elf/ifunc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/ifunc-1.s b/gas/testsuite/gas/elf/ifunc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/ifunc-1.s
rename to gas/testsuite/gas/elf/ifunc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/pseudo.d b/gas/testsuite/gas/elf/pseudo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/pseudo.d
rename to gas/testsuite/gas/elf/pseudo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/pseudo.l b/gas/testsuite/gas/elf/pseudo.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/pseudo.l
rename to gas/testsuite/gas/elf/pseudo.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/pseudo.s b/gas/testsuite/gas/elf/pseudo.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/pseudo.s
rename to gas/testsuite/gas/elf/pseudo.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/redef.d b/gas/testsuite/gas/elf/redef.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/redef.d
rename to gas/testsuite/gas/elf/redef.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/redef.s b/gas/testsuite/gas/elf/redef.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/redef.s
rename to gas/testsuite/gas/elf/redef.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section0.d b/gas/testsuite/gas/elf/section0.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section0.d
rename to gas/testsuite/gas/elf/section0.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section0.s b/gas/testsuite/gas/elf/section0.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section0.s
rename to gas/testsuite/gas/elf/section0.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section1.d b/gas/testsuite/gas/elf/section1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section1.d
rename to gas/testsuite/gas/elf/section1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section1.s b/gas/testsuite/gas/elf/section1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section1.s
rename to gas/testsuite/gas/elf/section1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e b/gas/testsuite/gas/elf/section2.e
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e
rename to gas/testsuite/gas/elf/section2.e
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-armeabi b/gas/testsuite/gas/elf/section2.e-armeabi
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-armeabi
rename to gas/testsuite/gas/elf/section2.e-armeabi
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-armelf b/gas/testsuite/gas/elf/section2.e-armelf
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-armelf
rename to gas/testsuite/gas/elf/section2.e-armelf
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-m32r b/gas/testsuite/gas/elf/section2.e-m32r
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-m32r
rename to gas/testsuite/gas/elf/section2.e-m32r
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-mips b/gas/testsuite/gas/elf/section2.e-mips
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-mips
rename to gas/testsuite/gas/elf/section2.e-mips
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-miwmmxt b/gas/testsuite/gas/elf/section2.e-miwmmxt
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-miwmmxt
rename to gas/testsuite/gas/elf/section2.e-miwmmxt
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-rx b/gas/testsuite/gas/elf/section2.e-rx
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-rx
rename to gas/testsuite/gas/elf/section2.e-rx
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-score b/gas/testsuite/gas/elf/section2.e-score
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-score
rename to gas/testsuite/gas/elf/section2.e-score
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-tic6x b/gas/testsuite/gas/elf/section2.e-tic6x
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-tic6x
rename to gas/testsuite/gas/elf/section2.e-tic6x
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-xtensa b/gas/testsuite/gas/elf/section2.e-xtensa
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.e-xtensa
rename to gas/testsuite/gas/elf/section2.e-xtensa
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.l b/gas/testsuite/gas/elf/section2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.l
rename to gas/testsuite/gas/elf/section2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section2.s b/gas/testsuite/gas/elf/section2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section2.s
rename to gas/testsuite/gas/elf/section2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section3.d b/gas/testsuite/gas/elf/section3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section3.d
rename to gas/testsuite/gas/elf/section3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section3.s b/gas/testsuite/gas/elf/section3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section3.s
rename to gas/testsuite/gas/elf/section3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section4.d b/gas/testsuite/gas/elf/section4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section4.d
rename to gas/testsuite/gas/elf/section4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section4.s b/gas/testsuite/gas/elf/section4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section4.s
rename to gas/testsuite/gas/elf/section4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section5.e b/gas/testsuite/gas/elf/section5.e
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section5.e
rename to gas/testsuite/gas/elf/section5.e
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section5.l b/gas/testsuite/gas/elf/section5.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section5.l
rename to gas/testsuite/gas/elf/section5.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section5.s b/gas/testsuite/gas/elf/section5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section5.s
rename to gas/testsuite/gas/elf/section5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section6.d b/gas/testsuite/gas/elf/section6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section6.d
rename to gas/testsuite/gas/elf/section6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section6.s b/gas/testsuite/gas/elf/section6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section6.s
rename to gas/testsuite/gas/elf/section6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section7.d b/gas/testsuite/gas/elf/section7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section7.d
rename to gas/testsuite/gas/elf/section7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section7.s b/gas/testsuite/gas/elf/section7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section7.s
rename to gas/testsuite/gas/elf/section7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section8.d b/gas/testsuite/gas/elf/section8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section8.d
rename to gas/testsuite/gas/elf/section8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/section8.s b/gas/testsuite/gas/elf/section8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/section8.s
rename to gas/testsuite/gas/elf/section8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/struct.d b/gas/testsuite/gas/elf/struct.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/struct.d
rename to gas/testsuite/gas/elf/struct.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/struct.s b/gas/testsuite/gas/elf/struct.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/struct.s
rename to gas/testsuite/gas/elf/struct.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/symtab.d b/gas/testsuite/gas/elf/symtab.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/symtab.d
rename to gas/testsuite/gas/elf/symtab.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/symtab.s b/gas/testsuite/gas/elf/symtab.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/symtab.s
rename to gas/testsuite/gas/elf/symtab.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/symver.d b/gas/testsuite/gas/elf/symver.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/symver.d
rename to gas/testsuite/gas/elf/symver.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/symver.s b/gas/testsuite/gas/elf/symver.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/symver.s
rename to gas/testsuite/gas/elf/symver.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/type-noifunc.e b/gas/testsuite/gas/elf/type-noifunc.e
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/type-noifunc.e
rename to gas/testsuite/gas/elf/type-noifunc.e
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/type-noifunc.s b/gas/testsuite/gas/elf/type-noifunc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/type-noifunc.s
rename to gas/testsuite/gas/elf/type-noifunc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/type.e b/gas/testsuite/gas/elf/type.e
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/type.e
rename to gas/testsuite/gas/elf/type.e
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/elf/type.s b/gas/testsuite/gas/elf/type.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/elf/type.s
rename to gas/testsuite/gas/elf/type.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/fr30/allinsn.d b/gas/testsuite/gas/fr30/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/fr30/allinsn.d
rename to gas/testsuite/gas/fr30/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/fr30/allinsn.exp b/gas/testsuite/gas/fr30/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/fr30/allinsn.exp
rename to gas/testsuite/gas/fr30/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/fr30/allinsn.s b/gas/testsuite/gas/fr30/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/fr30/allinsn.s
rename to gas/testsuite/gas/fr30/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/fr30/fr30.exp b/gas/testsuite/gas/fr30/fr30.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/fr30/fr30.exp
rename to gas/testsuite/gas/fr30/fr30.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/allinsn.d b/gas/testsuite/gas/frv/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/allinsn.d
rename to gas/testsuite/gas/frv/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/allinsn.exp b/gas/testsuite/gas/frv/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/allinsn.exp
rename to gas/testsuite/gas/frv/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/allinsn.s b/gas/testsuite/gas/frv/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/allinsn.s
rename to gas/testsuite/gas/frv/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fdpic.d b/gas/testsuite/gas/frv/fdpic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fdpic.d
rename to gas/testsuite/gas/frv/fdpic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fdpic.s b/gas/testsuite/gas/frv/fdpic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fdpic.s
rename to gas/testsuite/gas/frv/fdpic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr405-insn.d b/gas/testsuite/gas/frv/fr405-insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr405-insn.d
rename to gas/testsuite/gas/frv/fr405-insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr405-insn.l b/gas/testsuite/gas/frv/fr405-insn.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr405-insn.l
rename to gas/testsuite/gas/frv/fr405-insn.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr405-insn.s b/gas/testsuite/gas/frv/fr405-insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr405-insn.s
rename to gas/testsuite/gas/frv/fr405-insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-insn.d b/gas/testsuite/gas/frv/fr450-insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-insn.d
rename to gas/testsuite/gas/frv/fr450-insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-insn.l b/gas/testsuite/gas/frv/fr450-insn.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-insn.l
rename to gas/testsuite/gas/frv/fr450-insn.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-insn.s b/gas/testsuite/gas/frv/fr450-insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-insn.s
rename to gas/testsuite/gas/frv/fr450-insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-media-issue.l b/gas/testsuite/gas/frv/fr450-media-issue.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-media-issue.l
rename to gas/testsuite/gas/frv/fr450-media-issue.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-media-issue.s b/gas/testsuite/gas/frv/fr450-media-issue.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-media-issue.s
rename to gas/testsuite/gas/frv/fr450-media-issue.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-spr.d b/gas/testsuite/gas/frv/fr450-spr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-spr.d
rename to gas/testsuite/gas/frv/fr450-spr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-spr.s b/gas/testsuite/gas/frv/fr450-spr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr450-spr.s
rename to gas/testsuite/gas/frv/fr450-spr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr550-pack1.d b/gas/testsuite/gas/frv/fr550-pack1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr550-pack1.d
rename to gas/testsuite/gas/frv/fr550-pack1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/fr550-pack1.s b/gas/testsuite/gas/frv/fr550-pack1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/fr550-pack1.s
rename to gas/testsuite/gas/frv/fr550-pack1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/reloc1.d b/gas/testsuite/gas/frv/reloc1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/reloc1.d
rename to gas/testsuite/gas/frv/reloc1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/frv/reloc1.s b/gas/testsuite/gas/frv/reloc1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/frv/reloc1.s
rename to gas/testsuite/gas/frv/reloc1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/addsub.s b/gas/testsuite/gas/h8300/addsub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/addsub.s
rename to gas/testsuite/gas/h8300/addsub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/addsubh.s b/gas/testsuite/gas/h8300/addsubh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/addsubh.s
rename to gas/testsuite/gas/h8300/addsubh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/addsubrxcheck.s b/gas/testsuite/gas/h8300/addsubrxcheck.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/addsubrxcheck.s
rename to gas/testsuite/gas/h8300/addsubrxcheck.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/addsubs.s b/gas/testsuite/gas/h8300/addsubs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/addsubs.s
rename to gas/testsuite/gas/h8300/addsubs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops1.s b/gas/testsuite/gas/h8300/bitops1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops1.s
rename to gas/testsuite/gas/h8300/bitops1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops1h.s b/gas/testsuite/gas/h8300/bitops1h.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops1h.s
rename to gas/testsuite/gas/h8300/bitops1h.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops1s.s b/gas/testsuite/gas/h8300/bitops1s.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops1s.s
rename to gas/testsuite/gas/h8300/bitops1s.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops2.s b/gas/testsuite/gas/h8300/bitops2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops2.s
rename to gas/testsuite/gas/h8300/bitops2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops2h.s b/gas/testsuite/gas/h8300/bitops2h.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops2h.s
rename to gas/testsuite/gas/h8300/bitops2h.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops2s.s b/gas/testsuite/gas/h8300/bitops2s.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops2s.s
rename to gas/testsuite/gas/h8300/bitops2s.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops3.s b/gas/testsuite/gas/h8300/bitops3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops3.s
rename to gas/testsuite/gas/h8300/bitops3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops3h.s b/gas/testsuite/gas/h8300/bitops3h.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops3h.s
rename to gas/testsuite/gas/h8300/bitops3h.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops3s.s b/gas/testsuite/gas/h8300/bitops3s.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops3s.s
rename to gas/testsuite/gas/h8300/bitops3s.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops4.s b/gas/testsuite/gas/h8300/bitops4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops4.s
rename to gas/testsuite/gas/h8300/bitops4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops4h.s b/gas/testsuite/gas/h8300/bitops4h.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops4h.s
rename to gas/testsuite/gas/h8300/bitops4h.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops4s.s b/gas/testsuite/gas/h8300/bitops4s.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/bitops4s.s
rename to gas/testsuite/gas/h8300/bitops4s.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/branch-coff.s b/gas/testsuite/gas/h8300/branch-coff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/branch-coff.s
rename to gas/testsuite/gas/h8300/branch-coff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/branch-elf.s b/gas/testsuite/gas/h8300/branch-elf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/branch-elf.s
rename to gas/testsuite/gas/h8300/branch-elf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/branchh-coff.s b/gas/testsuite/gas/h8300/branchh-coff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/branchh-coff.s
rename to gas/testsuite/gas/h8300/branchh-coff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/branchh-elf.s b/gas/testsuite/gas/h8300/branchh-elf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/branchh-elf.s
rename to gas/testsuite/gas/h8300/branchh-elf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/branchs-coff.s b/gas/testsuite/gas/h8300/branchs-coff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/branchs-coff.s
rename to gas/testsuite/gas/h8300/branchs-coff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/branchs-elf.s b/gas/testsuite/gas/h8300/branchs-elf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/branchs-elf.s
rename to gas/testsuite/gas/h8300/branchs-elf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/cbranch.s b/gas/testsuite/gas/h8300/cbranch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/cbranch.s
rename to gas/testsuite/gas/h8300/cbranch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/cbranchh.s b/gas/testsuite/gas/h8300/cbranchh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/cbranchh.s
rename to gas/testsuite/gas/h8300/cbranchh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/cbranchs.s b/gas/testsuite/gas/h8300/cbranchs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/cbranchs.s
rename to gas/testsuite/gas/h8300/cbranchs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/cmpsi2.s b/gas/testsuite/gas/h8300/cmpsi2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/cmpsi2.s
rename to gas/testsuite/gas/h8300/cmpsi2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/compare.s b/gas/testsuite/gas/h8300/compare.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/compare.s
rename to gas/testsuite/gas/h8300/compare.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/compareh.s b/gas/testsuite/gas/h8300/compareh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/compareh.s
rename to gas/testsuite/gas/h8300/compareh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/compares.s b/gas/testsuite/gas/h8300/compares.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/compares.s
rename to gas/testsuite/gas/h8300/compares.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/decimal.s b/gas/testsuite/gas/h8300/decimal.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/decimal.s
rename to gas/testsuite/gas/h8300/decimal.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/decimalh.s b/gas/testsuite/gas/h8300/decimalh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/decimalh.s
rename to gas/testsuite/gas/h8300/decimalh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/decimals.s b/gas/testsuite/gas/h8300/decimals.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/decimals.s
rename to gas/testsuite/gas/h8300/decimals.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/divmul.s b/gas/testsuite/gas/h8300/divmul.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/divmul.s
rename to gas/testsuite/gas/h8300/divmul.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/divmulh.s b/gas/testsuite/gas/h8300/divmulh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/divmulh.s
rename to gas/testsuite/gas/h8300/divmulh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/divmuls.s b/gas/testsuite/gas/h8300/divmuls.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/divmuls.s
rename to gas/testsuite/gas/h8300/divmuls.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/extendh.s b/gas/testsuite/gas/h8300/extendh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/extendh.s
rename to gas/testsuite/gas/h8300/extendh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/extends.s b/gas/testsuite/gas/h8300/extends.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/extends.s
rename to gas/testsuite/gas/h8300/extends.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-coff.d b/gas/testsuite/gas/h8300/ffxx1-coff.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-coff.d
rename to gas/testsuite/gas/h8300/ffxx1-coff.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-coff.s b/gas/testsuite/gas/h8300/ffxx1-coff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-coff.s
rename to gas/testsuite/gas/h8300/ffxx1-coff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-elf.d b/gas/testsuite/gas/h8300/ffxx1-elf.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-elf.d
rename to gas/testsuite/gas/h8300/ffxx1-elf.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-elf.s b/gas/testsuite/gas/h8300/ffxx1-elf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/ffxx1-elf.s
rename to gas/testsuite/gas/h8300/ffxx1-elf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8300-coff.exp b/gas/testsuite/gas/h8300/h8300-coff.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8300-coff.exp
rename to gas/testsuite/gas/h8300/h8300-coff.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8300-elf.exp b/gas/testsuite/gas/h8300/h8300-elf.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8300-elf.exp
rename to gas/testsuite/gas/h8300/h8300-elf.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8300.exp b/gas/testsuite/gas/h8300/h8300.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8300.exp
rename to gas/testsuite/gas/h8300/h8300.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_disp2.d b/gas/testsuite/gas/h8300/h8sx_disp2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_disp2.d
rename to gas/testsuite/gas/h8300/h8sx_disp2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_disp2.s b/gas/testsuite/gas/h8300/h8sx_disp2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_disp2.s
rename to gas/testsuite/gas/h8300/h8sx_disp2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_mov_imm.d b/gas/testsuite/gas/h8300/h8sx_mov_imm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_mov_imm.d
rename to gas/testsuite/gas/h8300/h8sx_mov_imm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_mov_imm.s b/gas/testsuite/gas/h8300/h8sx_mov_imm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_mov_imm.s
rename to gas/testsuite/gas/h8300/h8sx_mov_imm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_rtsl.d b/gas/testsuite/gas/h8300/h8sx_rtsl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_rtsl.d
rename to gas/testsuite/gas/h8300/h8sx_rtsl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_rtsl.s b/gas/testsuite/gas/h8300/h8sx_rtsl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/h8sx_rtsl.s
rename to gas/testsuite/gas/h8300/h8sx_rtsl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/incdec.s b/gas/testsuite/gas/h8300/incdec.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/incdec.s
rename to gas/testsuite/gas/h8300/incdec.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/incdech.s b/gas/testsuite/gas/h8300/incdech.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/incdech.s
rename to gas/testsuite/gas/h8300/incdech.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/incdecs.s b/gas/testsuite/gas/h8300/incdecs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/incdecs.s
rename to gas/testsuite/gas/h8300/incdecs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/logical.s b/gas/testsuite/gas/h8300/logical.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/logical.s
rename to gas/testsuite/gas/h8300/logical.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/logicalh.s b/gas/testsuite/gas/h8300/logicalh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/logicalh.s
rename to gas/testsuite/gas/h8300/logicalh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/logicals.s b/gas/testsuite/gas/h8300/logicals.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/logicals.s
rename to gas/testsuite/gas/h8300/logicals.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/macs.s b/gas/testsuite/gas/h8300/macs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/macs.s
rename to gas/testsuite/gas/h8300/macs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/misc.s b/gas/testsuite/gas/h8300/misc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/misc.s
rename to gas/testsuite/gas/h8300/misc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/misch.s b/gas/testsuite/gas/h8300/misch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/misch.s
rename to gas/testsuite/gas/h8300/misch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/miscs.s b/gas/testsuite/gas/h8300/miscs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/miscs.s
rename to gas/testsuite/gas/h8300/miscs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/mov32bug.s b/gas/testsuite/gas/h8300/mov32bug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/mov32bug.s
rename to gas/testsuite/gas/h8300/mov32bug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movb.s b/gas/testsuite/gas/h8300/movb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movb.s
rename to gas/testsuite/gas/h8300/movb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movbh.s b/gas/testsuite/gas/h8300/movbh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movbh.s
rename to gas/testsuite/gas/h8300/movbh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movbs.s b/gas/testsuite/gas/h8300/movbs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movbs.s
rename to gas/testsuite/gas/h8300/movbs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movlh.s b/gas/testsuite/gas/h8300/movlh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movlh.s
rename to gas/testsuite/gas/h8300/movlh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movls.s b/gas/testsuite/gas/h8300/movls.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movls.s
rename to gas/testsuite/gas/h8300/movls.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movw.s b/gas/testsuite/gas/h8300/movw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movw.s
rename to gas/testsuite/gas/h8300/movw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movwh.s b/gas/testsuite/gas/h8300/movwh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movwh.s
rename to gas/testsuite/gas/h8300/movwh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/movws.s b/gas/testsuite/gas/h8300/movws.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/movws.s
rename to gas/testsuite/gas/h8300/movws.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/multiples.s b/gas/testsuite/gas/h8300/multiples.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/multiples.s
rename to gas/testsuite/gas/h8300/multiples.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/pr3134.d b/gas/testsuite/gas/h8300/pr3134.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/pr3134.d
rename to gas/testsuite/gas/h8300/pr3134.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/pr3134.s b/gas/testsuite/gas/h8300/pr3134.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/pr3134.s
rename to gas/testsuite/gas/h8300/pr3134.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/pushpop.s b/gas/testsuite/gas/h8300/pushpop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/pushpop.s
rename to gas/testsuite/gas/h8300/pushpop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/pushpoph.s b/gas/testsuite/gas/h8300/pushpoph.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/pushpoph.s
rename to gas/testsuite/gas/h8300/pushpoph.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/pushpops.s b/gas/testsuite/gas/h8300/pushpops.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/pushpops.s
rename to gas/testsuite/gas/h8300/pushpops.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/rotsh.s b/gas/testsuite/gas/h8300/rotsh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/rotsh.s
rename to gas/testsuite/gas/h8300/rotsh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/rotshh.s b/gas/testsuite/gas/h8300/rotshh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/rotshh.s
rename to gas/testsuite/gas/h8300/rotshh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/rotshs.s b/gas/testsuite/gas/h8300/rotshs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/rotshs.s
rename to gas/testsuite/gas/h8300/rotshs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/symaddgen.s b/gas/testsuite/gas/h8300/symaddgen.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/symaddgen.s
rename to gas/testsuite/gas/h8300/symaddgen.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t01_mov.exp b/gas/testsuite/gas/h8300/t01_mov.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t01_mov.exp
rename to gas/testsuite/gas/h8300/t01_mov.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t01_mov.s b/gas/testsuite/gas/h8300/t01_mov.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t01_mov.s
rename to gas/testsuite/gas/h8300/t01_mov.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t02_mova.exp b/gas/testsuite/gas/h8300/t02_mova.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t02_mova.exp
rename to gas/testsuite/gas/h8300/t02_mova.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t02_mova.s b/gas/testsuite/gas/h8300/t02_mova.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t02_mova.s
rename to gas/testsuite/gas/h8300/t02_mova.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t03_add.exp b/gas/testsuite/gas/h8300/t03_add.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t03_add.exp
rename to gas/testsuite/gas/h8300/t03_add.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t03_add.s b/gas/testsuite/gas/h8300/t03_add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t03_add.s
rename to gas/testsuite/gas/h8300/t03_add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t04_sub.exp b/gas/testsuite/gas/h8300/t04_sub.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t04_sub.exp
rename to gas/testsuite/gas/h8300/t04_sub.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t04_sub.s b/gas/testsuite/gas/h8300/t04_sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t04_sub.s
rename to gas/testsuite/gas/h8300/t04_sub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t05_cmp.exp b/gas/testsuite/gas/h8300/t05_cmp.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t05_cmp.exp
rename to gas/testsuite/gas/h8300/t05_cmp.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t05_cmp.s b/gas/testsuite/gas/h8300/t05_cmp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t05_cmp.s
rename to gas/testsuite/gas/h8300/t05_cmp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t06_ari2.exp b/gas/testsuite/gas/h8300/t06_ari2.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t06_ari2.exp
rename to gas/testsuite/gas/h8300/t06_ari2.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t06_ari2.s b/gas/testsuite/gas/h8300/t06_ari2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t06_ari2.s
rename to gas/testsuite/gas/h8300/t06_ari2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t07_ari3.exp b/gas/testsuite/gas/h8300/t07_ari3.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t07_ari3.exp
rename to gas/testsuite/gas/h8300/t07_ari3.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t07_ari3.s b/gas/testsuite/gas/h8300/t07_ari3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t07_ari3.s
rename to gas/testsuite/gas/h8300/t07_ari3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t08_or.exp b/gas/testsuite/gas/h8300/t08_or.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t08_or.exp
rename to gas/testsuite/gas/h8300/t08_or.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t08_or.s b/gas/testsuite/gas/h8300/t08_or.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t08_or.s
rename to gas/testsuite/gas/h8300/t08_or.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t09_xor.exp b/gas/testsuite/gas/h8300/t09_xor.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t09_xor.exp
rename to gas/testsuite/gas/h8300/t09_xor.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t09_xor.s b/gas/testsuite/gas/h8300/t09_xor.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t09_xor.s
rename to gas/testsuite/gas/h8300/t09_xor.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t10_and.exp b/gas/testsuite/gas/h8300/t10_and.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t10_and.exp
rename to gas/testsuite/gas/h8300/t10_and.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t10_and.s b/gas/testsuite/gas/h8300/t10_and.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t10_and.s
rename to gas/testsuite/gas/h8300/t10_and.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t11_logs.exp b/gas/testsuite/gas/h8300/t11_logs.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t11_logs.exp
rename to gas/testsuite/gas/h8300/t11_logs.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t11_logs.s b/gas/testsuite/gas/h8300/t11_logs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t11_logs.s
rename to gas/testsuite/gas/h8300/t11_logs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t12_bit.exp b/gas/testsuite/gas/h8300/t12_bit.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t12_bit.exp
rename to gas/testsuite/gas/h8300/t12_bit.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t12_bit.s b/gas/testsuite/gas/h8300/t12_bit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t12_bit.s
rename to gas/testsuite/gas/h8300/t12_bit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t13_otr.exp b/gas/testsuite/gas/h8300/t13_otr.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t13_otr.exp
rename to gas/testsuite/gas/h8300/t13_otr.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/h8300/t13_otr.s b/gas/testsuite/gas/h8300/t13_otr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/h8300/t13_otr.s
rename to gas/testsuite/gas/h8300/t13_otr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/README b/gas/testsuite/gas/hppa/README
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/README
rename to gas/testsuite/gas/hppa/README
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/add.s b/gas/testsuite/gas/hppa/basic/add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/add.s
rename to gas/testsuite/gas/hppa/basic/add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/add2.s b/gas/testsuite/gas/hppa/basic/add2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/add2.s
rename to gas/testsuite/gas/hppa/basic/add2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/addi.s b/gas/testsuite/gas/hppa/basic/addi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/addi.s
rename to gas/testsuite/gas/hppa/basic/addi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/basic.exp b/gas/testsuite/gas/hppa/basic/basic.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/basic.exp
rename to gas/testsuite/gas/hppa/basic/basic.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/branch.s b/gas/testsuite/gas/hppa/basic/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/branch.s
rename to gas/testsuite/gas/hppa/basic/branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/branch2.s b/gas/testsuite/gas/hppa/basic/branch2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/branch2.s
rename to gas/testsuite/gas/hppa/basic/branch2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/comclr.s b/gas/testsuite/gas/hppa/basic/comclr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/comclr.s
rename to gas/testsuite/gas/hppa/basic/comclr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/copr.s b/gas/testsuite/gas/hppa/basic/copr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/copr.s
rename to gas/testsuite/gas/hppa/basic/copr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/coprmem.s b/gas/testsuite/gas/hppa/basic/coprmem.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/coprmem.s
rename to gas/testsuite/gas/hppa/basic/coprmem.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/dcor.s b/gas/testsuite/gas/hppa/basic/dcor.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/dcor.s
rename to gas/testsuite/gas/hppa/basic/dcor.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/dcor2.s b/gas/testsuite/gas/hppa/basic/dcor2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/dcor2.s
rename to gas/testsuite/gas/hppa/basic/dcor2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/deposit.s b/gas/testsuite/gas/hppa/basic/deposit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/deposit.s
rename to gas/testsuite/gas/hppa/basic/deposit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/deposit2.s b/gas/testsuite/gas/hppa/basic/deposit2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/deposit2.s
rename to gas/testsuite/gas/hppa/basic/deposit2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/deposit3.s b/gas/testsuite/gas/hppa/basic/deposit3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/deposit3.s
rename to gas/testsuite/gas/hppa/basic/deposit3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/ds.s b/gas/testsuite/gas/hppa/basic/ds.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/ds.s
rename to gas/testsuite/gas/hppa/basic/ds.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/extract.s b/gas/testsuite/gas/hppa/basic/extract.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/extract.s
rename to gas/testsuite/gas/hppa/basic/extract.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/extract2.s b/gas/testsuite/gas/hppa/basic/extract2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/extract2.s
rename to gas/testsuite/gas/hppa/basic/extract2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/extract3.s b/gas/testsuite/gas/hppa/basic/extract3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/extract3.s
rename to gas/testsuite/gas/hppa/basic/extract3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fmem.s b/gas/testsuite/gas/hppa/basic/fmem.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fmem.s
rename to gas/testsuite/gas/hppa/basic/fmem.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fmemLRbug.s b/gas/testsuite/gas/hppa/basic/fmemLRbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fmemLRbug.s
rename to gas/testsuite/gas/hppa/basic/fmemLRbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_comp.s b/gas/testsuite/gas/hppa/basic/fp_comp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_comp.s
rename to gas/testsuite/gas/hppa/basic/fp_comp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_comp2.s b/gas/testsuite/gas/hppa/basic/fp_comp2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_comp2.s
rename to gas/testsuite/gas/hppa/basic/fp_comp2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_conv.s b/gas/testsuite/gas/hppa/basic/fp_conv.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_conv.s
rename to gas/testsuite/gas/hppa/basic/fp_conv.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_fcmp.s b/gas/testsuite/gas/hppa/basic/fp_fcmp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_fcmp.s
rename to gas/testsuite/gas/hppa/basic/fp_fcmp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_misc.s b/gas/testsuite/gas/hppa/basic/fp_misc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/fp_misc.s
rename to gas/testsuite/gas/hppa/basic/fp_misc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/imem.s b/gas/testsuite/gas/hppa/basic/imem.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/imem.s
rename to gas/testsuite/gas/hppa/basic/imem.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/immed.s b/gas/testsuite/gas/hppa/basic/immed.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/immed.s
rename to gas/testsuite/gas/hppa/basic/immed.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/logical.s b/gas/testsuite/gas/hppa/basic/logical.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/logical.s
rename to gas/testsuite/gas/hppa/basic/logical.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/media.s b/gas/testsuite/gas/hppa/basic/media.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/media.s
rename to gas/testsuite/gas/hppa/basic/media.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/perf.s b/gas/testsuite/gas/hppa/basic/perf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/perf.s
rename to gas/testsuite/gas/hppa/basic/perf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/purge.s b/gas/testsuite/gas/hppa/basic/purge.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/purge.s
rename to gas/testsuite/gas/hppa/basic/purge.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/purge2.s b/gas/testsuite/gas/hppa/basic/purge2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/purge2.s
rename to gas/testsuite/gas/hppa/basic/purge2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sh1add.s b/gas/testsuite/gas/hppa/basic/sh1add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sh1add.s
rename to gas/testsuite/gas/hppa/basic/sh1add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sh2add.s b/gas/testsuite/gas/hppa/basic/sh2add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sh2add.s
rename to gas/testsuite/gas/hppa/basic/sh2add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sh3add.s b/gas/testsuite/gas/hppa/basic/sh3add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sh3add.s
rename to gas/testsuite/gas/hppa/basic/sh3add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shift.s b/gas/testsuite/gas/hppa/basic/shift.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shift.s
rename to gas/testsuite/gas/hppa/basic/shift.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shift2.s b/gas/testsuite/gas/hppa/basic/shift2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shift2.s
rename to gas/testsuite/gas/hppa/basic/shift2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shift3.s b/gas/testsuite/gas/hppa/basic/shift3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shift3.s
rename to gas/testsuite/gas/hppa/basic/shift3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shladd.s b/gas/testsuite/gas/hppa/basic/shladd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shladd.s
rename to gas/testsuite/gas/hppa/basic/shladd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shladd2.s b/gas/testsuite/gas/hppa/basic/shladd2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/shladd2.s
rename to gas/testsuite/gas/hppa/basic/shladd2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/special.s b/gas/testsuite/gas/hppa/basic/special.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/special.s
rename to gas/testsuite/gas/hppa/basic/special.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/spop.s b/gas/testsuite/gas/hppa/basic/spop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/spop.s
rename to gas/testsuite/gas/hppa/basic/spop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sub.s b/gas/testsuite/gas/hppa/basic/sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sub.s
rename to gas/testsuite/gas/hppa/basic/sub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sub2.s b/gas/testsuite/gas/hppa/basic/sub2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/sub2.s
rename to gas/testsuite/gas/hppa/basic/sub2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/subi.s b/gas/testsuite/gas/hppa/basic/subi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/subi.s
rename to gas/testsuite/gas/hppa/basic/subi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/system.s b/gas/testsuite/gas/hppa/basic/system.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/system.s
rename to gas/testsuite/gas/hppa/basic/system.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/system2.s b/gas/testsuite/gas/hppa/basic/system2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/system2.s
rename to gas/testsuite/gas/hppa/basic/system2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/unit.s b/gas/testsuite/gas/hppa/basic/unit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/unit.s
rename to gas/testsuite/gas/hppa/basic/unit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/unit2.s b/gas/testsuite/gas/hppa/basic/unit2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/unit2.s
rename to gas/testsuite/gas/hppa/basic/unit2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/weird.s b/gas/testsuite/gas/hppa/basic/weird.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/basic/weird.s
rename to gas/testsuite/gas/hppa/basic/weird.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/align1.s b/gas/testsuite/gas/hppa/parse/align1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/align1.s
rename to gas/testsuite/gas/hppa/parse/align1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/align2.s b/gas/testsuite/gas/hppa/parse/align2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/align2.s
rename to gas/testsuite/gas/hppa/parse/align2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/appbug.s b/gas/testsuite/gas/hppa/parse/appbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/appbug.s
rename to gas/testsuite/gas/hppa/parse/appbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/badfmpyadd.s b/gas/testsuite/gas/hppa/parse/badfmpyadd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/badfmpyadd.s
rename to gas/testsuite/gas/hppa/parse/badfmpyadd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/block1.s b/gas/testsuite/gas/hppa/parse/block1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/block1.s
rename to gas/testsuite/gas/hppa/parse/block1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/block2.s b/gas/testsuite/gas/hppa/parse/block2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/block2.s
rename to gas/testsuite/gas/hppa/parse/block2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/calldatabug.s b/gas/testsuite/gas/hppa/parse/calldatabug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/calldatabug.s
rename to gas/testsuite/gas/hppa/parse/calldatabug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/callinfobug.s b/gas/testsuite/gas/hppa/parse/callinfobug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/callinfobug.s
rename to gas/testsuite/gas/hppa/parse/callinfobug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/defbug.s b/gas/testsuite/gas/hppa/parse/defbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/defbug.s
rename to gas/testsuite/gas/hppa/parse/defbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/entrybug.s b/gas/testsuite/gas/hppa/parse/entrybug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/entrybug.s
rename to gas/testsuite/gas/hppa/parse/entrybug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/exportbug.s b/gas/testsuite/gas/hppa/parse/exportbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/exportbug.s
rename to gas/testsuite/gas/hppa/parse/exportbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/exprbug.s b/gas/testsuite/gas/hppa/parse/exprbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/exprbug.s
rename to gas/testsuite/gas/hppa/parse/exprbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/fixup7bug.s b/gas/testsuite/gas/hppa/parse/fixup7bug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/fixup7bug.s
rename to gas/testsuite/gas/hppa/parse/fixup7bug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/global.s b/gas/testsuite/gas/hppa/parse/global.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/global.s
rename to gas/testsuite/gas/hppa/parse/global.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/labelbug.s b/gas/testsuite/gas/hppa/parse/labelbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/labelbug.s
rename to gas/testsuite/gas/hppa/parse/labelbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/linesepbug.s b/gas/testsuite/gas/hppa/parse/linesepbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/linesepbug.s
rename to gas/testsuite/gas/hppa/parse/linesepbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/lselbug.s b/gas/testsuite/gas/hppa/parse/lselbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/lselbug.s
rename to gas/testsuite/gas/hppa/parse/lselbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/nosubspace.s b/gas/testsuite/gas/hppa/parse/nosubspace.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/nosubspace.s
rename to gas/testsuite/gas/hppa/parse/nosubspace.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/parse.exp b/gas/testsuite/gas/hppa/parse/parse.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/parse.exp
rename to gas/testsuite/gas/hppa/parse/parse.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/procbug.s b/gas/testsuite/gas/hppa/parse/procbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/procbug.s
rename to gas/testsuite/gas/hppa/parse/procbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/regpopbug.s b/gas/testsuite/gas/hppa/parse/regpopbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/regpopbug.s
rename to gas/testsuite/gas/hppa/parse/regpopbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/space.s b/gas/testsuite/gas/hppa/parse/space.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/space.s
rename to gas/testsuite/gas/hppa/parse/space.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/spacebug.s b/gas/testsuite/gas/hppa/parse/spacebug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/spacebug.s
rename to gas/testsuite/gas/hppa/parse/spacebug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/ssbug.s b/gas/testsuite/gas/hppa/parse/ssbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/ssbug.s
rename to gas/testsuite/gas/hppa/parse/ssbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/stdreg.s b/gas/testsuite/gas/hppa/parse/stdreg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/stdreg.s
rename to gas/testsuite/gas/hppa/parse/stdreg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/stringer.s b/gas/testsuite/gas/hppa/parse/stringer.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/stringer.s
rename to gas/testsuite/gas/hppa/parse/stringer.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/undefbug.s b/gas/testsuite/gas/hppa/parse/undefbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/undefbug.s
rename to gas/testsuite/gas/hppa/parse/undefbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/versionbug.s b/gas/testsuite/gas/hppa/parse/versionbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/versionbug.s
rename to gas/testsuite/gas/hppa/parse/versionbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/xmpyubug.s b/gas/testsuite/gas/hppa/parse/xmpyubug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/parse/xmpyubug.s
rename to gas/testsuite/gas/hppa/parse/xmpyubug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/applybug.s b/gas/testsuite/gas/hppa/reloc/applybug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/applybug.s
rename to gas/testsuite/gas/hppa/reloc/applybug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/blebug.s b/gas/testsuite/gas/hppa/reloc/blebug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/blebug.s
rename to gas/testsuite/gas/hppa/reloc/blebug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/blebug2.s b/gas/testsuite/gas/hppa/reloc/blebug2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/blebug2.s
rename to gas/testsuite/gas/hppa/reloc/blebug2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/blebug3.s b/gas/testsuite/gas/hppa/reloc/blebug3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/blebug3.s
rename to gas/testsuite/gas/hppa/reloc/blebug3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/exitbug.s b/gas/testsuite/gas/hppa/reloc/exitbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/exitbug.s
rename to gas/testsuite/gas/hppa/reloc/exitbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/fixupbug.s b/gas/testsuite/gas/hppa/reloc/fixupbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/fixupbug.s
rename to gas/testsuite/gas/hppa/reloc/fixupbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/funcrelocbug.s b/gas/testsuite/gas/hppa/reloc/funcrelocbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/funcrelocbug.s
rename to gas/testsuite/gas/hppa/reloc/funcrelocbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/labelopbug.s b/gas/testsuite/gas/hppa/reloc/labelopbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/labelopbug.s
rename to gas/testsuite/gas/hppa/reloc/labelopbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/longcall.s b/gas/testsuite/gas/hppa/reloc/longcall.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/longcall.s
rename to gas/testsuite/gas/hppa/reloc/longcall.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/picreloc.s b/gas/testsuite/gas/hppa/reloc/picreloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/picreloc.s
rename to gas/testsuite/gas/hppa/reloc/picreloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/plabelbug.s b/gas/testsuite/gas/hppa/reloc/plabelbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/plabelbug.s
rename to gas/testsuite/gas/hppa/reloc/plabelbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/r_no_reloc.s b/gas/testsuite/gas/hppa/reloc/r_no_reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/r_no_reloc.s
rename to gas/testsuite/gas/hppa/reloc/r_no_reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reduce.s b/gas/testsuite/gas/hppa/reloc/reduce.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reduce.s
rename to gas/testsuite/gas/hppa/reloc/reduce.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reduce2.s b/gas/testsuite/gas/hppa/reloc/reduce2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reduce2.s
rename to gas/testsuite/gas/hppa/reloc/reduce2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reduce3.s b/gas/testsuite/gas/hppa/reloc/reduce3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reduce3.s
rename to gas/testsuite/gas/hppa/reloc/reduce3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reloc.exp b/gas/testsuite/gas/hppa/reloc/reloc.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/reloc.exp
rename to gas/testsuite/gas/hppa/reloc/reloc.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/roundmode.s b/gas/testsuite/gas/hppa/reloc/roundmode.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/roundmode.s
rename to gas/testsuite/gas/hppa/reloc/roundmode.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/selectorbug.s b/gas/testsuite/gas/hppa/reloc/selectorbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/reloc/selectorbug.s
rename to gas/testsuite/gas/hppa/reloc/selectorbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/align3.s b/gas/testsuite/gas/hppa/unsorted/align3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/align3.s
rename to gas/testsuite/gas/hppa/unsorted/align3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/align4.s b/gas/testsuite/gas/hppa/unsorted/align4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/align4.s
rename to gas/testsuite/gas/hppa/unsorted/align4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/brlenbug.s b/gas/testsuite/gas/hppa/unsorted/brlenbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/brlenbug.s
rename to gas/testsuite/gas/hppa/unsorted/brlenbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/common.s b/gas/testsuite/gas/hppa/unsorted/common.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/common.s
rename to gas/testsuite/gas/hppa/unsorted/common.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/fragbug.s b/gas/testsuite/gas/hppa/unsorted/fragbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/fragbug.s
rename to gas/testsuite/gas/hppa/unsorted/fragbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/globalbug.s b/gas/testsuite/gas/hppa/unsorted/globalbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/globalbug.s
rename to gas/testsuite/gas/hppa/unsorted/globalbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/importbug.s b/gas/testsuite/gas/hppa/unsorted/importbug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/importbug.s
rename to gas/testsuite/gas/hppa/unsorted/importbug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/labeldiffs.s b/gas/testsuite/gas/hppa/unsorted/labeldiffs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/labeldiffs.s
rename to gas/testsuite/gas/hppa/unsorted/labeldiffs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/locallabel.s b/gas/testsuite/gas/hppa/unsorted/locallabel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/locallabel.s
rename to gas/testsuite/gas/hppa/unsorted/locallabel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/ss_align.s b/gas/testsuite/gas/hppa/unsorted/ss_align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/ss_align.s
rename to gas/testsuite/gas/hppa/unsorted/ss_align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/unsorted.exp b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/hppa/unsorted/unsorted.exp
rename to gas/testsuite/gas/hppa/unsorted/unsorted.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/287.d b/gas/testsuite/gas/i386/287.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/287.d
rename to gas/testsuite/gas/i386/287.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/287.s b/gas/testsuite/gas/i386/287.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/287.s
rename to gas/testsuite/gas/i386/287.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/387.d b/gas/testsuite/gas/i386/387.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/387.d
rename to gas/testsuite/gas/i386/387.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/387.s b/gas/testsuite/gas/i386/387.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/387.s
rename to gas/testsuite/gas/i386/387.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/8087.d b/gas/testsuite/gas/i386/8087.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/8087.d
rename to gas/testsuite/gas/i386/8087.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/8087.s b/gas/testsuite/gas/i386/8087.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/8087.s
rename to gas/testsuite/gas/i386/8087.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/absrel.d b/gas/testsuite/gas/i386/absrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/absrel.d
rename to gas/testsuite/gas/i386/absrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/absrel.s b/gas/testsuite/gas/i386/absrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/absrel.s
rename to gas/testsuite/gas/i386/absrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/addr16.d b/gas/testsuite/gas/i386/addr16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/addr16.d
rename to gas/testsuite/gas/i386/addr16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/addr16.s b/gas/testsuite/gas/i386/addr16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/addr16.s
rename to gas/testsuite/gas/i386/addr16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/addr32.d b/gas/testsuite/gas/i386/addr32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/addr32.d
rename to gas/testsuite/gas/i386/addr32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/addr32.s b/gas/testsuite/gas/i386/addr32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/addr32.s
rename to gas/testsuite/gas/i386/addr32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/aes-intel.d b/gas/testsuite/gas/i386/aes-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/aes-intel.d
rename to gas/testsuite/gas/i386/aes-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/aes.d b/gas/testsuite/gas/i386/aes.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/aes.d
rename to gas/testsuite/gas/i386/aes.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/aes.s b/gas/testsuite/gas/i386/aes.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/aes.s
rename to gas/testsuite/gas/i386/aes.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/amd.d b/gas/testsuite/gas/i386/amd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/amd.d
rename to gas/testsuite/gas/i386/amd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/amd.s b/gas/testsuite/gas/i386/amd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/amd.s
rename to gas/testsuite/gas/i386/amd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/amdfam10.d b/gas/testsuite/gas/i386/amdfam10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/amdfam10.d
rename to gas/testsuite/gas/i386/amdfam10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/amdfam10.s b/gas/testsuite/gas/i386/amdfam10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/amdfam10.s
rename to gas/testsuite/gas/i386/amdfam10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-1.d b/gas/testsuite/gas/i386/arch-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-1.d
rename to gas/testsuite/gas/i386/arch-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-1.s b/gas/testsuite/gas/i386/arch-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-1.s
rename to gas/testsuite/gas/i386/arch-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-1.l b/gas/testsuite/gas/i386/arch-10-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-1.l
rename to gas/testsuite/gas/i386/arch-10-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-1.s b/gas/testsuite/gas/i386/arch-10-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-1.s
rename to gas/testsuite/gas/i386/arch-10-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-2.l b/gas/testsuite/gas/i386/arch-10-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-2.l
rename to gas/testsuite/gas/i386/arch-10-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-2.s b/gas/testsuite/gas/i386/arch-10-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-2.s
rename to gas/testsuite/gas/i386/arch-10-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-3.l b/gas/testsuite/gas/i386/arch-10-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-3.l
rename to gas/testsuite/gas/i386/arch-10-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-3.s b/gas/testsuite/gas/i386/arch-10-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-3.s
rename to gas/testsuite/gas/i386/arch-10-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-4.l b/gas/testsuite/gas/i386/arch-10-4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-4.l
rename to gas/testsuite/gas/i386/arch-10-4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-4.s b/gas/testsuite/gas/i386/arch-10-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10-4.s
rename to gas/testsuite/gas/i386/arch-10-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10.d b/gas/testsuite/gas/i386/arch-10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10.d
rename to gas/testsuite/gas/i386/arch-10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10.s b/gas/testsuite/gas/i386/arch-10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-10.s
rename to gas/testsuite/gas/i386/arch-10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-11.d b/gas/testsuite/gas/i386/arch-11.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-11.d
rename to gas/testsuite/gas/i386/arch-11.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-11.s b/gas/testsuite/gas/i386/arch-11.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-11.s
rename to gas/testsuite/gas/i386/arch-11.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-12.d b/gas/testsuite/gas/i386/arch-12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-12.d
rename to gas/testsuite/gas/i386/arch-12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-12.s b/gas/testsuite/gas/i386/arch-12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-12.s
rename to gas/testsuite/gas/i386/arch-12.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-2.d b/gas/testsuite/gas/i386/arch-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-2.d
rename to gas/testsuite/gas/i386/arch-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-2.s b/gas/testsuite/gas/i386/arch-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-2.s
rename to gas/testsuite/gas/i386/arch-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-3.d b/gas/testsuite/gas/i386/arch-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-3.d
rename to gas/testsuite/gas/i386/arch-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-3.s b/gas/testsuite/gas/i386/arch-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-3.s
rename to gas/testsuite/gas/i386/arch-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-4.d b/gas/testsuite/gas/i386/arch-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-4.d
rename to gas/testsuite/gas/i386/arch-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-4.s b/gas/testsuite/gas/i386/arch-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-4.s
rename to gas/testsuite/gas/i386/arch-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-5.d b/gas/testsuite/gas/i386/arch-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-5.d
rename to gas/testsuite/gas/i386/arch-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-5.s b/gas/testsuite/gas/i386/arch-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-5.s
rename to gas/testsuite/gas/i386/arch-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-6.d b/gas/testsuite/gas/i386/arch-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-6.d
rename to gas/testsuite/gas/i386/arch-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-6.s b/gas/testsuite/gas/i386/arch-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-6.s
rename to gas/testsuite/gas/i386/arch-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-7.d b/gas/testsuite/gas/i386/arch-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-7.d
rename to gas/testsuite/gas/i386/arch-7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-7.s b/gas/testsuite/gas/i386/arch-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-7.s
rename to gas/testsuite/gas/i386/arch-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-9.d b/gas/testsuite/gas/i386/arch-9.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-9.d
rename to gas/testsuite/gas/i386/arch-9.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-9.s b/gas/testsuite/gas/i386/arch-9.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-9.s
rename to gas/testsuite/gas/i386/arch-9.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-1.l b/gas/testsuite/gas/i386/arch-avx-1-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-1.l
rename to gas/testsuite/gas/i386/arch-avx-1-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-1.s b/gas/testsuite/gas/i386/arch-avx-1-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-1.s
rename to gas/testsuite/gas/i386/arch-avx-1-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-2.l b/gas/testsuite/gas/i386/arch-avx-1-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-2.l
rename to gas/testsuite/gas/i386/arch-avx-1-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-2.s b/gas/testsuite/gas/i386/arch-avx-1-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-2.s
rename to gas/testsuite/gas/i386/arch-avx-1-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-3.l b/gas/testsuite/gas/i386/arch-avx-1-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-3.l
rename to gas/testsuite/gas/i386/arch-avx-1-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-3.s b/gas/testsuite/gas/i386/arch-avx-1-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-3.s
rename to gas/testsuite/gas/i386/arch-avx-1-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-4.l b/gas/testsuite/gas/i386/arch-avx-1-4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-4.l
rename to gas/testsuite/gas/i386/arch-avx-1-4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-4.s b/gas/testsuite/gas/i386/arch-avx-1-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-4.s
rename to gas/testsuite/gas/i386/arch-avx-1-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-5.l b/gas/testsuite/gas/i386/arch-avx-1-5.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-5.l
rename to gas/testsuite/gas/i386/arch-avx-1-5.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-5.s b/gas/testsuite/gas/i386/arch-avx-1-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-5.s
rename to gas/testsuite/gas/i386/arch-avx-1-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-6.l b/gas/testsuite/gas/i386/arch-avx-1-6.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-6.l
rename to gas/testsuite/gas/i386/arch-avx-1-6.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-6.s b/gas/testsuite/gas/i386/arch-avx-1-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1-6.s
rename to gas/testsuite/gas/i386/arch-avx-1-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1.d b/gas/testsuite/gas/i386/arch-avx-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1.d
rename to gas/testsuite/gas/i386/arch-avx-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1.s b/gas/testsuite/gas/i386/arch-avx-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/arch-avx-1.s
rename to gas/testsuite/gas/i386/arch-avx-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/att-regs.d b/gas/testsuite/gas/i386/att-regs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/att-regs.d
rename to gas/testsuite/gas/i386/att-regs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/att-regs.s b/gas/testsuite/gas/i386/att-regs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/att-regs.s
rename to gas/testsuite/gas/i386/att-regs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/avx-intel.d b/gas/testsuite/gas/i386/avx-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/avx-intel.d
rename to gas/testsuite/gas/i386/avx-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/avx-scalar-intel.d b/gas/testsuite/gas/i386/avx-scalar-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/avx-scalar-intel.d
rename to gas/testsuite/gas/i386/avx-scalar-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/avx-scalar.d b/gas/testsuite/gas/i386/avx-scalar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/avx-scalar.d
rename to gas/testsuite/gas/i386/avx-scalar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/avx-scalar.s b/gas/testsuite/gas/i386/avx-scalar.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/avx-scalar.s
rename to gas/testsuite/gas/i386/avx-scalar.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/avx.d b/gas/testsuite/gas/i386/avx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/avx.d
rename to gas/testsuite/gas/i386/avx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/avx.s b/gas/testsuite/gas/i386/avx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/avx.s
rename to gas/testsuite/gas/i386/avx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/bss.d b/gas/testsuite/gas/i386/bss.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/bss.d
rename to gas/testsuite/gas/i386/bss.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/bss.s b/gas/testsuite/gas/i386/bss.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/bss.s
rename to gas/testsuite/gas/i386/bss.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/clmul-intel.d b/gas/testsuite/gas/i386/clmul-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/clmul-intel.d
rename to gas/testsuite/gas/i386/clmul-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/clmul.d b/gas/testsuite/gas/i386/clmul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/clmul.d
rename to gas/testsuite/gas/i386/clmul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/clmul.s b/gas/testsuite/gas/i386/clmul.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/clmul.s
rename to gas/testsuite/gas/i386/clmul.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/compat-intel.d b/gas/testsuite/gas/i386/compat-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/compat-intel.d
rename to gas/testsuite/gas/i386/compat-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/compat.d b/gas/testsuite/gas/i386/compat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/compat.d
rename to gas/testsuite/gas/i386/compat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/compat.s b/gas/testsuite/gas/i386/compat.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/compat.s
rename to gas/testsuite/gas/i386/compat.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/cr-err.l b/gas/testsuite/gas/i386/cr-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/cr-err.l
rename to gas/testsuite/gas/i386/cr-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/cr-err.s b/gas/testsuite/gas/i386/cr-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/cr-err.s
rename to gas/testsuite/gas/i386/cr-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/crc32-intel.d b/gas/testsuite/gas/i386/crc32-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/crc32-intel.d
rename to gas/testsuite/gas/i386/crc32-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/crc32.d b/gas/testsuite/gas/i386/crc32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/crc32.d
rename to gas/testsuite/gas/i386/crc32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/crc32.s b/gas/testsuite/gas/i386/crc32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/crc32.s
rename to gas/testsuite/gas/i386/crc32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/crx.d b/gas/testsuite/gas/i386/crx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/crx.d
rename to gas/testsuite/gas/i386/crx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/crx.s b/gas/testsuite/gas/i386/crx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/crx.s
rename to gas/testsuite/gas/i386/crx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/debug1.d b/gas/testsuite/gas/i386/debug1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/debug1.d
rename to gas/testsuite/gas/i386/debug1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/debug1.s b/gas/testsuite/gas/i386/debug1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/debug1.s
rename to gas/testsuite/gas/i386/debug1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/disp-intel.d b/gas/testsuite/gas/i386/disp-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/disp-intel.d
rename to gas/testsuite/gas/i386/disp-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/disp.d b/gas/testsuite/gas/i386/disp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/disp.d
rename to gas/testsuite/gas/i386/disp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/disp.s b/gas/testsuite/gas/i386/disp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/disp.s
rename to gas/testsuite/gas/i386/disp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/disp32.d b/gas/testsuite/gas/i386/disp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/disp32.d
rename to gas/testsuite/gas/i386/disp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/disp32.s b/gas/testsuite/gas/i386/disp32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/disp32.s
rename to gas/testsuite/gas/i386/disp32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/divide.d b/gas/testsuite/gas/i386/divide.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/divide.d
rename to gas/testsuite/gas/i386/divide.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/divide.s b/gas/testsuite/gas/i386/divide.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/divide.s
rename to gas/testsuite/gas/i386/divide.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-1.d b/gas/testsuite/gas/i386/dw2-compress-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-1.d
rename to gas/testsuite/gas/i386/dw2-compress-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-1.s b/gas/testsuite/gas/i386/dw2-compress-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-1.s
rename to gas/testsuite/gas/i386/dw2-compress-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-2.d b/gas/testsuite/gas/i386/dw2-compress-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-2.d
rename to gas/testsuite/gas/i386/dw2-compress-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-2.s b/gas/testsuite/gas/i386/dw2-compress-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/dw2-compress-2.s
rename to gas/testsuite/gas/i386/dw2-compress-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ept-intel.d b/gas/testsuite/gas/i386/ept-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ept-intel.d
rename to gas/testsuite/gas/i386/ept-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ept.d b/gas/testsuite/gas/i386/ept.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ept.d
rename to gas/testsuite/gas/i386/ept.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ept.s b/gas/testsuite/gas/i386/ept.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ept.s
rename to gas/testsuite/gas/i386/ept.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/equ.d b/gas/testsuite/gas/i386/equ.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/equ.d
rename to gas/testsuite/gas/i386/equ.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/equ.s b/gas/testsuite/gas/i386/equ.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/equ.s
rename to gas/testsuite/gas/i386/equ.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/f16c-intel.d b/gas/testsuite/gas/i386/f16c-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/f16c-intel.d
rename to gas/testsuite/gas/i386/f16c-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/f16c.d b/gas/testsuite/gas/i386/f16c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/f16c.d
rename to gas/testsuite/gas/i386/f16c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/f16c.s b/gas/testsuite/gas/i386/f16c.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/f16c.s
rename to gas/testsuite/gas/i386/f16c.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/float.l b/gas/testsuite/gas/i386/float.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/float.l
rename to gas/testsuite/gas/i386/float.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/float.s b/gas/testsuite/gas/i386/float.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/float.s
rename to gas/testsuite/gas/i386/float.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma-intel.d b/gas/testsuite/gas/i386/fma-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma-intel.d
rename to gas/testsuite/gas/i386/fma-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma-scalar-intel.d b/gas/testsuite/gas/i386/fma-scalar-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma-scalar-intel.d
rename to gas/testsuite/gas/i386/fma-scalar-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma-scalar.d b/gas/testsuite/gas/i386/fma-scalar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma-scalar.d
rename to gas/testsuite/gas/i386/fma-scalar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma-scalar.s b/gas/testsuite/gas/i386/fma-scalar.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma-scalar.s
rename to gas/testsuite/gas/i386/fma-scalar.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma.d b/gas/testsuite/gas/i386/fma.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma.d
rename to gas/testsuite/gas/i386/fma.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma.s b/gas/testsuite/gas/i386/fma.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma.s
rename to gas/testsuite/gas/i386/fma.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma4.d b/gas/testsuite/gas/i386/fma4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma4.d
rename to gas/testsuite/gas/i386/fma4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fma4.s b/gas/testsuite/gas/i386/fma4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fma4.s
rename to gas/testsuite/gas/i386/fma4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fp.d b/gas/testsuite/gas/i386/fp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fp.d
rename to gas/testsuite/gas/i386/fp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fp.s b/gas/testsuite/gas/i386/fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fp.s
rename to gas/testsuite/gas/i386/fp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fsgs-intel.d b/gas/testsuite/gas/i386/fsgs-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fsgs-intel.d
rename to gas/testsuite/gas/i386/fsgs-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fsgs.d b/gas/testsuite/gas/i386/fsgs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fsgs.d
rename to gas/testsuite/gas/i386/fsgs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/fsgs.s b/gas/testsuite/gas/i386/fsgs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/fsgs.s
rename to gas/testsuite/gas/i386/fsgs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/general.l b/gas/testsuite/gas/i386/general.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/general.l
rename to gas/testsuite/gas/i386/general.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/general.s b/gas/testsuite/gas/i386/general.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/general.s
rename to gas/testsuite/gas/i386/general.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/gotpc.d b/gas/testsuite/gas/i386/gotpc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/gotpc.d
rename to gas/testsuite/gas/i386/gotpc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/gotpc.s b/gas/testsuite/gas/i386/gotpc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/gotpc.s
rename to gas/testsuite/gas/i386/gotpc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/i386.d b/gas/testsuite/gas/i386/i386.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/i386.d
rename to gas/testsuite/gas/i386/i386.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/i386.exp
rename to gas/testsuite/gas/i386/i386.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/i386.s b/gas/testsuite/gas/i386/i386.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/i386.s
rename to gas/testsuite/gas/i386/i386.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ifunc.d b/gas/testsuite/gas/i386/ifunc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ifunc.d
rename to gas/testsuite/gas/i386/ifunc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ifunc.s b/gas/testsuite/gas/i386/ifunc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ifunc.s
rename to gas/testsuite/gas/i386/ifunc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/immed32.d b/gas/testsuite/gas/i386/immed32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/immed32.d
rename to gas/testsuite/gas/i386/immed32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/immed32.s b/gas/testsuite/gas/i386/immed32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/immed32.s
rename to gas/testsuite/gas/i386/immed32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/immed64.d b/gas/testsuite/gas/i386/immed64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/immed64.d
rename to gas/testsuite/gas/i386/immed64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/immed64.s b/gas/testsuite/gas/i386/immed64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/immed64.s
rename to gas/testsuite/gas/i386/immed64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-expr.d b/gas/testsuite/gas/i386/intel-expr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-expr.d
rename to gas/testsuite/gas/i386/intel-expr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-expr.s b/gas/testsuite/gas/i386/intel-expr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-expr.s
rename to gas/testsuite/gas/i386/intel-expr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got32.d b/gas/testsuite/gas/i386/intel-got32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got32.d
rename to gas/testsuite/gas/i386/intel-got32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got32.s b/gas/testsuite/gas/i386/intel-got32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got32.s
rename to gas/testsuite/gas/i386/intel-got32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got64.d b/gas/testsuite/gas/i386/intel-got64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got64.d
rename to gas/testsuite/gas/i386/intel-got64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got64.s b/gas/testsuite/gas/i386/intel-got64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-got64.s
rename to gas/testsuite/gas/i386/intel-got64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-regs.d b/gas/testsuite/gas/i386/intel-regs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-regs.d
rename to gas/testsuite/gas/i386/intel-regs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel-regs.s b/gas/testsuite/gas/i386/intel-regs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel-regs.s
rename to gas/testsuite/gas/i386/intel-regs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel.d b/gas/testsuite/gas/i386/intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel.d
rename to gas/testsuite/gas/i386/intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel.e b/gas/testsuite/gas/i386/intel.e
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel.e
rename to gas/testsuite/gas/i386/intel.e
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel.s b/gas/testsuite/gas/i386/intel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel.s
rename to gas/testsuite/gas/i386/intel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel16.d b/gas/testsuite/gas/i386/intel16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel16.d
rename to gas/testsuite/gas/i386/intel16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intel16.s b/gas/testsuite/gas/i386/intel16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intel16.s
rename to gas/testsuite/gas/i386/intel16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intelbad.l b/gas/testsuite/gas/i386/intelbad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intelbad.l
rename to gas/testsuite/gas/i386/intelbad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intelbad.s b/gas/testsuite/gas/i386/intelbad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intelbad.s
rename to gas/testsuite/gas/i386/intelbad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intelok.d b/gas/testsuite/gas/i386/intelok.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intelok.d
rename to gas/testsuite/gas/i386/intelok.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intelok.s b/gas/testsuite/gas/i386/intelok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intelok.s
rename to gas/testsuite/gas/i386/intelok.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intelpic.d b/gas/testsuite/gas/i386/intelpic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intelpic.d
rename to gas/testsuite/gas/i386/intelpic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/intelpic.s b/gas/testsuite/gas/i386/intelpic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/intelpic.s
rename to gas/testsuite/gas/i386/intelpic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-avx.l b/gas/testsuite/gas/i386/inval-avx.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-avx.l
rename to gas/testsuite/gas/i386/inval-avx.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-avx.s b/gas/testsuite/gas/i386/inval-avx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-avx.s
rename to gas/testsuite/gas/i386/inval-avx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-crc32.l b/gas/testsuite/gas/i386/inval-crc32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-crc32.l
rename to gas/testsuite/gas/i386/inval-crc32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-crc32.s b/gas/testsuite/gas/i386/inval-crc32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-crc32.s
rename to gas/testsuite/gas/i386/inval-crc32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-ept.l b/gas/testsuite/gas/i386/inval-ept.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-ept.l
rename to gas/testsuite/gas/i386/inval-ept.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-ept.s b/gas/testsuite/gas/i386/inval-ept.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-ept.s
rename to gas/testsuite/gas/i386/inval-ept.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-1.l b/gas/testsuite/gas/i386/inval-equ-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-1.l
rename to gas/testsuite/gas/i386/inval-equ-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-1.s b/gas/testsuite/gas/i386/inval-equ-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-1.s
rename to gas/testsuite/gas/i386/inval-equ-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-2.l b/gas/testsuite/gas/i386/inval-equ-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-2.l
rename to gas/testsuite/gas/i386/inval-equ-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-2.s b/gas/testsuite/gas/i386/inval-equ-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-equ-2.s
rename to gas/testsuite/gas/i386/inval-equ-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-movbe.l b/gas/testsuite/gas/i386/inval-movbe.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-movbe.l
rename to gas/testsuite/gas/i386/inval-movbe.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-movbe.s b/gas/testsuite/gas/i386/inval-movbe.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-movbe.s
rename to gas/testsuite/gas/i386/inval-movbe.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-reg.l b/gas/testsuite/gas/i386/inval-reg.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-reg.l
rename to gas/testsuite/gas/i386/inval-reg.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-reg.s b/gas/testsuite/gas/i386/inval-reg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-reg.s
rename to gas/testsuite/gas/i386/inval-reg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-seg.l b/gas/testsuite/gas/i386/inval-seg.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-seg.l
rename to gas/testsuite/gas/i386/inval-seg.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval-seg.s b/gas/testsuite/gas/i386/inval-seg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval-seg.s
rename to gas/testsuite/gas/i386/inval-seg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval.l b/gas/testsuite/gas/i386/inval.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval.l
rename to gas/testsuite/gas/i386/inval.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/inval.s b/gas/testsuite/gas/i386/inval.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/inval.s
rename to gas/testsuite/gas/i386/inval.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/jump.d b/gas/testsuite/gas/i386/jump.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/jump.d
rename to gas/testsuite/gas/i386/jump.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/jump.s b/gas/testsuite/gas/i386/jump.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/jump.s
rename to gas/testsuite/gas/i386/jump.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/jump16.d b/gas/testsuite/gas/i386/jump16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/jump16.d
rename to gas/testsuite/gas/i386/jump16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/jump16.s b/gas/testsuite/gas/i386/jump16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/jump16.s
rename to gas/testsuite/gas/i386/jump16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/katmai.d b/gas/testsuite/gas/i386/katmai.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/katmai.d
rename to gas/testsuite/gas/i386/katmai.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/katmai.s b/gas/testsuite/gas/i386/katmai.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/katmai.s
rename to gas/testsuite/gas/i386/katmai.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/l1om-inval.l b/gas/testsuite/gas/i386/l1om-inval.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/l1om-inval.l
rename to gas/testsuite/gas/i386/l1om-inval.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/l1om-inval.s b/gas/testsuite/gas/i386/l1om-inval.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/l1om-inval.s
rename to gas/testsuite/gas/i386/l1om-inval.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/l1om.d b/gas/testsuite/gas/i386/l1om.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/l1om.d
rename to gas/testsuite/gas/i386/l1om.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/list-1.l b/gas/testsuite/gas/i386/list-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/list-1.l
rename to gas/testsuite/gas/i386/list-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/list-1.s b/gas/testsuite/gas/i386/list-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/list-1.s
rename to gas/testsuite/gas/i386/list-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/list-2.l b/gas/testsuite/gas/i386/list-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/list-2.l
rename to gas/testsuite/gas/i386/list-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/list-2.s b/gas/testsuite/gas/i386/list-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/list-2.s
rename to gas/testsuite/gas/i386/list-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/list-3.l b/gas/testsuite/gas/i386/list-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/list-3.l
rename to gas/testsuite/gas/i386/list-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/list-3.s b/gas/testsuite/gas/i386/list-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/list-3.s
rename to gas/testsuite/gas/i386/list-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/localpic.d b/gas/testsuite/gas/i386/localpic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/localpic.d
rename to gas/testsuite/gas/i386/localpic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/localpic.s b/gas/testsuite/gas/i386/localpic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/localpic.s
rename to gas/testsuite/gas/i386/localpic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/lock-1-intel.d b/gas/testsuite/gas/i386/lock-1-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/lock-1-intel.d
rename to gas/testsuite/gas/i386/lock-1-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/lock-1.d b/gas/testsuite/gas/i386/lock-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/lock-1.d
rename to gas/testsuite/gas/i386/lock-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/lock-1.s b/gas/testsuite/gas/i386/lock-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/lock-1.s
rename to gas/testsuite/gas/i386/lock-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/lockbad-1.l b/gas/testsuite/gas/i386/lockbad-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/lockbad-1.l
rename to gas/testsuite/gas/i386/lockbad-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/lockbad-1.s b/gas/testsuite/gas/i386/lockbad-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/lockbad-1.s
rename to gas/testsuite/gas/i386/lockbad-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/long-1-intel.d b/gas/testsuite/gas/i386/long-1-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/long-1-intel.d
rename to gas/testsuite/gas/i386/long-1-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/long-1.d b/gas/testsuite/gas/i386/long-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/long-1.d
rename to gas/testsuite/gas/i386/long-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/long-1.s b/gas/testsuite/gas/i386/long-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/long-1.s
rename to gas/testsuite/gas/i386/long-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/lwp.d b/gas/testsuite/gas/i386/lwp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/lwp.d
rename to gas/testsuite/gas/i386/lwp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/lwp.s b/gas/testsuite/gas/i386/lwp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/lwp.s
rename to gas/testsuite/gas/i386/lwp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/mem-intel.d b/gas/testsuite/gas/i386/mem-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/mem-intel.d
rename to gas/testsuite/gas/i386/mem-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/mem.d b/gas/testsuite/gas/i386/mem.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/mem.d
rename to gas/testsuite/gas/i386/mem.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/mem.s b/gas/testsuite/gas/i386/mem.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/mem.s
rename to gas/testsuite/gas/i386/mem.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/mixed-mode-reloc.s b/gas/testsuite/gas/i386/mixed-mode-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/mixed-mode-reloc.s
rename to gas/testsuite/gas/i386/mixed-mode-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/mixed-mode-reloc32.d b/gas/testsuite/gas/i386/mixed-mode-reloc32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/mixed-mode-reloc32.d
rename to gas/testsuite/gas/i386/mixed-mode-reloc32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/mixed-mode-reloc64.d b/gas/testsuite/gas/i386/mixed-mode-reloc64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/mixed-mode-reloc64.d
rename to gas/testsuite/gas/i386/mixed-mode-reloc64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/modrm.l b/gas/testsuite/gas/i386/modrm.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/modrm.l
rename to gas/testsuite/gas/i386/modrm.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/modrm.s b/gas/testsuite/gas/i386/modrm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/modrm.s
rename to gas/testsuite/gas/i386/modrm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/movbe-intel.d b/gas/testsuite/gas/i386/movbe-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/movbe-intel.d
rename to gas/testsuite/gas/i386/movbe-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/movbe.d b/gas/testsuite/gas/i386/movbe.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/movbe.d
rename to gas/testsuite/gas/i386/movbe.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/movbe.s b/gas/testsuite/gas/i386/movbe.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/movbe.s
rename to gas/testsuite/gas/i386/movbe.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/naked.d b/gas/testsuite/gas/i386/naked.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/naked.d
rename to gas/testsuite/gas/i386/naked.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/naked.s b/gas/testsuite/gas/i386/naked.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/naked.s
rename to gas/testsuite/gas/i386/naked.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/no87-2.l b/gas/testsuite/gas/i386/no87-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/no87-2.l
rename to gas/testsuite/gas/i386/no87-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/no87-2.s b/gas/testsuite/gas/i386/no87-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/no87-2.s
rename to gas/testsuite/gas/i386/no87-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/no87.l b/gas/testsuite/gas/i386/no87.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/no87.l
rename to gas/testsuite/gas/i386/no87.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/no87.s b/gas/testsuite/gas/i386/no87.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/no87.s
rename to gas/testsuite/gas/i386/no87.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-bdver1.d b/gas/testsuite/gas/i386/nops-1-bdver1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-bdver1.d
rename to gas/testsuite/gas/i386/nops-1-bdver1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-core2.d b/gas/testsuite/gas/i386/nops-1-core2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-core2.d
rename to gas/testsuite/gas/i386/nops-1-core2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-i386-i686.d b/gas/testsuite/gas/i386/nops-1-i386-i686.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-i386-i686.d
rename to gas/testsuite/gas/i386/nops-1-i386-i686.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-i386.d b/gas/testsuite/gas/i386/nops-1-i386.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-i386.d
rename to gas/testsuite/gas/i386/nops-1-i386.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-i686.d b/gas/testsuite/gas/i386/nops-1-i686.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-i686.d
rename to gas/testsuite/gas/i386/nops-1-i686.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-k8.d b/gas/testsuite/gas/i386/nops-1-k8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1-k8.d
rename to gas/testsuite/gas/i386/nops-1-k8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1.d b/gas/testsuite/gas/i386/nops-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1.d
rename to gas/testsuite/gas/i386/nops-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1.s b/gas/testsuite/gas/i386/nops-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-1.s
rename to gas/testsuite/gas/i386/nops-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2-core2.d b/gas/testsuite/gas/i386/nops-2-core2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2-core2.d
rename to gas/testsuite/gas/i386/nops-2-core2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2-i386.d b/gas/testsuite/gas/i386/nops-2-i386.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2-i386.d
rename to gas/testsuite/gas/i386/nops-2-i386.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2.d b/gas/testsuite/gas/i386/nops-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2.d
rename to gas/testsuite/gas/i386/nops-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2.s b/gas/testsuite/gas/i386/nops-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-2.s
rename to gas/testsuite/gas/i386/nops-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3-i386.d b/gas/testsuite/gas/i386/nops-3-i386.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3-i386.d
rename to gas/testsuite/gas/i386/nops-3-i386.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3-i686.d b/gas/testsuite/gas/i386/nops-3-i686.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3-i686.d
rename to gas/testsuite/gas/i386/nops-3-i686.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3.d b/gas/testsuite/gas/i386/nops-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3.d
rename to gas/testsuite/gas/i386/nops-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3.s b/gas/testsuite/gas/i386/nops-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-3.s
rename to gas/testsuite/gas/i386/nops-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4-i386.d b/gas/testsuite/gas/i386/nops-4-i386.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4-i386.d
rename to gas/testsuite/gas/i386/nops-4-i386.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4-i686.d b/gas/testsuite/gas/i386/nops-4-i686.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4-i686.d
rename to gas/testsuite/gas/i386/nops-4-i686.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4.d b/gas/testsuite/gas/i386/nops-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4.d
rename to gas/testsuite/gas/i386/nops-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4.s b/gas/testsuite/gas/i386/nops-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-4.s
rename to gas/testsuite/gas/i386/nops-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-5-i686.d b/gas/testsuite/gas/i386/nops-5-i686.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-5-i686.d
rename to gas/testsuite/gas/i386/nops-5-i686.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-5.d b/gas/testsuite/gas/i386/nops-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-5.d
rename to gas/testsuite/gas/i386/nops-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops-5.s b/gas/testsuite/gas/i386/nops-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops-5.s
rename to gas/testsuite/gas/i386/nops-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops.d b/gas/testsuite/gas/i386/nops.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops.d
rename to gas/testsuite/gas/i386/nops.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops.s b/gas/testsuite/gas/i386/nops.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops.s
rename to gas/testsuite/gas/i386/nops.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops16-1.d b/gas/testsuite/gas/i386/nops16-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops16-1.d
rename to gas/testsuite/gas/i386/nops16-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/nops16-1.s b/gas/testsuite/gas/i386/nops16-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/nops16-1.s
rename to gas/testsuite/gas/i386/nops16-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/opcode-intel.d b/gas/testsuite/gas/i386/opcode-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/opcode-intel.d
rename to gas/testsuite/gas/i386/opcode-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/opcode-suffix.d b/gas/testsuite/gas/i386/opcode-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/opcode-suffix.d
rename to gas/testsuite/gas/i386/opcode-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/opcode.d b/gas/testsuite/gas/i386/opcode.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/opcode.d
rename to gas/testsuite/gas/i386/opcode.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/opcode.s b/gas/testsuite/gas/i386/opcode.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/opcode.s
rename to gas/testsuite/gas/i386/opcode.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/opts-intel.d b/gas/testsuite/gas/i386/opts-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/opts-intel.d
rename to gas/testsuite/gas/i386/opts-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/opts.d b/gas/testsuite/gas/i386/opts.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/opts.d
rename to gas/testsuite/gas/i386/opts.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/opts.s b/gas/testsuite/gas/i386/opts.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/opts.s
rename to gas/testsuite/gas/i386/opts.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/padlock.d b/gas/testsuite/gas/i386/padlock.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/padlock.d
rename to gas/testsuite/gas/i386/padlock.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/padlock.s b/gas/testsuite/gas/i386/padlock.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/padlock.s
rename to gas/testsuite/gas/i386/padlock.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/pcrel.d b/gas/testsuite/gas/i386/pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/pcrel.d
rename to gas/testsuite/gas/i386/pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/pcrel.s b/gas/testsuite/gas/i386/pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/pcrel.s
rename to gas/testsuite/gas/i386/pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/prefix.d b/gas/testsuite/gas/i386/prefix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/prefix.d
rename to gas/testsuite/gas/i386/prefix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/prefix.s b/gas/testsuite/gas/i386/prefix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/prefix.s
rename to gas/testsuite/gas/i386/prefix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rdrnd-intel.d b/gas/testsuite/gas/i386/rdrnd-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rdrnd-intel.d
rename to gas/testsuite/gas/i386/rdrnd-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rdrnd.d b/gas/testsuite/gas/i386/rdrnd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rdrnd.d
rename to gas/testsuite/gas/i386/rdrnd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rdrnd.s b/gas/testsuite/gas/i386/rdrnd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rdrnd.s
rename to gas/testsuite/gas/i386/rdrnd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reg-intel.d b/gas/testsuite/gas/i386/reg-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reg-intel.d
rename to gas/testsuite/gas/i386/reg-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reg.d b/gas/testsuite/gas/i386/reg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reg.d
rename to gas/testsuite/gas/i386/reg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reg.s b/gas/testsuite/gas/i386/reg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reg.s
rename to gas/testsuite/gas/i386/reg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/relax-1.d b/gas/testsuite/gas/i386/relax-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/relax-1.d
rename to gas/testsuite/gas/i386/relax-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/relax-1.s b/gas/testsuite/gas/i386/relax-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/relax-1.s
rename to gas/testsuite/gas/i386/relax-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/relax-2.d b/gas/testsuite/gas/i386/relax-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/relax-2.d
rename to gas/testsuite/gas/i386/relax-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/relax-2.s b/gas/testsuite/gas/i386/relax-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/relax-2.s
rename to gas/testsuite/gas/i386/relax-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/relax.d b/gas/testsuite/gas/i386/relax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/relax.d
rename to gas/testsuite/gas/i386/relax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/relax.s b/gas/testsuite/gas/i386/relax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/relax.s
rename to gas/testsuite/gas/i386/relax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc.d b/gas/testsuite/gas/i386/reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc.d
rename to gas/testsuite/gas/i386/reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc.s b/gas/testsuite/gas/i386/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc.s
rename to gas/testsuite/gas/i386/reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc32.d b/gas/testsuite/gas/i386/reloc32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc32.d
rename to gas/testsuite/gas/i386/reloc32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc32.l b/gas/testsuite/gas/i386/reloc32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc32.l
rename to gas/testsuite/gas/i386/reloc32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc32.s b/gas/testsuite/gas/i386/reloc32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc32.s
rename to gas/testsuite/gas/i386/reloc32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc64.d b/gas/testsuite/gas/i386/reloc64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc64.d
rename to gas/testsuite/gas/i386/reloc64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc64.l b/gas/testsuite/gas/i386/reloc64.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc64.l
rename to gas/testsuite/gas/i386/reloc64.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/reloc64.s b/gas/testsuite/gas/i386/reloc64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/reloc64.s
rename to gas/testsuite/gas/i386/reloc64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rep-suffix.d b/gas/testsuite/gas/i386/rep-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rep-suffix.d
rename to gas/testsuite/gas/i386/rep-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rep-suffix.s b/gas/testsuite/gas/i386/rep-suffix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rep-suffix.s
rename to gas/testsuite/gas/i386/rep-suffix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rep.d b/gas/testsuite/gas/i386/rep.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rep.d
rename to gas/testsuite/gas/i386/rep.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rep.s b/gas/testsuite/gas/i386/rep.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rep.s
rename to gas/testsuite/gas/i386/rep.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rex.d b/gas/testsuite/gas/i386/rex.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rex.d
rename to gas/testsuite/gas/i386/rex.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rex.s b/gas/testsuite/gas/i386/rex.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rex.s
rename to gas/testsuite/gas/i386/rex.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rexw.d b/gas/testsuite/gas/i386/rexw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rexw.d
rename to gas/testsuite/gas/i386/rexw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/rexw.s b/gas/testsuite/gas/i386/rexw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/rexw.s
rename to gas/testsuite/gas/i386/rexw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/secrel.d b/gas/testsuite/gas/i386/secrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/secrel.d
rename to gas/testsuite/gas/i386/secrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/secrel.s b/gas/testsuite/gas/i386/secrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/secrel.s
rename to gas/testsuite/gas/i386/secrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/segment.l b/gas/testsuite/gas/i386/segment.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/segment.l
rename to gas/testsuite/gas/i386/segment.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/segment.s b/gas/testsuite/gas/i386/segment.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/segment.s
rename to gas/testsuite/gas/i386/segment.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sib-intel.d b/gas/testsuite/gas/i386/sib-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sib-intel.d
rename to gas/testsuite/gas/i386/sib-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sib.d b/gas/testsuite/gas/i386/sib.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sib.d
rename to gas/testsuite/gas/i386/sib.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sib.s b/gas/testsuite/gas/i386/sib.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sib.s
rename to gas/testsuite/gas/i386/sib.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/simd-intel.d b/gas/testsuite/gas/i386/simd-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/simd-intel.d
rename to gas/testsuite/gas/i386/simd-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/simd-suffix.d b/gas/testsuite/gas/i386/simd-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/simd-suffix.d
rename to gas/testsuite/gas/i386/simd-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/simd.d b/gas/testsuite/gas/i386/simd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/simd.d
rename to gas/testsuite/gas/i386/simd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/simd.s b/gas/testsuite/gas/i386/simd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/simd.s
rename to gas/testsuite/gas/i386/simd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/smx.d b/gas/testsuite/gas/i386/smx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/smx.d
rename to gas/testsuite/gas/i386/smx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/smx.s b/gas/testsuite/gas/i386/smx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/smx.s
rename to gas/testsuite/gas/i386/smx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/space1.l b/gas/testsuite/gas/i386/space1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/space1.l
rename to gas/testsuite/gas/i386/space1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/space1.s b/gas/testsuite/gas/i386/space1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/space1.s
rename to gas/testsuite/gas/i386/space1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-error.l b/gas/testsuite/gas/i386/sse-check-error.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-error.l
rename to gas/testsuite/gas/i386/sse-check-error.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-error.s b/gas/testsuite/gas/i386/sse-check-error.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-error.s
rename to gas/testsuite/gas/i386/sse-check-error.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-none.d b/gas/testsuite/gas/i386/sse-check-none.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-none.d
rename to gas/testsuite/gas/i386/sse-check-none.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-none.s b/gas/testsuite/gas/i386/sse-check-none.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-none.s
rename to gas/testsuite/gas/i386/sse-check-none.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-warn.d b/gas/testsuite/gas/i386/sse-check-warn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-warn.d
rename to gas/testsuite/gas/i386/sse-check-warn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-warn.e b/gas/testsuite/gas/i386/sse-check-warn.e
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check-warn.e
rename to gas/testsuite/gas/i386/sse-check-warn.e
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check.d b/gas/testsuite/gas/i386/sse-check.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check.d
rename to gas/testsuite/gas/i386/sse-check.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check.s b/gas/testsuite/gas/i386/sse-check.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-check.s
rename to gas/testsuite/gas/i386/sse-check.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-noavx.d b/gas/testsuite/gas/i386/sse-noavx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-noavx.d
rename to gas/testsuite/gas/i386/sse-noavx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse-noavx.s b/gas/testsuite/gas/i386/sse-noavx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse-noavx.s
rename to gas/testsuite/gas/i386/sse-noavx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse2.d b/gas/testsuite/gas/i386/sse2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse2.d
rename to gas/testsuite/gas/i386/sse2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse2.s b/gas/testsuite/gas/i386/sse2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse2.s
rename to gas/testsuite/gas/i386/sse2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx-opts-intel.d b/gas/testsuite/gas/i386/sse2avx-opts-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx-opts-intel.d
rename to gas/testsuite/gas/i386/sse2avx-opts-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx-opts.d b/gas/testsuite/gas/i386/sse2avx-opts.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx-opts.d
rename to gas/testsuite/gas/i386/sse2avx-opts.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx.d b/gas/testsuite/gas/i386/sse2avx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx.d
rename to gas/testsuite/gas/i386/sse2avx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx.s b/gas/testsuite/gas/i386/sse2avx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse2avx.s
rename to gas/testsuite/gas/i386/sse2avx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse3.d b/gas/testsuite/gas/i386/sse3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse3.d
rename to gas/testsuite/gas/i386/sse3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse3.s b/gas/testsuite/gas/i386/sse3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse3.s
rename to gas/testsuite/gas/i386/sse3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_1-intel.d b/gas/testsuite/gas/i386/sse4_1-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_1-intel.d
rename to gas/testsuite/gas/i386/sse4_1-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_1.d b/gas/testsuite/gas/i386/sse4_1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_1.d
rename to gas/testsuite/gas/i386/sse4_1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_1.s b/gas/testsuite/gas/i386/sse4_1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_1.s
rename to gas/testsuite/gas/i386/sse4_1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_2-intel.d b/gas/testsuite/gas/i386/sse4_2-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_2-intel.d
rename to gas/testsuite/gas/i386/sse4_2-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_2.d b/gas/testsuite/gas/i386/sse4_2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_2.d
rename to gas/testsuite/gas/i386/sse4_2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_2.s b/gas/testsuite/gas/i386/sse4_2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sse4_2.s
rename to gas/testsuite/gas/i386/sse4_2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ssemmx2.d b/gas/testsuite/gas/i386/ssemmx2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ssemmx2.d
rename to gas/testsuite/gas/i386/ssemmx2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ssemmx2.s b/gas/testsuite/gas/i386/ssemmx2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ssemmx2.s
rename to gas/testsuite/gas/i386/ssemmx2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ssse3.d b/gas/testsuite/gas/i386/ssse3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ssse3.d
rename to gas/testsuite/gas/i386/ssse3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/ssse3.s b/gas/testsuite/gas/i386/ssse3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/ssse3.s
rename to gas/testsuite/gas/i386/ssse3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/string-bad.l b/gas/testsuite/gas/i386/string-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/string-bad.l
rename to gas/testsuite/gas/i386/string-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/string-bad.s b/gas/testsuite/gas/i386/string-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/string-bad.s
rename to gas/testsuite/gas/i386/string-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/string-ok.d b/gas/testsuite/gas/i386/string-ok.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/string-ok.d
rename to gas/testsuite/gas/i386/string-ok.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/string-ok.e b/gas/testsuite/gas/i386/string-ok.e
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/string-ok.e
rename to gas/testsuite/gas/i386/string-ok.e
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/string-ok.s b/gas/testsuite/gas/i386/string-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/string-ok.s
rename to gas/testsuite/gas/i386/string-ok.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sub.d b/gas/testsuite/gas/i386/sub.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sub.d
rename to gas/testsuite/gas/i386/sub.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/sub.s b/gas/testsuite/gas/i386/sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/sub.s
rename to gas/testsuite/gas/i386/sub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/suffix.d b/gas/testsuite/gas/i386/suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/suffix.d
rename to gas/testsuite/gas/i386/suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/suffix.s b/gas/testsuite/gas/i386/suffix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/suffix.s
rename to gas/testsuite/gas/i386/suffix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/svme.d b/gas/testsuite/gas/i386/svme.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/svme.d
rename to gas/testsuite/gas/i386/svme.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/svme.s b/gas/testsuite/gas/i386/svme.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/svme.s
rename to gas/testsuite/gas/i386/svme.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/svme64.d b/gas/testsuite/gas/i386/svme64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/svme64.d
rename to gas/testsuite/gas/i386/svme64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/tlsd.d b/gas/testsuite/gas/i386/tlsd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/tlsd.d
rename to gas/testsuite/gas/i386/tlsd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/tlsd.s b/gas/testsuite/gas/i386/tlsd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/tlsd.s
rename to gas/testsuite/gas/i386/tlsd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/tlsnopic.d b/gas/testsuite/gas/i386/tlsnopic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/tlsnopic.d
rename to gas/testsuite/gas/i386/tlsnopic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/tlsnopic.s b/gas/testsuite/gas/i386/tlsnopic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/tlsnopic.s
rename to gas/testsuite/gas/i386/tlsnopic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/tlspic.d b/gas/testsuite/gas/i386/tlspic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/tlspic.d
rename to gas/testsuite/gas/i386/tlspic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/tlspic.s b/gas/testsuite/gas/i386/tlspic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/tlspic.s
rename to gas/testsuite/gas/i386/tlspic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/vmx.d b/gas/testsuite/gas/i386/vmx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/vmx.d
rename to gas/testsuite/gas/i386/vmx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/vmx.s b/gas/testsuite/gas/i386/vmx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/vmx.s
rename to gas/testsuite/gas/i386/vmx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/white.l b/gas/testsuite/gas/i386/white.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/white.l
rename to gas/testsuite/gas/i386/white.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/white.s b/gas/testsuite/gas/i386/white.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/white.s
rename to gas/testsuite/gas/i386/white.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-addr32-intel.d b/gas/testsuite/gas/i386/x86-64-addr32-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-addr32-intel.d
rename to gas/testsuite/gas/i386/x86-64-addr32-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-addr32.d b/gas/testsuite/gas/i386/x86-64-addr32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-addr32.d
rename to gas/testsuite/gas/i386/x86-64-addr32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-addr32.s b/gas/testsuite/gas/i386/x86-64-addr32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-addr32.s
rename to gas/testsuite/gas/i386/x86-64-addr32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-aes-intel.d b/gas/testsuite/gas/i386/x86-64-aes-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-aes-intel.d
rename to gas/testsuite/gas/i386/x86-64-aes-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-aes.d b/gas/testsuite/gas/i386/x86-64-aes.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-aes.d
rename to gas/testsuite/gas/i386/x86-64-aes.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-aes.s b/gas/testsuite/gas/i386/x86-64-aes.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-aes.s
rename to gas/testsuite/gas/i386/x86-64-aes.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-amdfam10.d b/gas/testsuite/gas/i386/x86-64-amdfam10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-amdfam10.d
rename to gas/testsuite/gas/i386/x86-64-amdfam10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-amdfam10.s b/gas/testsuite/gas/i386/x86-64-amdfam10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-amdfam10.s
rename to gas/testsuite/gas/i386/x86-64-amdfam10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-1.d b/gas/testsuite/gas/i386/x86-64-arch-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-1.d
rename to gas/testsuite/gas/i386/x86-64-arch-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-1.s b/gas/testsuite/gas/i386/x86-64-arch-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-1.s
rename to gas/testsuite/gas/i386/x86-64-arch-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-2.d b/gas/testsuite/gas/i386/x86-64-arch-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-2.d
rename to gas/testsuite/gas/i386/x86-64-arch-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-2.s b/gas/testsuite/gas/i386/x86-64-arch-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-arch-2.s
rename to gas/testsuite/gas/i386/x86-64-arch-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-intel.d b/gas/testsuite/gas/i386/x86-64-avx-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-intel.d
rename to gas/testsuite/gas/i386/x86-64-avx-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-scalar-intel.d b/gas/testsuite/gas/i386/x86-64-avx-scalar-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-scalar-intel.d
rename to gas/testsuite/gas/i386/x86-64-avx-scalar-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-scalar.d b/gas/testsuite/gas/i386/x86-64-avx-scalar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-scalar.d
rename to gas/testsuite/gas/i386/x86-64-avx-scalar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-scalar.s b/gas/testsuite/gas/i386/x86-64-avx-scalar.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-scalar.s
rename to gas/testsuite/gas/i386/x86-64-avx-scalar.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-swap-intel.d b/gas/testsuite/gas/i386/x86-64-avx-swap-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-swap-intel.d
rename to gas/testsuite/gas/i386/x86-64-avx-swap-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-swap.d b/gas/testsuite/gas/i386/x86-64-avx-swap.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-swap.d
rename to gas/testsuite/gas/i386/x86-64-avx-swap.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-swap.s b/gas/testsuite/gas/i386/x86-64-avx-swap.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx-swap.s
rename to gas/testsuite/gas/i386/x86-64-avx-swap.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx.d b/gas/testsuite/gas/i386/x86-64-avx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx.d
rename to gas/testsuite/gas/i386/x86-64-avx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx.s b/gas/testsuite/gas/i386/x86-64-avx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-avx.s
rename to gas/testsuite/gas/i386/x86-64-avx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-branch.d b/gas/testsuite/gas/i386/x86-64-branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-branch.d
rename to gas/testsuite/gas/i386/x86-64-branch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-branch.s b/gas/testsuite/gas/i386/x86-64-branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-branch.s
rename to gas/testsuite/gas/i386/x86-64-branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-cbw-intel.d b/gas/testsuite/gas/i386/x86-64-cbw-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-cbw-intel.d
rename to gas/testsuite/gas/i386/x86-64-cbw-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-cbw.d b/gas/testsuite/gas/i386/x86-64-cbw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-cbw.d
rename to gas/testsuite/gas/i386/x86-64-cbw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-cbw.s b/gas/testsuite/gas/i386/x86-64-cbw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-cbw.s
rename to gas/testsuite/gas/i386/x86-64-cbw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-clmul-intel.d b/gas/testsuite/gas/i386/x86-64-clmul-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-clmul-intel.d
rename to gas/testsuite/gas/i386/x86-64-clmul-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-clmul.d b/gas/testsuite/gas/i386/x86-64-clmul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-clmul.d
rename to gas/testsuite/gas/i386/x86-64-clmul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-clmul.s b/gas/testsuite/gas/i386/x86-64-clmul.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-clmul.s
rename to gas/testsuite/gas/i386/x86-64-clmul.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crc32-intel.d b/gas/testsuite/gas/i386/x86-64-crc32-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crc32-intel.d
rename to gas/testsuite/gas/i386/x86-64-crc32-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crc32.d b/gas/testsuite/gas/i386/x86-64-crc32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crc32.d
rename to gas/testsuite/gas/i386/x86-64-crc32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crc32.s b/gas/testsuite/gas/i386/x86-64-crc32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crc32.s
rename to gas/testsuite/gas/i386/x86-64-crc32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crx-suffix.d b/gas/testsuite/gas/i386/x86-64-crx-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crx-suffix.d
rename to gas/testsuite/gas/i386/x86-64-crx-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crx.d b/gas/testsuite/gas/i386/x86-64-crx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crx.d
rename to gas/testsuite/gas/i386/x86-64-crx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crx.s b/gas/testsuite/gas/i386/x86-64-crx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-crx.s
rename to gas/testsuite/gas/i386/x86-64-crx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp-intel.d b/gas/testsuite/gas/i386/x86-64-disp-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp-intel.d
rename to gas/testsuite/gas/i386/x86-64-disp-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp.d b/gas/testsuite/gas/i386/x86-64-disp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp.d
rename to gas/testsuite/gas/i386/x86-64-disp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp.s b/gas/testsuite/gas/i386/x86-64-disp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp.s
rename to gas/testsuite/gas/i386/x86-64-disp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp32.d b/gas/testsuite/gas/i386/x86-64-disp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp32.d
rename to gas/testsuite/gas/i386/x86-64-disp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp32.s b/gas/testsuite/gas/i386/x86-64-disp32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-disp32.s
rename to gas/testsuite/gas/i386/x86-64-disp32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-drx-suffix.d b/gas/testsuite/gas/i386/x86-64-drx-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-drx-suffix.d
rename to gas/testsuite/gas/i386/x86-64-drx-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-drx.d b/gas/testsuite/gas/i386/x86-64-drx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-drx.d
rename to gas/testsuite/gas/i386/x86-64-drx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-drx.s b/gas/testsuite/gas/i386/x86-64-drx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-drx.s
rename to gas/testsuite/gas/i386/x86-64-drx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-dw2-compress-2.d b/gas/testsuite/gas/i386/x86-64-dw2-compress-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-dw2-compress-2.d
rename to gas/testsuite/gas/i386/x86-64-dw2-compress-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-dw2-compress-2.s b/gas/testsuite/gas/i386/x86-64-dw2-compress-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-dw2-compress-2.s
rename to gas/testsuite/gas/i386/x86-64-dw2-compress-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ept-intel.d b/gas/testsuite/gas/i386/x86-64-ept-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ept-intel.d
rename to gas/testsuite/gas/i386/x86-64-ept-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ept.d b/gas/testsuite/gas/i386/x86-64-ept.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ept.d
rename to gas/testsuite/gas/i386/x86-64-ept.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ept.s b/gas/testsuite/gas/i386/x86-64-ept.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ept.s
rename to gas/testsuite/gas/i386/x86-64-ept.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-f16c-intel.d b/gas/testsuite/gas/i386/x86-64-f16c-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-f16c-intel.d
rename to gas/testsuite/gas/i386/x86-64-f16c-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-f16c.d b/gas/testsuite/gas/i386/x86-64-f16c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-f16c.d
rename to gas/testsuite/gas/i386/x86-64-f16c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-f16c.s b/gas/testsuite/gas/i386/x86-64-f16c.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-f16c.s
rename to gas/testsuite/gas/i386/x86-64-f16c.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-intel.d b/gas/testsuite/gas/i386/x86-64-fma-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-intel.d
rename to gas/testsuite/gas/i386/x86-64-fma-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-scalar-intel.d b/gas/testsuite/gas/i386/x86-64-fma-scalar-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-scalar-intel.d
rename to gas/testsuite/gas/i386/x86-64-fma-scalar-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-scalar.d b/gas/testsuite/gas/i386/x86-64-fma-scalar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-scalar.d
rename to gas/testsuite/gas/i386/x86-64-fma-scalar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-scalar.s b/gas/testsuite/gas/i386/x86-64-fma-scalar.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma-scalar.s
rename to gas/testsuite/gas/i386/x86-64-fma-scalar.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma.d b/gas/testsuite/gas/i386/x86-64-fma.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma.d
rename to gas/testsuite/gas/i386/x86-64-fma.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma.s b/gas/testsuite/gas/i386/x86-64-fma.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma.s
rename to gas/testsuite/gas/i386/x86-64-fma.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma4.d b/gas/testsuite/gas/i386/x86-64-fma4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma4.d
rename to gas/testsuite/gas/i386/x86-64-fma4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma4.s b/gas/testsuite/gas/i386/x86-64-fma4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fma4.s
rename to gas/testsuite/gas/i386/x86-64-fma4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fsgs-intel.d b/gas/testsuite/gas/i386/x86-64-fsgs-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fsgs-intel.d
rename to gas/testsuite/gas/i386/x86-64-fsgs-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fsgs.d b/gas/testsuite/gas/i386/x86-64-fsgs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fsgs.d
rename to gas/testsuite/gas/i386/x86-64-fsgs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fsgs.s b/gas/testsuite/gas/i386/x86-64-fsgs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fsgs.s
rename to gas/testsuite/gas/i386/x86-64-fsgs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fxsave-intel.d b/gas/testsuite/gas/i386/x86-64-fxsave-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fxsave-intel.d
rename to gas/testsuite/gas/i386/x86-64-fxsave-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fxsave.d b/gas/testsuite/gas/i386/x86-64-fxsave.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fxsave.d
rename to gas/testsuite/gas/i386/x86-64-fxsave.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fxsave.s b/gas/testsuite/gas/i386/x86-64-fxsave.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-fxsave.s
rename to gas/testsuite/gas/i386/x86-64-fxsave.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-gidt.d b/gas/testsuite/gas/i386/x86-64-gidt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-gidt.d
rename to gas/testsuite/gas/i386/x86-64-gidt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-gidt.s b/gas/testsuite/gas/i386/x86-64-gidt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-gidt.s
rename to gas/testsuite/gas/i386/x86-64-gidt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ifunc.d b/gas/testsuite/gas/i386/x86-64-ifunc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ifunc.d
rename to gas/testsuite/gas/i386/x86-64-ifunc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-intel64.d b/gas/testsuite/gas/i386/x86-64-intel64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-intel64.d
rename to gas/testsuite/gas/i386/x86-64-intel64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-intel64.s b/gas/testsuite/gas/i386/x86-64-intel64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-intel64.s
rename to gas/testsuite/gas/i386/x86-64-intel64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-avx.l b/gas/testsuite/gas/i386/x86-64-inval-avx.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-avx.l
rename to gas/testsuite/gas/i386/x86-64-inval-avx.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-avx.s b/gas/testsuite/gas/i386/x86-64-inval-avx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-avx.s
rename to gas/testsuite/gas/i386/x86-64-inval-avx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-crc32.l b/gas/testsuite/gas/i386/x86-64-inval-crc32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-crc32.l
rename to gas/testsuite/gas/i386/x86-64-inval-crc32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-crc32.s b/gas/testsuite/gas/i386/x86-64-inval-crc32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-crc32.s
rename to gas/testsuite/gas/i386/x86-64-inval-crc32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-ept.l b/gas/testsuite/gas/i386/x86-64-inval-ept.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-ept.l
rename to gas/testsuite/gas/i386/x86-64-inval-ept.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-ept.s b/gas/testsuite/gas/i386/x86-64-inval-ept.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-ept.s
rename to gas/testsuite/gas/i386/x86-64-inval-ept.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-movbe.l b/gas/testsuite/gas/i386/x86-64-inval-movbe.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-movbe.l
rename to gas/testsuite/gas/i386/x86-64-inval-movbe.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-movbe.s b/gas/testsuite/gas/i386/x86-64-inval-movbe.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-movbe.s
rename to gas/testsuite/gas/i386/x86-64-inval-movbe.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-seg.l b/gas/testsuite/gas/i386/x86-64-inval-seg.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-seg.l
rename to gas/testsuite/gas/i386/x86-64-inval-seg.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-seg.s b/gas/testsuite/gas/i386/x86-64-inval-seg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval-seg.s
rename to gas/testsuite/gas/i386/x86-64-inval-seg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval.l b/gas/testsuite/gas/i386/x86-64-inval.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval.l
rename to gas/testsuite/gas/i386/x86-64-inval.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval.s b/gas/testsuite/gas/i386/x86-64-inval.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-inval.s
rename to gas/testsuite/gas/i386/x86-64-inval.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io-intel.d b/gas/testsuite/gas/i386/x86-64-io-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io-intel.d
rename to gas/testsuite/gas/i386/x86-64-io-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io-suffix.d b/gas/testsuite/gas/i386/x86-64-io-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io-suffix.d
rename to gas/testsuite/gas/i386/x86-64-io-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io.d b/gas/testsuite/gas/i386/x86-64-io.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io.d
rename to gas/testsuite/gas/i386/x86-64-io.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io.s b/gas/testsuite/gas/i386/x86-64-io.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-io.s
rename to gas/testsuite/gas/i386/x86-64-io.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-localpic.d b/gas/testsuite/gas/i386/x86-64-localpic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-localpic.d
rename to gas/testsuite/gas/i386/x86-64-localpic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-localpic.s b/gas/testsuite/gas/i386/x86-64-localpic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-localpic.s
rename to gas/testsuite/gas/i386/x86-64-localpic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lock-1-intel.d b/gas/testsuite/gas/i386/x86-64-lock-1-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lock-1-intel.d
rename to gas/testsuite/gas/i386/x86-64-lock-1-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lock-1.d b/gas/testsuite/gas/i386/x86-64-lock-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lock-1.d
rename to gas/testsuite/gas/i386/x86-64-lock-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lock-1.s b/gas/testsuite/gas/i386/x86-64-lock-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lock-1.s
rename to gas/testsuite/gas/i386/x86-64-lock-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lockbad-1.l b/gas/testsuite/gas/i386/x86-64-lockbad-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lockbad-1.l
rename to gas/testsuite/gas/i386/x86-64-lockbad-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lockbad-1.s b/gas/testsuite/gas/i386/x86-64-lockbad-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lockbad-1.s
rename to gas/testsuite/gas/i386/x86-64-lockbad-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-long-1-intel.d b/gas/testsuite/gas/i386/x86-64-long-1-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-long-1-intel.d
rename to gas/testsuite/gas/i386/x86-64-long-1-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-long-1.d b/gas/testsuite/gas/i386/x86-64-long-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-long-1.d
rename to gas/testsuite/gas/i386/x86-64-long-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-long-1.s b/gas/testsuite/gas/i386/x86-64-long-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-long-1.s
rename to gas/testsuite/gas/i386/x86-64-long-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lwp.d b/gas/testsuite/gas/i386/x86-64-lwp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lwp.d
rename to gas/testsuite/gas/i386/x86-64-lwp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lwp.s b/gas/testsuite/gas/i386/x86-64-lwp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-lwp.s
rename to gas/testsuite/gas/i386/x86-64-lwp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-mem-intel.d b/gas/testsuite/gas/i386/x86-64-mem-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-mem-intel.d
rename to gas/testsuite/gas/i386/x86-64-mem-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-mem.d b/gas/testsuite/gas/i386/x86-64-mem.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-mem.d
rename to gas/testsuite/gas/i386/x86-64-mem.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-mem.s b/gas/testsuite/gas/i386/x86-64-mem.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-mem.s
rename to gas/testsuite/gas/i386/x86-64-mem.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-movbe-intel.d b/gas/testsuite/gas/i386/x86-64-movbe-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-movbe-intel.d
rename to gas/testsuite/gas/i386/x86-64-movbe-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-movbe.d b/gas/testsuite/gas/i386/x86-64-movbe.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-movbe.d
rename to gas/testsuite/gas/i386/x86-64-movbe.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-movbe.s b/gas/testsuite/gas/i386/x86-64-movbe.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-movbe.s
rename to gas/testsuite/gas/i386/x86-64-movbe.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d b/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d
rename to gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-core2.d b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
rename to gas/testsuite/gas/i386/x86-64-nops-1-core2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-g64.d b/gas/testsuite/gas/i386/x86-64-nops-1-g64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-g64.d
rename to gas/testsuite/gas/i386/x86-64-nops-1-g64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-k8.d b/gas/testsuite/gas/i386/x86-64-nops-1-k8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-k8.d
rename to gas/testsuite/gas/i386/x86-64-nops-1-k8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d b/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
rename to gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-pentium.d b/gas/testsuite/gas/i386/x86-64-nops-1-pentium.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1-pentium.d
rename to gas/testsuite/gas/i386/x86-64-nops-1-pentium.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1.d b/gas/testsuite/gas/i386/x86-64-nops-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-1.d
rename to gas/testsuite/gas/i386/x86-64-nops-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-2.d b/gas/testsuite/gas/i386/x86-64-nops-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-2.d
rename to gas/testsuite/gas/i386/x86-64-nops-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-3.d b/gas/testsuite/gas/i386/x86-64-nops-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-3.d
rename to gas/testsuite/gas/i386/x86-64-nops-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-4-core2.d b/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-4-core2.d
rename to gas/testsuite/gas/i386/x86-64-nops-4-core2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-4-k8.d b/gas/testsuite/gas/i386/x86-64-nops-4-k8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-4-k8.d
rename to gas/testsuite/gas/i386/x86-64-nops-4-k8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-4.d b/gas/testsuite/gas/i386/x86-64-nops-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-4.d
rename to gas/testsuite/gas/i386/x86-64-nops-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-5-k8.d b/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-5-k8.d
rename to gas/testsuite/gas/i386/x86-64-nops-5-k8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-5.d b/gas/testsuite/gas/i386/x86-64-nops-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops-5.d
rename to gas/testsuite/gas/i386/x86-64-nops-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops.d b/gas/testsuite/gas/i386/x86-64-nops.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops.d
rename to gas/testsuite/gas/i386/x86-64-nops.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops.s b/gas/testsuite/gas/i386/x86-64-nops.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-nops.s
rename to gas/testsuite/gas/i386/x86-64-nops.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode-inval-intel.d b/gas/testsuite/gas/i386/x86-64-opcode-inval-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode-inval-intel.d
rename to gas/testsuite/gas/i386/x86-64-opcode-inval-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode-inval.d b/gas/testsuite/gas/i386/x86-64-opcode-inval.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode-inval.d
rename to gas/testsuite/gas/i386/x86-64-opcode-inval.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode-inval.s b/gas/testsuite/gas/i386/x86-64-opcode-inval.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode-inval.s
rename to gas/testsuite/gas/i386/x86-64-opcode-inval.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode.d b/gas/testsuite/gas/i386/x86-64-opcode.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode.d
rename to gas/testsuite/gas/i386/x86-64-opcode.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode.s b/gas/testsuite/gas/i386/x86-64-opcode.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opcode.s
rename to gas/testsuite/gas/i386/x86-64-opcode.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opts-intel.d b/gas/testsuite/gas/i386/x86-64-opts-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opts-intel.d
rename to gas/testsuite/gas/i386/x86-64-opts-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opts.d b/gas/testsuite/gas/i386/x86-64-opts.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opts.d
rename to gas/testsuite/gas/i386/x86-64-opts.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opts.s b/gas/testsuite/gas/i386/x86-64-opts.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-opts.s
rename to gas/testsuite/gas/i386/x86-64-opts.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-pcrel.d b/gas/testsuite/gas/i386/x86-64-pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-pcrel.d
rename to gas/testsuite/gas/i386/x86-64-pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-pcrel.s b/gas/testsuite/gas/i386/x86-64-pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-pcrel.s
rename to gas/testsuite/gas/i386/x86-64-pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rdrnd-intel.d b/gas/testsuite/gas/i386/x86-64-rdrnd-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rdrnd-intel.d
rename to gas/testsuite/gas/i386/x86-64-rdrnd-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rdrnd.d b/gas/testsuite/gas/i386/x86-64-rdrnd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rdrnd.d
rename to gas/testsuite/gas/i386/x86-64-rdrnd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rdrnd.s b/gas/testsuite/gas/i386/x86-64-rdrnd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rdrnd.s
rename to gas/testsuite/gas/i386/x86-64-rdrnd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-reg-intel.d b/gas/testsuite/gas/i386/x86-64-reg-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-reg-intel.d
rename to gas/testsuite/gas/i386/x86-64-reg-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-reg.d b/gas/testsuite/gas/i386/x86-64-reg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-reg.d
rename to gas/testsuite/gas/i386/x86-64-reg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-reg.s b/gas/testsuite/gas/i386/x86-64-reg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-reg.s
rename to gas/testsuite/gas/i386/x86-64-reg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-relax-1.d b/gas/testsuite/gas/i386/x86-64-relax-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-relax-1.d
rename to gas/testsuite/gas/i386/x86-64-relax-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-relax-1.s b/gas/testsuite/gas/i386/x86-64-relax-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-relax-1.s
rename to gas/testsuite/gas/i386/x86-64-relax-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep-suffix.d b/gas/testsuite/gas/i386/x86-64-rep-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep-suffix.d
rename to gas/testsuite/gas/i386/x86-64-rep-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep-suffix.s b/gas/testsuite/gas/i386/x86-64-rep-suffix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep-suffix.s
rename to gas/testsuite/gas/i386/x86-64-rep-suffix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep.d b/gas/testsuite/gas/i386/x86-64-rep.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep.d
rename to gas/testsuite/gas/i386/x86-64-rep.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep.s b/gas/testsuite/gas/i386/x86-64-rep.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rep.s
rename to gas/testsuite/gas/i386/x86-64-rep.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rip-intel.d b/gas/testsuite/gas/i386/x86-64-rip-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rip-intel.d
rename to gas/testsuite/gas/i386/x86-64-rip-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rip.d b/gas/testsuite/gas/i386/x86-64-rip.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rip.d
rename to gas/testsuite/gas/i386/x86-64-rip.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rip.s b/gas/testsuite/gas/i386/x86-64-rip.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-rip.s
rename to gas/testsuite/gas/i386/x86-64-rip.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-segment.l b/gas/testsuite/gas/i386/x86-64-segment.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-segment.l
rename to gas/testsuite/gas/i386/x86-64-segment.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-segment.s b/gas/testsuite/gas/i386/x86-64-segment.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-segment.s
rename to gas/testsuite/gas/i386/x86-64-segment.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sib-intel.d b/gas/testsuite/gas/i386/x86-64-sib-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sib-intel.d
rename to gas/testsuite/gas/i386/x86-64-sib-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sib.d b/gas/testsuite/gas/i386/x86-64-sib.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sib.d
rename to gas/testsuite/gas/i386/x86-64-sib.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sib.s b/gas/testsuite/gas/i386/x86-64-sib.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sib.s
rename to gas/testsuite/gas/i386/x86-64-sib.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd-intel.d b/gas/testsuite/gas/i386/x86-64-simd-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd-intel.d
rename to gas/testsuite/gas/i386/x86-64-simd-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd-suffix.d b/gas/testsuite/gas/i386/x86-64-simd-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd-suffix.d
rename to gas/testsuite/gas/i386/x86-64-simd-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd.d b/gas/testsuite/gas/i386/x86-64-simd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd.d
rename to gas/testsuite/gas/i386/x86-64-simd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd.s b/gas/testsuite/gas/i386/x86-64-simd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-simd.s
rename to gas/testsuite/gas/i386/x86-64-simd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-error.l b/gas/testsuite/gas/i386/x86-64-sse-check-error.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-error.l
rename to gas/testsuite/gas/i386/x86-64-sse-check-error.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-error.s b/gas/testsuite/gas/i386/x86-64-sse-check-error.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-error.s
rename to gas/testsuite/gas/i386/x86-64-sse-check-error.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-none.d b/gas/testsuite/gas/i386/x86-64-sse-check-none.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-none.d
rename to gas/testsuite/gas/i386/x86-64-sse-check-none.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-warn.d b/gas/testsuite/gas/i386/x86-64-sse-check-warn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check-warn.d
rename to gas/testsuite/gas/i386/x86-64-sse-check-warn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check.d b/gas/testsuite/gas/i386/x86-64-sse-check.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-check.d
rename to gas/testsuite/gas/i386/x86-64-sse-check.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-noavx.d b/gas/testsuite/gas/i386/x86-64-sse-noavx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-noavx.d
rename to gas/testsuite/gas/i386/x86-64-sse-noavx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-noavx.s b/gas/testsuite/gas/i386/x86-64-sse-noavx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse-noavx.s
rename to gas/testsuite/gas/i386/x86-64-sse-noavx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d b/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
rename to gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d b/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
rename to gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx.d b/gas/testsuite/gas/i386/x86-64-sse2avx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx.d
rename to gas/testsuite/gas/i386/x86-64-sse2avx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx.s b/gas/testsuite/gas/i386/x86-64-sse2avx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse2avx.s
rename to gas/testsuite/gas/i386/x86-64-sse2avx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse3.d b/gas/testsuite/gas/i386/x86-64-sse3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse3.d
rename to gas/testsuite/gas/i386/x86-64-sse3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse3.s b/gas/testsuite/gas/i386/x86-64-sse3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse3.s
rename to gas/testsuite/gas/i386/x86-64-sse3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_1-intel.d b/gas/testsuite/gas/i386/x86-64-sse4_1-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_1-intel.d
rename to gas/testsuite/gas/i386/x86-64-sse4_1-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_1.d b/gas/testsuite/gas/i386/x86-64-sse4_1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_1.d
rename to gas/testsuite/gas/i386/x86-64-sse4_1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_1.s b/gas/testsuite/gas/i386/x86-64-sse4_1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_1.s
rename to gas/testsuite/gas/i386/x86-64-sse4_1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_2-intel.d b/gas/testsuite/gas/i386/x86-64-sse4_2-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_2-intel.d
rename to gas/testsuite/gas/i386/x86-64-sse4_2-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_2.d b/gas/testsuite/gas/i386/x86-64-sse4_2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_2.d
rename to gas/testsuite/gas/i386/x86-64-sse4_2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_2.s b/gas/testsuite/gas/i386/x86-64-sse4_2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-sse4_2.s
rename to gas/testsuite/gas/i386/x86-64-sse4_2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ssse3.d b/gas/testsuite/gas/i386/x86-64-ssse3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ssse3.d
rename to gas/testsuite/gas/i386/x86-64-ssse3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ssse3.s b/gas/testsuite/gas/i386/x86-64-ssse3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-ssse3.s
rename to gas/testsuite/gas/i386/x86-64-ssse3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack-intel.d b/gas/testsuite/gas/i386/x86-64-stack-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack-intel.d
rename to gas/testsuite/gas/i386/x86-64-stack-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack-suffix.d b/gas/testsuite/gas/i386/x86-64-stack-suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack-suffix.d
rename to gas/testsuite/gas/i386/x86-64-stack-suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack.d b/gas/testsuite/gas/i386/x86-64-stack.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack.d
rename to gas/testsuite/gas/i386/x86-64-stack.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack.s b/gas/testsuite/gas/i386/x86-64-stack.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-stack.s
rename to gas/testsuite/gas/i386/x86-64-stack.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-unwind.d b/gas/testsuite/gas/i386/x86-64-unwind.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-unwind.d
rename to gas/testsuite/gas/i386/x86-64-unwind.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-unwind.s b/gas/testsuite/gas/i386/x86-64-unwind.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-unwind.s
rename to gas/testsuite/gas/i386/x86-64-unwind.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-vmx.d b/gas/testsuite/gas/i386/x86-64-vmx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-vmx.d
rename to gas/testsuite/gas/i386/x86-64-vmx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-vmx.s b/gas/testsuite/gas/i386/x86-64-vmx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-vmx.s
rename to gas/testsuite/gas/i386/x86-64-vmx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-w64-pcrel.d b/gas/testsuite/gas/i386/x86-64-w64-pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-w64-pcrel.d
rename to gas/testsuite/gas/i386/x86-64-w64-pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xop.d b/gas/testsuite/gas/i386/x86-64-xop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xop.d
rename to gas/testsuite/gas/i386/x86-64-xop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xop.s b/gas/testsuite/gas/i386/x86-64-xop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xop.s
rename to gas/testsuite/gas/i386/x86-64-xop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xsave-intel.d b/gas/testsuite/gas/i386/x86-64-xsave-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xsave-intel.d
rename to gas/testsuite/gas/i386/x86-64-xsave-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xsave.d b/gas/testsuite/gas/i386/x86-64-xsave.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xsave.d
rename to gas/testsuite/gas/i386/x86-64-xsave.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xsave.s b/gas/testsuite/gas/i386/x86-64-xsave.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86-64-xsave.s
rename to gas/testsuite/gas/i386/x86-64-xsave.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86_64.d b/gas/testsuite/gas/i386/x86_64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86_64.d
rename to gas/testsuite/gas/i386/x86_64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/x86_64.s b/gas/testsuite/gas/i386/x86_64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/x86_64.s
rename to gas/testsuite/gas/i386/x86_64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/xop.d b/gas/testsuite/gas/i386/xop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/xop.d
rename to gas/testsuite/gas/i386/xop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/xop.s b/gas/testsuite/gas/i386/xop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/xop.s
rename to gas/testsuite/gas/i386/xop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/xsave-intel.d b/gas/testsuite/gas/i386/xsave-intel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/xsave-intel.d
rename to gas/testsuite/gas/i386/xsave-intel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/xsave.d b/gas/testsuite/gas/i386/xsave.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/xsave.d
rename to gas/testsuite/gas/i386/xsave.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i386/xsave.s b/gas/testsuite/gas/i386/xsave.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i386/xsave.s
rename to gas/testsuite/gas/i386/xsave.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/README.i860 b/gas/testsuite/gas/i860/README.i860
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/README.i860
rename to gas/testsuite/gas/i860/README.i860
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/bitwise.d b/gas/testsuite/gas/i860/bitwise.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/bitwise.d
rename to gas/testsuite/gas/i860/bitwise.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/bitwise.s b/gas/testsuite/gas/i860/bitwise.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/bitwise.s
rename to gas/testsuite/gas/i860/bitwise.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/branch.d b/gas/testsuite/gas/i860/branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/branch.d
rename to gas/testsuite/gas/i860/branch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/branch.s b/gas/testsuite/gas/i860/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/branch.s
rename to gas/testsuite/gas/i860/branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/bte.d b/gas/testsuite/gas/i860/bte.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/bte.d
rename to gas/testsuite/gas/i860/bte.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/bte.s b/gas/testsuite/gas/i860/bte.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/bte.s
rename to gas/testsuite/gas/i860/bte.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-align01.d b/gas/testsuite/gas/i860/dir-align01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-align01.d
rename to gas/testsuite/gas/i860/dir-align01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-align01.s b/gas/testsuite/gas/i860/dir-align01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-align01.s
rename to gas/testsuite/gas/i860/dir-align01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel01.d b/gas/testsuite/gas/i860/dir-intel01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel01.d
rename to gas/testsuite/gas/i860/dir-intel01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel01.s b/gas/testsuite/gas/i860/dir-intel01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel01.s
rename to gas/testsuite/gas/i860/dir-intel01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel02.d b/gas/testsuite/gas/i860/dir-intel02.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel02.d
rename to gas/testsuite/gas/i860/dir-intel02.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel02.s b/gas/testsuite/gas/i860/dir-intel02.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel02.s
rename to gas/testsuite/gas/i860/dir-intel02.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel03-err.l b/gas/testsuite/gas/i860/dir-intel03-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel03-err.l
rename to gas/testsuite/gas/i860/dir-intel03-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel03-err.s b/gas/testsuite/gas/i860/dir-intel03-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dir-intel03-err.s
rename to gas/testsuite/gas/i860/dir-intel03-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dual01.d b/gas/testsuite/gas/i860/dual01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dual01.d
rename to gas/testsuite/gas/i860/dual01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dual01.s b/gas/testsuite/gas/i860/dual01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dual01.s
rename to gas/testsuite/gas/i860/dual01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dual02-err.l b/gas/testsuite/gas/i860/dual02-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dual02-err.l
rename to gas/testsuite/gas/i860/dual02-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dual02-err.s b/gas/testsuite/gas/i860/dual02-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dual02-err.s
rename to gas/testsuite/gas/i860/dual02-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dual03.d b/gas/testsuite/gas/i860/dual03.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dual03.d
rename to gas/testsuite/gas/i860/dual03.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/dual03.s b/gas/testsuite/gas/i860/dual03.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/dual03.s
rename to gas/testsuite/gas/i860/dual03.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst01.d b/gas/testsuite/gas/i860/fldst01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst01.d
rename to gas/testsuite/gas/i860/fldst01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst01.s b/gas/testsuite/gas/i860/fldst01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst01.s
rename to gas/testsuite/gas/i860/fldst01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst02.d b/gas/testsuite/gas/i860/fldst02.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst02.d
rename to gas/testsuite/gas/i860/fldst02.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst02.s b/gas/testsuite/gas/i860/fldst02.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst02.s
rename to gas/testsuite/gas/i860/fldst02.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst03.d b/gas/testsuite/gas/i860/fldst03.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst03.d
rename to gas/testsuite/gas/i860/fldst03.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst03.s b/gas/testsuite/gas/i860/fldst03.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst03.s
rename to gas/testsuite/gas/i860/fldst03.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst04.d b/gas/testsuite/gas/i860/fldst04.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst04.d
rename to gas/testsuite/gas/i860/fldst04.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst04.s b/gas/testsuite/gas/i860/fldst04.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst04.s
rename to gas/testsuite/gas/i860/fldst04.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst05.d b/gas/testsuite/gas/i860/fldst05.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst05.d
rename to gas/testsuite/gas/i860/fldst05.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst05.s b/gas/testsuite/gas/i860/fldst05.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst05.s
rename to gas/testsuite/gas/i860/fldst05.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst06.d b/gas/testsuite/gas/i860/fldst06.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst06.d
rename to gas/testsuite/gas/i860/fldst06.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst06.s b/gas/testsuite/gas/i860/fldst06.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst06.s
rename to gas/testsuite/gas/i860/fldst06.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst07.d b/gas/testsuite/gas/i860/fldst07.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst07.d
rename to gas/testsuite/gas/i860/fldst07.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst07.s b/gas/testsuite/gas/i860/fldst07.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst07.s
rename to gas/testsuite/gas/i860/fldst07.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst08.d b/gas/testsuite/gas/i860/fldst08.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst08.d
rename to gas/testsuite/gas/i860/fldst08.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/fldst08.s b/gas/testsuite/gas/i860/fldst08.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/fldst08.s
rename to gas/testsuite/gas/i860/fldst08.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float01.d b/gas/testsuite/gas/i860/float01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float01.d
rename to gas/testsuite/gas/i860/float01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float01.s b/gas/testsuite/gas/i860/float01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float01.s
rename to gas/testsuite/gas/i860/float01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float02.d b/gas/testsuite/gas/i860/float02.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float02.d
rename to gas/testsuite/gas/i860/float02.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float02.s b/gas/testsuite/gas/i860/float02.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float02.s
rename to gas/testsuite/gas/i860/float02.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float03.d b/gas/testsuite/gas/i860/float03.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float03.d
rename to gas/testsuite/gas/i860/float03.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float03.s b/gas/testsuite/gas/i860/float03.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float03.s
rename to gas/testsuite/gas/i860/float03.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float04.d b/gas/testsuite/gas/i860/float04.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float04.d
rename to gas/testsuite/gas/i860/float04.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/float04.s b/gas/testsuite/gas/i860/float04.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/float04.s
rename to gas/testsuite/gas/i860/float04.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/form.d b/gas/testsuite/gas/i860/form.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/form.d
rename to gas/testsuite/gas/i860/form.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/form.s b/gas/testsuite/gas/i860/form.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/form.s
rename to gas/testsuite/gas/i860/form.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/i860.exp b/gas/testsuite/gas/i860/i860.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/i860.exp
rename to gas/testsuite/gas/i860/i860.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/iarith.d b/gas/testsuite/gas/i860/iarith.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/iarith.d
rename to gas/testsuite/gas/i860/iarith.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/iarith.s b/gas/testsuite/gas/i860/iarith.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/iarith.s
rename to gas/testsuite/gas/i860/iarith.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst01.d b/gas/testsuite/gas/i860/ldst01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst01.d
rename to gas/testsuite/gas/i860/ldst01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst01.s b/gas/testsuite/gas/i860/ldst01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst01.s
rename to gas/testsuite/gas/i860/ldst01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst02.d b/gas/testsuite/gas/i860/ldst02.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst02.d
rename to gas/testsuite/gas/i860/ldst02.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst02.s b/gas/testsuite/gas/i860/ldst02.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst02.s
rename to gas/testsuite/gas/i860/ldst02.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst03.d b/gas/testsuite/gas/i860/ldst03.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst03.d
rename to gas/testsuite/gas/i860/ldst03.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst03.s b/gas/testsuite/gas/i860/ldst03.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst03.s
rename to gas/testsuite/gas/i860/ldst03.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst04.d b/gas/testsuite/gas/i860/ldst04.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst04.d
rename to gas/testsuite/gas/i860/ldst04.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst04.s b/gas/testsuite/gas/i860/ldst04.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst04.s
rename to gas/testsuite/gas/i860/ldst04.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst05.d b/gas/testsuite/gas/i860/ldst05.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst05.d
rename to gas/testsuite/gas/i860/ldst05.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst05.s b/gas/testsuite/gas/i860/ldst05.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst05.s
rename to gas/testsuite/gas/i860/ldst05.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst06.d b/gas/testsuite/gas/i860/ldst06.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst06.d
rename to gas/testsuite/gas/i860/ldst06.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/ldst06.s b/gas/testsuite/gas/i860/ldst06.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/ldst06.s
rename to gas/testsuite/gas/i860/ldst06.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfam.d b/gas/testsuite/gas/i860/pfam.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfam.d
rename to gas/testsuite/gas/i860/pfam.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfam.s b/gas/testsuite/gas/i860/pfam.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfam.s
rename to gas/testsuite/gas/i860/pfam.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfmam.d b/gas/testsuite/gas/i860/pfmam.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfmam.d
rename to gas/testsuite/gas/i860/pfmam.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfmam.s b/gas/testsuite/gas/i860/pfmam.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfmam.s
rename to gas/testsuite/gas/i860/pfmam.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfmsm.d b/gas/testsuite/gas/i860/pfmsm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfmsm.d
rename to gas/testsuite/gas/i860/pfmsm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfmsm.s b/gas/testsuite/gas/i860/pfmsm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfmsm.s
rename to gas/testsuite/gas/i860/pfmsm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfsm.d b/gas/testsuite/gas/i860/pfsm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfsm.d
rename to gas/testsuite/gas/i860/pfsm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pfsm.s b/gas/testsuite/gas/i860/pfsm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pfsm.s
rename to gas/testsuite/gas/i860/pfsm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pseudo-ops01.d b/gas/testsuite/gas/i860/pseudo-ops01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pseudo-ops01.d
rename to gas/testsuite/gas/i860/pseudo-ops01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/pseudo-ops01.s b/gas/testsuite/gas/i860/pseudo-ops01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/pseudo-ops01.s
rename to gas/testsuite/gas/i860/pseudo-ops01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/regress01.d b/gas/testsuite/gas/i860/regress01.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/regress01.d
rename to gas/testsuite/gas/i860/regress01.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/regress01.s b/gas/testsuite/gas/i860/regress01.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/regress01.s
rename to gas/testsuite/gas/i860/regress01.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/shift.d b/gas/testsuite/gas/i860/shift.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/shift.d
rename to gas/testsuite/gas/i860/shift.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/shift.s b/gas/testsuite/gas/i860/shift.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/shift.s
rename to gas/testsuite/gas/i860/shift.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/simd.d b/gas/testsuite/gas/i860/simd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/simd.d
rename to gas/testsuite/gas/i860/simd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/simd.s b/gas/testsuite/gas/i860/simd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/simd.s
rename to gas/testsuite/gas/i860/simd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/system.d b/gas/testsuite/gas/i860/system.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/system.d
rename to gas/testsuite/gas/i860/system.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/system.s b/gas/testsuite/gas/i860/system.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/system.s
rename to gas/testsuite/gas/i860/system.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/xp.d b/gas/testsuite/gas/i860/xp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/xp.d
rename to gas/testsuite/gas/i860/xp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/i860/xp.s b/gas/testsuite/gas/i860/xp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/i860/xp.s
rename to gas/testsuite/gas/i860/xp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/alias-ilp32.d b/gas/testsuite/gas/ia64/alias-ilp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/alias-ilp32.d
rename to gas/testsuite/gas/ia64/alias-ilp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/alias.d b/gas/testsuite/gas/ia64/alias.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/alias.d
rename to gas/testsuite/gas/ia64/alias.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/alias.s b/gas/testsuite/gas/ia64/alias.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/alias.s
rename to gas/testsuite/gas/ia64/alias.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/align.d b/gas/testsuite/gas/ia64/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/align.d
rename to gas/testsuite/gas/ia64/align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/align.s b/gas/testsuite/gas/ia64/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/align.s
rename to gas/testsuite/gas/ia64/align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/alloc.l b/gas/testsuite/gas/ia64/alloc.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/alloc.l
rename to gas/testsuite/gas/ia64/alloc.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/alloc.s b/gas/testsuite/gas/ia64/alloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/alloc.s
rename to gas/testsuite/gas/ia64/alloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/bundling.d b/gas/testsuite/gas/ia64/bundling.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/bundling.d
rename to gas/testsuite/gas/ia64/bundling.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/bundling.s b/gas/testsuite/gas/ia64/bundling.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/bundling.s
rename to gas/testsuite/gas/ia64/bundling.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dependency-1.d b/gas/testsuite/gas/ia64/dependency-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dependency-1.d
rename to gas/testsuite/gas/ia64/dependency-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dependency-1.s b/gas/testsuite/gas/ia64/dependency-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dependency-1.s
rename to gas/testsuite/gas/ia64/dependency-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-branch.d b/gas/testsuite/gas/ia64/dv-branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-branch.d
rename to gas/testsuite/gas/ia64/dv-branch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-branch.s b/gas/testsuite/gas/ia64/dv-branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-branch.s
rename to gas/testsuite/gas/ia64/dv-branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-entry-err.l b/gas/testsuite/gas/ia64/dv-entry-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-entry-err.l
rename to gas/testsuite/gas/ia64/dv-entry-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-entry-err.s b/gas/testsuite/gas/ia64/dv-entry-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-entry-err.s
rename to gas/testsuite/gas/ia64/dv-entry-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-imply.d b/gas/testsuite/gas/ia64/dv-imply.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-imply.d
rename to gas/testsuite/gas/ia64/dv-imply.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-imply.s b/gas/testsuite/gas/ia64/dv-imply.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-imply.s
rename to gas/testsuite/gas/ia64/dv-imply.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex-err.l b/gas/testsuite/gas/ia64/dv-mutex-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex-err.l
rename to gas/testsuite/gas/ia64/dv-mutex-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex-err.s b/gas/testsuite/gas/ia64/dv-mutex-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex-err.s
rename to gas/testsuite/gas/ia64/dv-mutex-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex.d b/gas/testsuite/gas/ia64/dv-mutex.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex.d
rename to gas/testsuite/gas/ia64/dv-mutex.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex.s b/gas/testsuite/gas/ia64/dv-mutex.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-mutex.s
rename to gas/testsuite/gas/ia64/dv-mutex.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-raw-err.l b/gas/testsuite/gas/ia64/dv-raw-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-raw-err.l
rename to gas/testsuite/gas/ia64/dv-raw-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-raw-err.s b/gas/testsuite/gas/ia64/dv-raw-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-raw-err.s
rename to gas/testsuite/gas/ia64/dv-raw-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-safe.d b/gas/testsuite/gas/ia64/dv-safe.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-safe.d
rename to gas/testsuite/gas/ia64/dv-safe.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-safe.s b/gas/testsuite/gas/ia64/dv-safe.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-safe.s
rename to gas/testsuite/gas/ia64/dv-safe.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-srlz.d b/gas/testsuite/gas/ia64/dv-srlz.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-srlz.d
rename to gas/testsuite/gas/ia64/dv-srlz.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-srlz.s b/gas/testsuite/gas/ia64/dv-srlz.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-srlz.s
rename to gas/testsuite/gas/ia64/dv-srlz.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-war-err.l b/gas/testsuite/gas/ia64/dv-war-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-war-err.l
rename to gas/testsuite/gas/ia64/dv-war-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-war-err.s b/gas/testsuite/gas/ia64/dv-war-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-war-err.s
rename to gas/testsuite/gas/ia64/dv-war-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-waw-err.l b/gas/testsuite/gas/ia64/dv-waw-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-waw-err.l
rename to gas/testsuite/gas/ia64/dv-waw-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-waw-err.s b/gas/testsuite/gas/ia64/dv-waw-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/dv-waw-err.s
rename to gas/testsuite/gas/ia64/dv-waw-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/fixup-dump.pl b/gas/testsuite/gas/ia64/fixup-dump.pl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/fixup-dump.pl
rename to gas/testsuite/gas/ia64/fixup-dump.pl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/forward.d b/gas/testsuite/gas/ia64/forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/forward.d
rename to gas/testsuite/gas/ia64/forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/forward.s b/gas/testsuite/gas/ia64/forward.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/forward.s
rename to gas/testsuite/gas/ia64/forward.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/global.d b/gas/testsuite/gas/ia64/global.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/global.d
rename to gas/testsuite/gas/ia64/global.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/global.s b/gas/testsuite/gas/ia64/global.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/global.s
rename to gas/testsuite/gas/ia64/global.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/group-1.d b/gas/testsuite/gas/ia64/group-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/group-1.d
rename to gas/testsuite/gas/ia64/group-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/group-1.s b/gas/testsuite/gas/ia64/group-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/group-1.s
rename to gas/testsuite/gas/ia64/group-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/group-2.d b/gas/testsuite/gas/ia64/group-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/group-2.d
rename to gas/testsuite/gas/ia64/group-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/group-2.s b/gas/testsuite/gas/ia64/group-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/group-2.s
rename to gas/testsuite/gas/ia64/group-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-err.l b/gas/testsuite/gas/ia64/hint.b-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-err.l
rename to gas/testsuite/gas/ia64/hint.b-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-err.s b/gas/testsuite/gas/ia64/hint.b-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-err.s
rename to gas/testsuite/gas/ia64/hint.b-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-warn.l b/gas/testsuite/gas/ia64/hint.b-warn.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-warn.l
rename to gas/testsuite/gas/ia64/hint.b-warn.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-warn.s b/gas/testsuite/gas/ia64/hint.b-warn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/hint.b-warn.s
rename to gas/testsuite/gas/ia64/hint.b-warn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ia64.exp b/gas/testsuite/gas/ia64/ia64.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ia64.exp
rename to gas/testsuite/gas/ia64/ia64.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/index.l b/gas/testsuite/gas/ia64/index.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/index.l
rename to gas/testsuite/gas/ia64/index.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/index.s b/gas/testsuite/gas/ia64/index.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/index.s
rename to gas/testsuite/gas/ia64/index.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/invalid-ar.l b/gas/testsuite/gas/ia64/invalid-ar.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/invalid-ar.l
rename to gas/testsuite/gas/ia64/invalid-ar.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/invalid-ar.s b/gas/testsuite/gas/ia64/invalid-ar.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/invalid-ar.s
rename to gas/testsuite/gas/ia64/invalid-ar.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/label.l b/gas/testsuite/gas/ia64/label.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/label.l
rename to gas/testsuite/gas/ia64/label.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/label.s b/gas/testsuite/gas/ia64/label.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/label.s
rename to gas/testsuite/gas/ia64/label.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/last.l b/gas/testsuite/gas/ia64/last.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/last.l
rename to gas/testsuite/gas/ia64/last.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/last.s b/gas/testsuite/gas/ia64/last.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/last.s
rename to gas/testsuite/gas/ia64/last.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-1.d b/gas/testsuite/gas/ia64/ldxmov-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-1.d
rename to gas/testsuite/gas/ia64/ldxmov-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-1.s b/gas/testsuite/gas/ia64/ldxmov-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-1.s
rename to gas/testsuite/gas/ia64/ldxmov-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-2.l b/gas/testsuite/gas/ia64/ldxmov-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-2.l
rename to gas/testsuite/gas/ia64/ldxmov-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-2.s b/gas/testsuite/gas/ia64/ldxmov-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ldxmov-2.s
rename to gas/testsuite/gas/ia64/ldxmov-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-1.d b/gas/testsuite/gas/ia64/ltoff22x-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-1.d
rename to gas/testsuite/gas/ia64/ltoff22x-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-1.s b/gas/testsuite/gas/ia64/ltoff22x-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-1.s
rename to gas/testsuite/gas/ia64/ltoff22x-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-2.d b/gas/testsuite/gas/ia64/ltoff22x-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-2.d
rename to gas/testsuite/gas/ia64/ltoff22x-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-2.s b/gas/testsuite/gas/ia64/ltoff22x-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-2.s
rename to gas/testsuite/gas/ia64/ltoff22x-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-3.d b/gas/testsuite/gas/ia64/ltoff22x-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-3.d
rename to gas/testsuite/gas/ia64/ltoff22x-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-3.s b/gas/testsuite/gas/ia64/ltoff22x-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-3.s
rename to gas/testsuite/gas/ia64/ltoff22x-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-4.d b/gas/testsuite/gas/ia64/ltoff22x-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-4.d
rename to gas/testsuite/gas/ia64/ltoff22x-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-4.s b/gas/testsuite/gas/ia64/ltoff22x-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-4.s
rename to gas/testsuite/gas/ia64/ltoff22x-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-5.d b/gas/testsuite/gas/ia64/ltoff22x-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-5.d
rename to gas/testsuite/gas/ia64/ltoff22x-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-5.s b/gas/testsuite/gas/ia64/ltoff22x-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/ltoff22x-5.s
rename to gas/testsuite/gas/ia64/ltoff22x-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/mov-ar.d b/gas/testsuite/gas/ia64/mov-ar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/mov-ar.d
rename to gas/testsuite/gas/ia64/mov-ar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/mov-ar.s b/gas/testsuite/gas/ia64/mov-ar.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/mov-ar.s
rename to gas/testsuite/gas/ia64/mov-ar.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/no-fit.l b/gas/testsuite/gas/ia64/no-fit.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/no-fit.l
rename to gas/testsuite/gas/ia64/no-fit.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/no-fit.s b/gas/testsuite/gas/ia64/no-fit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/no-fit.s
rename to gas/testsuite/gas/ia64/no-fit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/nop_x.d b/gas/testsuite/gas/ia64/nop_x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/nop_x.d
rename to gas/testsuite/gas/ia64/nop_x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/nop_x.s b/gas/testsuite/gas/ia64/nop_x.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/nop_x.s
rename to gas/testsuite/gas/ia64/nop_x.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/nostkreg.d b/gas/testsuite/gas/ia64/nostkreg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/nostkreg.d
rename to gas/testsuite/gas/ia64/nostkreg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/nostkreg.s b/gas/testsuite/gas/ia64/nostkreg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/nostkreg.s
rename to gas/testsuite/gas/ia64/nostkreg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a-err.l b/gas/testsuite/gas/ia64/opc-a-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a-err.l
rename to gas/testsuite/gas/ia64/opc-a-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a-err.s b/gas/testsuite/gas/ia64/opc-a-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a-err.s
rename to gas/testsuite/gas/ia64/opc-a-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a.d b/gas/testsuite/gas/ia64/opc-a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a.d
rename to gas/testsuite/gas/ia64/opc-a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a.pl b/gas/testsuite/gas/ia64/opc-a.pl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a.pl
rename to gas/testsuite/gas/ia64/opc-a.pl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a.s b/gas/testsuite/gas/ia64/opc-a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-a.s
rename to gas/testsuite/gas/ia64/opc-a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-b.d b/gas/testsuite/gas/ia64/opc-b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-b.d
rename to gas/testsuite/gas/ia64/opc-b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-b.pl b/gas/testsuite/gas/ia64/opc-b.pl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-b.pl
rename to gas/testsuite/gas/ia64/opc-b.pl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-b.s b/gas/testsuite/gas/ia64/opc-b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-b.s
rename to gas/testsuite/gas/ia64/opc-b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-f.d b/gas/testsuite/gas/ia64/opc-f.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-f.d
rename to gas/testsuite/gas/ia64/opc-f.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-f.pl b/gas/testsuite/gas/ia64/opc-f.pl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-f.pl
rename to gas/testsuite/gas/ia64/opc-f.pl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-f.s b/gas/testsuite/gas/ia64/opc-f.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-f.s
rename to gas/testsuite/gas/ia64/opc-f.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-i.d b/gas/testsuite/gas/ia64/opc-i.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-i.d
rename to gas/testsuite/gas/ia64/opc-i.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-i.pl b/gas/testsuite/gas/ia64/opc-i.pl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-i.pl
rename to gas/testsuite/gas/ia64/opc-i.pl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-i.s b/gas/testsuite/gas/ia64/opc-i.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-i.s
rename to gas/testsuite/gas/ia64/opc-i.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-m.d b/gas/testsuite/gas/ia64/opc-m.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-m.d
rename to gas/testsuite/gas/ia64/opc-m.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-m.pl b/gas/testsuite/gas/ia64/opc-m.pl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-m.pl
rename to gas/testsuite/gas/ia64/opc-m.pl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-m.s b/gas/testsuite/gas/ia64/opc-m.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-m.s
rename to gas/testsuite/gas/ia64/opc-m.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-x.d b/gas/testsuite/gas/ia64/opc-x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-x.d
rename to gas/testsuite/gas/ia64/opc-x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-x.s b/gas/testsuite/gas/ia64/opc-x.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/opc-x.s
rename to gas/testsuite/gas/ia64/opc-x.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/operand-or.d b/gas/testsuite/gas/ia64/operand-or.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/operand-or.d
rename to gas/testsuite/gas/ia64/operand-or.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/operand-or.s b/gas/testsuite/gas/ia64/operand-or.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/operand-or.s
rename to gas/testsuite/gas/ia64/operand-or.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/operands.l b/gas/testsuite/gas/ia64/operands.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/operands.l
rename to gas/testsuite/gas/ia64/operands.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/operands.s b/gas/testsuite/gas/ia64/operands.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/operands.s
rename to gas/testsuite/gas/ia64/operands.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/order.d b/gas/testsuite/gas/ia64/order.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/order.d
rename to gas/testsuite/gas/ia64/order.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/order.s b/gas/testsuite/gas/ia64/order.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/order.s
rename to gas/testsuite/gas/ia64/order.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/pcrel.d b/gas/testsuite/gas/ia64/pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/pcrel.d
rename to gas/testsuite/gas/ia64/pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/pcrel.s b/gas/testsuite/gas/ia64/pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/pcrel.s
rename to gas/testsuite/gas/ia64/pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/pound.l b/gas/testsuite/gas/ia64/pound.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/pound.l
rename to gas/testsuite/gas/ia64/pound.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/pound.s b/gas/testsuite/gas/ia64/pound.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/pound.s
rename to gas/testsuite/gas/ia64/pound.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/pred-rel.s b/gas/testsuite/gas/ia64/pred-rel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/pred-rel.s
rename to gas/testsuite/gas/ia64/pred-rel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/proc.l b/gas/testsuite/gas/ia64/proc.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/proc.l
rename to gas/testsuite/gas/ia64/proc.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/proc.s b/gas/testsuite/gas/ia64/proc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/proc.s
rename to gas/testsuite/gas/ia64/proc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/pseudo.d b/gas/testsuite/gas/ia64/pseudo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/pseudo.d
rename to gas/testsuite/gas/ia64/pseudo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/pseudo.s b/gas/testsuite/gas/ia64/pseudo.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/pseudo.s
rename to gas/testsuite/gas/ia64/pseudo.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/radix.l b/gas/testsuite/gas/ia64/radix.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/radix.l
rename to gas/testsuite/gas/ia64/radix.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/radix.s b/gas/testsuite/gas/ia64/radix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/radix.s
rename to gas/testsuite/gas/ia64/radix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/real.d b/gas/testsuite/gas/ia64/real.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/real.d
rename to gas/testsuite/gas/ia64/real.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/real.s b/gas/testsuite/gas/ia64/real.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/real.s
rename to gas/testsuite/gas/ia64/real.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reg-err.l b/gas/testsuite/gas/ia64/reg-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reg-err.l
rename to gas/testsuite/gas/ia64/reg-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reg-err.s b/gas/testsuite/gas/ia64/reg-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reg-err.s
rename to gas/testsuite/gas/ia64/reg-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/regs.d b/gas/testsuite/gas/ia64/regs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/regs.d
rename to gas/testsuite/gas/ia64/regs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/regs.pl b/gas/testsuite/gas/ia64/regs.pl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/regs.pl
rename to gas/testsuite/gas/ia64/regs.pl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/regs.s b/gas/testsuite/gas/ia64/regs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/regs.s
rename to gas/testsuite/gas/ia64/regs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/regval.l b/gas/testsuite/gas/ia64/regval.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/regval.l
rename to gas/testsuite/gas/ia64/regval.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/regval.s b/gas/testsuite/gas/ia64/regval.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/regval.s
rename to gas/testsuite/gas/ia64/regval.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-bad.l b/gas/testsuite/gas/ia64/reloc-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-bad.l
rename to gas/testsuite/gas/ia64/reloc-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-bad.s b/gas/testsuite/gas/ia64/reloc-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-bad.s
rename to gas/testsuite/gas/ia64/reloc-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-uw-ilp32.d b/gas/testsuite/gas/ia64/reloc-uw-ilp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-uw-ilp32.d
rename to gas/testsuite/gas/ia64/reloc-uw-ilp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-uw.d b/gas/testsuite/gas/ia64/reloc-uw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-uw.d
rename to gas/testsuite/gas/ia64/reloc-uw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-uw.s b/gas/testsuite/gas/ia64/reloc-uw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc-uw.s
rename to gas/testsuite/gas/ia64/reloc-uw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc.d b/gas/testsuite/gas/ia64/reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc.d
rename to gas/testsuite/gas/ia64/reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc.s b/gas/testsuite/gas/ia64/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/reloc.s
rename to gas/testsuite/gas/ia64/reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/rotX.l b/gas/testsuite/gas/ia64/rotX.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/rotX.l
rename to gas/testsuite/gas/ia64/rotX.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/rotX.s b/gas/testsuite/gas/ia64/rotX.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/rotX.s
rename to gas/testsuite/gas/ia64/rotX.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/secname-ilp32.d b/gas/testsuite/gas/ia64/secname-ilp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/secname-ilp32.d
rename to gas/testsuite/gas/ia64/secname-ilp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/secname.d b/gas/testsuite/gas/ia64/secname.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/secname.d
rename to gas/testsuite/gas/ia64/secname.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/secname.s b/gas/testsuite/gas/ia64/secname.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/secname.s
rename to gas/testsuite/gas/ia64/secname.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/slot2.l b/gas/testsuite/gas/ia64/slot2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/slot2.l
rename to gas/testsuite/gas/ia64/slot2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/slot2.s b/gas/testsuite/gas/ia64/slot2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/slot2.s
rename to gas/testsuite/gas/ia64/slot2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/slotcount.d b/gas/testsuite/gas/ia64/slotcount.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/slotcount.d
rename to gas/testsuite/gas/ia64/slotcount.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/slotcount.s b/gas/testsuite/gas/ia64/slotcount.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/slotcount.s
rename to gas/testsuite/gas/ia64/slotcount.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/strange.d b/gas/testsuite/gas/ia64/strange.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/strange.d
rename to gas/testsuite/gas/ia64/strange.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/strange.s b/gas/testsuite/gas/ia64/strange.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/strange.s
rename to gas/testsuite/gas/ia64/strange.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/tls.d b/gas/testsuite/gas/ia64/tls.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/tls.d
rename to gas/testsuite/gas/ia64/tls.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/tls.s b/gas/testsuite/gas/ia64/tls.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/tls.s
rename to gas/testsuite/gas/ia64/tls.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-bad.l b/gas/testsuite/gas/ia64/unwind-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-bad.l
rename to gas/testsuite/gas/ia64/unwind-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-bad.s b/gas/testsuite/gas/ia64/unwind-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-bad.s
rename to gas/testsuite/gas/ia64/unwind-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-err.l b/gas/testsuite/gas/ia64/unwind-err.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-err.l
rename to gas/testsuite/gas/ia64/unwind-err.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-err.s b/gas/testsuite/gas/ia64/unwind-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-err.s
rename to gas/testsuite/gas/ia64/unwind-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-ilp32.d b/gas/testsuite/gas/ia64/unwind-ilp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-ilp32.d
rename to gas/testsuite/gas/ia64/unwind-ilp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-ok.d b/gas/testsuite/gas/ia64/unwind-ok.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-ok.d
rename to gas/testsuite/gas/ia64/unwind-ok.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-ok.s b/gas/testsuite/gas/ia64/unwind-ok.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind-ok.s
rename to gas/testsuite/gas/ia64/unwind-ok.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind.d b/gas/testsuite/gas/ia64/unwind.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind.d
rename to gas/testsuite/gas/ia64/unwind.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind.s b/gas/testsuite/gas/ia64/unwind.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/unwind.s
rename to gas/testsuite/gas/ia64/unwind.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/xdata-ilp32.d b/gas/testsuite/gas/ia64/xdata-ilp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/xdata-ilp32.d
rename to gas/testsuite/gas/ia64/xdata-ilp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/xdata.d b/gas/testsuite/gas/ia64/xdata.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/xdata.d
rename to gas/testsuite/gas/ia64/xdata.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ia64/xdata.s b/gas/testsuite/gas/ia64/xdata.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ia64/xdata.s
rename to gas/testsuite/gas/ia64/xdata.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ieee-fp/x930509a.exp b/gas/testsuite/gas/ieee-fp/x930509a.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ieee-fp/x930509a.exp
rename to gas/testsuite/gas/ieee-fp/x930509a.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ieee-fp/x930509a.s b/gas/testsuite/gas/ieee-fp/x930509a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ieee-fp/x930509a.s
rename to gas/testsuite/gas/ieee-fp/x930509a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/allinsn.d b/gas/testsuite/gas/iq2000/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/allinsn.d
rename to gas/testsuite/gas/iq2000/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/allinsn.exp b/gas/testsuite/gas/iq2000/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/allinsn.exp
rename to gas/testsuite/gas/iq2000/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/allinsn.s b/gas/testsuite/gas/iq2000/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/allinsn.s
rename to gas/testsuite/gas/iq2000/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard0.s b/gas/testsuite/gas/iq2000/hazard0.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard0.s
rename to gas/testsuite/gas/iq2000/hazard0.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard1.s b/gas/testsuite/gas/iq2000/hazard1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard1.s
rename to gas/testsuite/gas/iq2000/hazard1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard2.s b/gas/testsuite/gas/iq2000/hazard2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard2.s
rename to gas/testsuite/gas/iq2000/hazard2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard3.s b/gas/testsuite/gas/iq2000/hazard3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard3.s
rename to gas/testsuite/gas/iq2000/hazard3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard4.s b/gas/testsuite/gas/iq2000/hazard4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard4.s
rename to gas/testsuite/gas/iq2000/hazard4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard5.s b/gas/testsuite/gas/iq2000/hazard5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/hazard5.s
rename to gas/testsuite/gas/iq2000/hazard5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/load-hazards.exp b/gas/testsuite/gas/iq2000/load-hazards.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/load-hazards.exp
rename to gas/testsuite/gas/iq2000/load-hazards.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/nohazard.s b/gas/testsuite/gas/iq2000/nohazard.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/nohazard.s
rename to gas/testsuite/gas/iq2000/nohazard.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/noyield.s b/gas/testsuite/gas/iq2000/noyield.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/noyield.s
rename to gas/testsuite/gas/iq2000/noyield.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/odd-ldw.exp b/gas/testsuite/gas/iq2000/odd-ldw.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/odd-ldw.exp
rename to gas/testsuite/gas/iq2000/odd-ldw.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/odd-sdw.exp b/gas/testsuite/gas/iq2000/odd-sdw.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/odd-sdw.exp
rename to gas/testsuite/gas/iq2000/odd-sdw.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/oddldw.s b/gas/testsuite/gas/iq2000/oddldw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/oddldw.s
rename to gas/testsuite/gas/iq2000/oddldw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/oddsdw.s b/gas/testsuite/gas/iq2000/oddsdw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/oddsdw.s
rename to gas/testsuite/gas/iq2000/oddsdw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield.exp b/gas/testsuite/gas/iq2000/yield.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield.exp
rename to gas/testsuite/gas/iq2000/yield.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield0.s b/gas/testsuite/gas/iq2000/yield0.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield0.s
rename to gas/testsuite/gas/iq2000/yield0.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield1.s b/gas/testsuite/gas/iq2000/yield1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield1.s
rename to gas/testsuite/gas/iq2000/yield1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield2.s b/gas/testsuite/gas/iq2000/yield2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/iq2000/yield2.s
rename to gas/testsuite/gas/iq2000/yield2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lm32/all.exp b/gas/testsuite/gas/lm32/all.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lm32/all.exp
rename to gas/testsuite/gas/lm32/all.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lm32/csr.d b/gas/testsuite/gas/lm32/csr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lm32/csr.d
rename to gas/testsuite/gas/lm32/csr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lm32/csr.s b/gas/testsuite/gas/lm32/csr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lm32/csr.s
rename to gas/testsuite/gas/lm32/csr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lm32/insn.d b/gas/testsuite/gas/lm32/insn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lm32/insn.d
rename to gas/testsuite/gas/lm32/insn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lm32/insn.s b/gas/testsuite/gas/lm32/insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lm32/insn.s
rename to gas/testsuite/gas/lm32/insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-big-delta.d b/gas/testsuite/gas/lns/lns-big-delta.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-big-delta.d
rename to gas/testsuite/gas/lns/lns-big-delta.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-big-delta.s b/gas/testsuite/gas/lns/lns-big-delta.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-big-delta.s
rename to gas/testsuite/gas/lns/lns-big-delta.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1-alt.d b/gas/testsuite/gas/lns/lns-common-1-alt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1-alt.d
rename to gas/testsuite/gas/lns/lns-common-1-alt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1-ia64.s b/gas/testsuite/gas/lns/lns-common-1-ia64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1-ia64.s
rename to gas/testsuite/gas/lns/lns-common-1-ia64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1.d b/gas/testsuite/gas/lns/lns-common-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1.d
rename to gas/testsuite/gas/lns/lns-common-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1.s b/gas/testsuite/gas/lns/lns-common-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-common-1.s
rename to gas/testsuite/gas/lns/lns-common-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-diag-1.l b/gas/testsuite/gas/lns/lns-diag-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-diag-1.l
rename to gas/testsuite/gas/lns/lns-diag-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-diag-1.s b/gas/testsuite/gas/lns/lns-diag-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-diag-1.s
rename to gas/testsuite/gas/lns/lns-diag-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-duplicate.d b/gas/testsuite/gas/lns/lns-duplicate.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-duplicate.d
rename to gas/testsuite/gas/lns/lns-duplicate.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns-duplicate.s b/gas/testsuite/gas/lns/lns-duplicate.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns-duplicate.s
rename to gas/testsuite/gas/lns/lns-duplicate.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/lns/lns.exp b/gas/testsuite/gas/lns/lns.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/lns/lns.exp
rename to gas/testsuite/gas/lns/lns.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/allinsn.d b/gas/testsuite/gas/m32r/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/allinsn.d
rename to gas/testsuite/gas/m32r/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/allinsn.exp b/gas/testsuite/gas/m32r/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/allinsn.exp
rename to gas/testsuite/gas/m32r/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/allinsn.s b/gas/testsuite/gas/m32r/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/allinsn.s
rename to gas/testsuite/gas/m32r/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/error.exp b/gas/testsuite/gas/m32r/error.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/error.exp
rename to gas/testsuite/gas/m32r/error.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/fslot.d b/gas/testsuite/gas/m32r/fslot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/fslot.d
rename to gas/testsuite/gas/m32r/fslot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/fslot.s b/gas/testsuite/gas/m32r/fslot.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/fslot.s
rename to gas/testsuite/gas/m32r/fslot.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/fslotx.d b/gas/testsuite/gas/m32r/fslotx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/fslotx.d
rename to gas/testsuite/gas/m32r/fslotx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/fslotx.s b/gas/testsuite/gas/m32r/fslotx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/fslotx.s
rename to gas/testsuite/gas/m32r/fslotx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/high-1.d b/gas/testsuite/gas/m32r/high-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/high-1.d
rename to gas/testsuite/gas/m32r/high-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/high-1.s b/gas/testsuite/gas/m32r/high-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/high-1.s
rename to gas/testsuite/gas/m32r/high-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/interfere.s b/gas/testsuite/gas/m32r/interfere.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/interfere.s
rename to gas/testsuite/gas/m32r/interfere.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r.exp b/gas/testsuite/gas/m32r/m32r.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r.exp
rename to gas/testsuite/gas/m32r/m32r.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r2.d b/gas/testsuite/gas/m32r/m32r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r2.d
rename to gas/testsuite/gas/m32r/m32r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r2.exp b/gas/testsuite/gas/m32r/m32r2.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r2.exp
rename to gas/testsuite/gas/m32r/m32r2.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r2.s b/gas/testsuite/gas/m32r/m32r2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/m32r2.s
rename to gas/testsuite/gas/m32r/m32r2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/m32rx.d b/gas/testsuite/gas/m32r/m32rx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/m32rx.d
rename to gas/testsuite/gas/m32r/m32rx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/m32rx.exp b/gas/testsuite/gas/m32r/m32rx.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/m32rx.exp
rename to gas/testsuite/gas/m32r/m32rx.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/m32rx.s b/gas/testsuite/gas/m32r/m32rx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/m32rx.s
rename to gas/testsuite/gas/m32r/m32rx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/outofrange.s b/gas/testsuite/gas/m32r/outofrange.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/outofrange.s
rename to gas/testsuite/gas/m32r/outofrange.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/parallel-2.d b/gas/testsuite/gas/m32r/parallel-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/parallel-2.d
rename to gas/testsuite/gas/m32r/parallel-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/parallel-2.s b/gas/testsuite/gas/m32r/parallel-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/parallel-2.s
rename to gas/testsuite/gas/m32r/parallel-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/parallel.s b/gas/testsuite/gas/m32r/parallel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/parallel.s
rename to gas/testsuite/gas/m32r/parallel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/pic.d b/gas/testsuite/gas/m32r/pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/pic.d
rename to gas/testsuite/gas/m32r/pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/pic.exp b/gas/testsuite/gas/m32r/pic.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/pic.exp
rename to gas/testsuite/gas/m32r/pic.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/pic.s b/gas/testsuite/gas/m32r/pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/pic.s
rename to gas/testsuite/gas/m32r/pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/pic2.d b/gas/testsuite/gas/m32r/pic2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/pic2.d
rename to gas/testsuite/gas/m32r/pic2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/pic2.s b/gas/testsuite/gas/m32r/pic2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/pic2.s
rename to gas/testsuite/gas/m32r/pic2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32-err.s b/gas/testsuite/gas/m32r/rel32-err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32-err.s
rename to gas/testsuite/gas/m32r/rel32-err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32-pic.d b/gas/testsuite/gas/m32r/rel32-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32-pic.d
rename to gas/testsuite/gas/m32r/rel32-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32-pic.s b/gas/testsuite/gas/m32r/rel32-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32-pic.s
rename to gas/testsuite/gas/m32r/rel32-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32.d b/gas/testsuite/gas/m32r/rel32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32.d
rename to gas/testsuite/gas/m32r/rel32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32.exp b/gas/testsuite/gas/m32r/rel32.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32.exp
rename to gas/testsuite/gas/m32r/rel32.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32.s b/gas/testsuite/gas/m32r/rel32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rel32.s
rename to gas/testsuite/gas/m32r/rel32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rela-1.d b/gas/testsuite/gas/m32r/rela-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rela-1.d
rename to gas/testsuite/gas/m32r/rela-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/rela-1.s b/gas/testsuite/gas/m32r/rela-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/rela-1.s
rename to gas/testsuite/gas/m32r/rela-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-1.d b/gas/testsuite/gas/m32r/relax-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-1.d
rename to gas/testsuite/gas/m32r/relax-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-1.s b/gas/testsuite/gas/m32r/relax-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-1.s
rename to gas/testsuite/gas/m32r/relax-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-2.d b/gas/testsuite/gas/m32r/relax-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-2.d
rename to gas/testsuite/gas/m32r/relax-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-2.s b/gas/testsuite/gas/m32r/relax-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/relax-2.s
rename to gas/testsuite/gas/m32r/relax-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/seth.d b/gas/testsuite/gas/m32r/seth.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/seth.d
rename to gas/testsuite/gas/m32r/seth.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/seth.s b/gas/testsuite/gas/m32r/seth.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/seth.s
rename to gas/testsuite/gas/m32r/seth.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/signed-relocs.d b/gas/testsuite/gas/m32r/signed-relocs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/signed-relocs.d
rename to gas/testsuite/gas/m32r/signed-relocs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/signed-relocs.s b/gas/testsuite/gas/m32r/signed-relocs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/signed-relocs.s
rename to gas/testsuite/gas/m32r/signed-relocs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/uppercase.d b/gas/testsuite/gas/m32r/uppercase.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/uppercase.d
rename to gas/testsuite/gas/m32r/uppercase.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/uppercase.s b/gas/testsuite/gas/m32r/uppercase.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/uppercase.s
rename to gas/testsuite/gas/m32r/uppercase.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m32r/wrongsize.s b/gas/testsuite/gas/m32r/wrongsize.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m32r/wrongsize.s
rename to gas/testsuite/gas/m32r/wrongsize.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-16-32.d b/gas/testsuite/gas/m68hc11/abi-m68hc11-16-32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-16-32.d
rename to gas/testsuite/gas/m68hc11/abi-m68hc11-16-32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-16-64.d b/gas/testsuite/gas/m68hc11/abi-m68hc11-16-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-16-64.d
rename to gas/testsuite/gas/m68hc11/abi-m68hc11-16-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-32-32.d b/gas/testsuite/gas/m68hc11/abi-m68hc11-32-32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-32-32.d
rename to gas/testsuite/gas/m68hc11/abi-m68hc11-32-32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-32-64.d b/gas/testsuite/gas/m68hc11/abi-m68hc11-32-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi-m68hc11-32-64.d
rename to gas/testsuite/gas/m68hc11/abi-m68hc11-32-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi.s b/gas/testsuite/gas/m68hc11/abi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/abi.s
rename to gas/testsuite/gas/m68hc11/abi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/all_insns.d b/gas/testsuite/gas/m68hc11/all_insns.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/all_insns.d
rename to gas/testsuite/gas/m68hc11/all_insns.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/all_insns.s b/gas/testsuite/gas/m68hc11/all_insns.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/all_insns.s
rename to gas/testsuite/gas/m68hc11/all_insns.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/branchs12.d b/gas/testsuite/gas/m68hc11/branchs12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/branchs12.d
rename to gas/testsuite/gas/m68hc11/branchs12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/branchs12.s b/gas/testsuite/gas/m68hc11/branchs12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/branchs12.s
rename to gas/testsuite/gas/m68hc11/branchs12.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/bug-1825.d b/gas/testsuite/gas/m68hc11/bug-1825.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/bug-1825.d
rename to gas/testsuite/gas/m68hc11/bug-1825.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/bug-1825.s b/gas/testsuite/gas/m68hc11/bug-1825.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/bug-1825.s
rename to gas/testsuite/gas/m68hc11/bug-1825.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/indexed12.d b/gas/testsuite/gas/m68hc11/indexed12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/indexed12.d
rename to gas/testsuite/gas/m68hc11/indexed12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/indexed12.s b/gas/testsuite/gas/m68hc11/indexed12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/indexed12.s
rename to gas/testsuite/gas/m68hc11/indexed12.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns-dwarf2.d b/gas/testsuite/gas/m68hc11/insns-dwarf2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns-dwarf2.d
rename to gas/testsuite/gas/m68hc11/insns-dwarf2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns.d b/gas/testsuite/gas/m68hc11/insns.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns.d
rename to gas/testsuite/gas/m68hc11/insns.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns.s b/gas/testsuite/gas/m68hc11/insns.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns.s
rename to gas/testsuite/gas/m68hc11/insns.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns12.d b/gas/testsuite/gas/m68hc11/insns12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns12.d
rename to gas/testsuite/gas/m68hc11/insns12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns12.s b/gas/testsuite/gas/m68hc11/insns12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/insns12.s
rename to gas/testsuite/gas/m68hc11/insns12.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/lbranch-dwarf2.d b/gas/testsuite/gas/m68hc11/lbranch-dwarf2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/lbranch-dwarf2.d
rename to gas/testsuite/gas/m68hc11/lbranch-dwarf2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/lbranch.d b/gas/testsuite/gas/m68hc11/lbranch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/lbranch.d
rename to gas/testsuite/gas/m68hc11/lbranch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/lbranch.s b/gas/testsuite/gas/m68hc11/lbranch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/lbranch.s
rename to gas/testsuite/gas/m68hc11/lbranch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/m68hc11.exp b/gas/testsuite/gas/m68hc11/m68hc11.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/m68hc11.exp
rename to gas/testsuite/gas/m68hc11/m68hc11.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/malis-include.s b/gas/testsuite/gas/m68hc11/malis-include.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/malis-include.s
rename to gas/testsuite/gas/m68hc11/malis-include.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/malis.d b/gas/testsuite/gas/m68hc11/malis.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/malis.d
rename to gas/testsuite/gas/m68hc11/malis.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/malis.s b/gas/testsuite/gas/m68hc11/malis.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/malis.s
rename to gas/testsuite/gas/m68hc11/malis.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/movb.d b/gas/testsuite/gas/m68hc11/movb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/movb.d
rename to gas/testsuite/gas/m68hc11/movb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/movb.s b/gas/testsuite/gas/m68hc11/movb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/movb.s
rename to gas/testsuite/gas/m68hc11/movb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/opers12-dwarf2.d b/gas/testsuite/gas/m68hc11/opers12-dwarf2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/opers12-dwarf2.d
rename to gas/testsuite/gas/m68hc11/opers12-dwarf2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/opers12.d b/gas/testsuite/gas/m68hc11/opers12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/opers12.d
rename to gas/testsuite/gas/m68hc11/opers12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68hc11/opers12.s b/gas/testsuite/gas/m68hc11/opers12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68hc11/opers12.s
rename to gas/testsuite/gas/m68hc11/opers12.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/gas.exp b/gas/testsuite/gas/m68k-coff/gas.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/gas.exp
rename to gas/testsuite/gas/m68k-coff/gas.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2389.s b/gas/testsuite/gas/m68k-coff/p2389.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2389.s
rename to gas/testsuite/gas/m68k-coff/p2389.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2389a.s b/gas/testsuite/gas/m68k-coff/p2389a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2389a.s
rename to gas/testsuite/gas/m68k-coff/p2389a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2430.s b/gas/testsuite/gas/m68k-coff/p2430.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2430.s
rename to gas/testsuite/gas/m68k-coff/p2430.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2430a.s b/gas/testsuite/gas/m68k-coff/p2430a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/p2430a.s
rename to gas/testsuite/gas/m68k-coff/p2430a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/t1.s b/gas/testsuite/gas/m68k-coff/t1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k-coff/t1.s
rename to gas/testsuite/gas/m68k-coff/t1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/all.exp b/gas/testsuite/gas/m68k/all.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/all.exp
rename to gas/testsuite/gas/m68k/all.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/arch-cpu-1.d b/gas/testsuite/gas/m68k/arch-cpu-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/arch-cpu-1.d
rename to gas/testsuite/gas/m68k/arch-cpu-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/arch-cpu-1.s b/gas/testsuite/gas/m68k/arch-cpu-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/arch-cpu-1.s
rename to gas/testsuite/gas/m68k/arch-cpu-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/bitfield.d b/gas/testsuite/gas/m68k/bitfield.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/bitfield.d
rename to gas/testsuite/gas/m68k/bitfield.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/bitfield.s b/gas/testsuite/gas/m68k/bitfield.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/bitfield.s
rename to gas/testsuite/gas/m68k/bitfield.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isaa.d b/gas/testsuite/gas/m68k/br-isaa.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isaa.d
rename to gas/testsuite/gas/m68k/br-isaa.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isaa.s b/gas/testsuite/gas/m68k/br-isaa.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isaa.s
rename to gas/testsuite/gas/m68k/br-isaa.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isab.d b/gas/testsuite/gas/m68k/br-isab.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isab.d
rename to gas/testsuite/gas/m68k/br-isab.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isab.s b/gas/testsuite/gas/m68k/br-isab.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isab.s
rename to gas/testsuite/gas/m68k/br-isab.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isac.d b/gas/testsuite/gas/m68k/br-isac.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isac.d
rename to gas/testsuite/gas/m68k/br-isac.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isac.s b/gas/testsuite/gas/m68k/br-isac.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/br-isac.s
rename to gas/testsuite/gas/m68k/br-isac.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/cas.d b/gas/testsuite/gas/m68k/cas.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/cas.d
rename to gas/testsuite/gas/m68k/cas.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/cas.s b/gas/testsuite/gas/m68k/cas.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/cas.s
rename to gas/testsuite/gas/m68k/cas.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/cpu32.d b/gas/testsuite/gas/m68k/cpu32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/cpu32.d
rename to gas/testsuite/gas/m68k/cpu32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/cpu32.s b/gas/testsuite/gas/m68k/cpu32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/cpu32.s
rename to gas/testsuite/gas/m68k/cpu32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-1.d b/gas/testsuite/gas/m68k/ctrl-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-1.d
rename to gas/testsuite/gas/m68k/ctrl-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-1.s b/gas/testsuite/gas/m68k/ctrl-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-1.s
rename to gas/testsuite/gas/m68k/ctrl-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-2.d b/gas/testsuite/gas/m68k/ctrl-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-2.d
rename to gas/testsuite/gas/m68k/ctrl-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-2.s b/gas/testsuite/gas/m68k/ctrl-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/ctrl-2.s
rename to gas/testsuite/gas/m68k/ctrl-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/disperr.s b/gas/testsuite/gas/m68k/disperr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/disperr.s
rename to gas/testsuite/gas/m68k/disperr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/fido.d b/gas/testsuite/gas/m68k/fido.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/fido.d
rename to gas/testsuite/gas/m68k/fido.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/fido.s b/gas/testsuite/gas/m68k/fido.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/fido.s
rename to gas/testsuite/gas/m68k/fido.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/fmoveml.d b/gas/testsuite/gas/m68k/fmoveml.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/fmoveml.d
rename to gas/testsuite/gas/m68k/fmoveml.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/fmoveml.s b/gas/testsuite/gas/m68k/fmoveml.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/fmoveml.s
rename to gas/testsuite/gas/m68k/fmoveml.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/link.d b/gas/testsuite/gas/m68k/link.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/link.d
rename to gas/testsuite/gas/m68k/link.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/link.s b/gas/testsuite/gas/m68k/link.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/link.s
rename to gas/testsuite/gas/m68k/link.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-coproc.d b/gas/testsuite/gas/m68k/mcf-coproc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-coproc.d
rename to gas/testsuite/gas/m68k/mcf-coproc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-coproc.s b/gas/testsuite/gas/m68k/mcf-coproc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-coproc.s
rename to gas/testsuite/gas/m68k/mcf-coproc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-emac.d b/gas/testsuite/gas/m68k/mcf-emac.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-emac.d
rename to gas/testsuite/gas/m68k/mcf-emac.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-emac.s b/gas/testsuite/gas/m68k/mcf-emac.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-emac.s
rename to gas/testsuite/gas/m68k/mcf-emac.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-fpu.d b/gas/testsuite/gas/m68k/mcf-fpu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-fpu.d
rename to gas/testsuite/gas/m68k/mcf-fpu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-fpu.s b/gas/testsuite/gas/m68k/mcf-fpu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-fpu.s
rename to gas/testsuite/gas/m68k/mcf-fpu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mac.d b/gas/testsuite/gas/m68k/mcf-mac.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mac.d
rename to gas/testsuite/gas/m68k/mcf-mac.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mac.s b/gas/testsuite/gas/m68k/mcf-mac.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mac.s
rename to gas/testsuite/gas/m68k/mcf-mac.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mov3q.d b/gas/testsuite/gas/m68k/mcf-mov3q.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mov3q.d
rename to gas/testsuite/gas/m68k/mcf-mov3q.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mov3q.s b/gas/testsuite/gas/m68k/mcf-mov3q.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-mov3q.s
rename to gas/testsuite/gas/m68k/mcf-mov3q.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-movsr.d b/gas/testsuite/gas/m68k/mcf-movsr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-movsr.d
rename to gas/testsuite/gas/m68k/mcf-movsr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-movsr.s b/gas/testsuite/gas/m68k/mcf-movsr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-movsr.s
rename to gas/testsuite/gas/m68k/mcf-movsr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-trap.d b/gas/testsuite/gas/m68k/mcf-trap.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-trap.d
rename to gas/testsuite/gas/m68k/mcf-trap.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-trap.s b/gas/testsuite/gas/m68k/mcf-trap.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-trap.s
rename to gas/testsuite/gas/m68k/mcf-trap.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-wdebug.d b/gas/testsuite/gas/m68k/mcf-wdebug.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-wdebug.d
rename to gas/testsuite/gas/m68k/mcf-wdebug.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-wdebug.s b/gas/testsuite/gas/m68k/mcf-wdebug.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mcf-wdebug.s
rename to gas/testsuite/gas/m68k/mcf-wdebug.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mode5.d b/gas/testsuite/gas/m68k/mode5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mode5.d
rename to gas/testsuite/gas/m68k/mode5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/mode5.s b/gas/testsuite/gas/m68k/mode5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/mode5.s
rename to gas/testsuite/gas/m68k/mode5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/op68000.d b/gas/testsuite/gas/m68k/op68000.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/op68000.d
rename to gas/testsuite/gas/m68k/op68000.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/operands.d b/gas/testsuite/gas/m68k/operands.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/operands.d
rename to gas/testsuite/gas/m68k/operands.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/operands.s b/gas/testsuite/gas/m68k/operands.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/operands.s
rename to gas/testsuite/gas/m68k/operands.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/p11673.s b/gas/testsuite/gas/m68k/p11673.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/p11673.s
rename to gas/testsuite/gas/m68k/p11673.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/p2410.s b/gas/testsuite/gas/m68k/p2410.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/p2410.s
rename to gas/testsuite/gas/m68k/p2410.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/p2663.s b/gas/testsuite/gas/m68k/p2663.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/p2663.s
rename to gas/testsuite/gas/m68k/p2663.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041.d b/gas/testsuite/gas/m68k/p3041.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041.d
rename to gas/testsuite/gas/m68k/p3041.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041.s b/gas/testsuite/gas/m68k/p3041.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041.s
rename to gas/testsuite/gas/m68k/p3041.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041data.d b/gas/testsuite/gas/m68k/p3041data.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041data.d
rename to gas/testsuite/gas/m68k/p3041data.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041data.s b/gas/testsuite/gas/m68k/p3041data.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/p3041data.s
rename to gas/testsuite/gas/m68k/p3041data.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/pcrel.d b/gas/testsuite/gas/m68k/pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/pcrel.d
rename to gas/testsuite/gas/m68k/pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/pcrel.s b/gas/testsuite/gas/m68k/pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/pcrel.s
rename to gas/testsuite/gas/m68k/pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/pic1.s b/gas/testsuite/gas/m68k/pic1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/pic1.s
rename to gas/testsuite/gas/m68k/pic1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/pr11676.d b/gas/testsuite/gas/m68k/pr11676.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/pr11676.d
rename to gas/testsuite/gas/m68k/pr11676.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/pr11676.s b/gas/testsuite/gas/m68k/pr11676.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/pr11676.s
rename to gas/testsuite/gas/m68k/pr11676.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/t2.d b/gas/testsuite/gas/m68k/t2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/t2.d
rename to gas/testsuite/gas/m68k/t2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/t2.s b/gas/testsuite/gas/m68k/t2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/t2.s
rename to gas/testsuite/gas/m68k/t2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/tls-gd-3.d b/gas/testsuite/gas/m68k/tls-gd-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/tls-gd-3.d
rename to gas/testsuite/gas/m68k/tls-gd-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/m68k/tls-gd-3.s b/gas/testsuite/gas/m68k/tls-gd-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/m68k/tls-gd-3.s
rename to gas/testsuite/gas/m68k/tls-gd-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/altmacro.d b/gas/testsuite/gas/macros/altmacro.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/altmacro.d
rename to gas/testsuite/gas/macros/altmacro.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/altmacro.s b/gas/testsuite/gas/macros/altmacro.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/altmacro.s
rename to gas/testsuite/gas/macros/altmacro.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/and.s b/gas/testsuite/gas/macros/and.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/and.s
rename to gas/testsuite/gas/macros/and.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app1.d b/gas/testsuite/gas/macros/app1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app1.d
rename to gas/testsuite/gas/macros/app1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app1.s b/gas/testsuite/gas/macros/app1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app1.s
rename to gas/testsuite/gas/macros/app1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app2.d b/gas/testsuite/gas/macros/app2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app2.d
rename to gas/testsuite/gas/macros/app2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app2.s b/gas/testsuite/gas/macros/app2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app2.s
rename to gas/testsuite/gas/macros/app2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app3.d b/gas/testsuite/gas/macros/app3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app3.d
rename to gas/testsuite/gas/macros/app3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app3.s b/gas/testsuite/gas/macros/app3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app3.s
rename to gas/testsuite/gas/macros/app3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app4.d b/gas/testsuite/gas/macros/app4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app4.d
rename to gas/testsuite/gas/macros/app4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app4.s b/gas/testsuite/gas/macros/app4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app4.s
rename to gas/testsuite/gas/macros/app4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/app4b.s b/gas/testsuite/gas/macros/app4b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/app4b.s
rename to gas/testsuite/gas/macros/app4b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/badarg.l b/gas/testsuite/gas/macros/badarg.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/badarg.l
rename to gas/testsuite/gas/macros/badarg.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/badarg.s b/gas/testsuite/gas/macros/badarg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/badarg.s
rename to gas/testsuite/gas/macros/badarg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/dot.l b/gas/testsuite/gas/macros/dot.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/dot.l
rename to gas/testsuite/gas/macros/dot.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/dot.s b/gas/testsuite/gas/macros/dot.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/dot.s
rename to gas/testsuite/gas/macros/dot.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/end.l b/gas/testsuite/gas/macros/end.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/end.l
rename to gas/testsuite/gas/macros/end.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/end.s b/gas/testsuite/gas/macros/end.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/end.s
rename to gas/testsuite/gas/macros/end.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/err.s b/gas/testsuite/gas/macros/err.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/err.s
rename to gas/testsuite/gas/macros/err.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/exit.s b/gas/testsuite/gas/macros/exit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/exit.s
rename to gas/testsuite/gas/macros/exit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/irp.d b/gas/testsuite/gas/macros/irp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/irp.d
rename to gas/testsuite/gas/macros/irp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/irp.s b/gas/testsuite/gas/macros/irp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/irp.s
rename to gas/testsuite/gas/macros/irp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/macros.exp
rename to gas/testsuite/gas/macros/macros.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/paren.d b/gas/testsuite/gas/macros/paren.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/paren.d
rename to gas/testsuite/gas/macros/paren.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/paren.s b/gas/testsuite/gas/macros/paren.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/paren.s
rename to gas/testsuite/gas/macros/paren.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/purge.l b/gas/testsuite/gas/macros/purge.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/purge.l
rename to gas/testsuite/gas/macros/purge.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/purge.s b/gas/testsuite/gas/macros/purge.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/purge.s
rename to gas/testsuite/gas/macros/purge.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/redef.l b/gas/testsuite/gas/macros/redef.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/redef.l
rename to gas/testsuite/gas/macros/redef.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/redef.s b/gas/testsuite/gas/macros/redef.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/redef.s
rename to gas/testsuite/gas/macros/redef.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/repeat.d b/gas/testsuite/gas/macros/repeat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/repeat.d
rename to gas/testsuite/gas/macros/repeat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/repeat.s b/gas/testsuite/gas/macros/repeat.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/repeat.s
rename to gas/testsuite/gas/macros/repeat.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/rept.d b/gas/testsuite/gas/macros/rept.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/rept.d
rename to gas/testsuite/gas/macros/rept.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/rept.s b/gas/testsuite/gas/macros/rept.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/rept.s
rename to gas/testsuite/gas/macros/rept.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/semi.d b/gas/testsuite/gas/macros/semi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/semi.d
rename to gas/testsuite/gas/macros/semi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/semi.s b/gas/testsuite/gas/macros/semi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/semi.s
rename to gas/testsuite/gas/macros/semi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/strings.d b/gas/testsuite/gas/macros/strings.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/strings.d
rename to gas/testsuite/gas/macros/strings.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/strings.s b/gas/testsuite/gas/macros/strings.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/strings.s
rename to gas/testsuite/gas/macros/strings.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/test1.d b/gas/testsuite/gas/macros/test1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/test1.d
rename to gas/testsuite/gas/macros/test1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/test1.s b/gas/testsuite/gas/macros/test1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/test1.s
rename to gas/testsuite/gas/macros/test1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/test2.d b/gas/testsuite/gas/macros/test2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/test2.d
rename to gas/testsuite/gas/macros/test2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/test2.s b/gas/testsuite/gas/macros/test2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/test2.s
rename to gas/testsuite/gas/macros/test2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/test3.d b/gas/testsuite/gas/macros/test3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/test3.d
rename to gas/testsuite/gas/macros/test3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/test3.s b/gas/testsuite/gas/macros/test3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/test3.s
rename to gas/testsuite/gas/macros/test3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/vararg.d b/gas/testsuite/gas/macros/vararg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/vararg.d
rename to gas/testsuite/gas/macros/vararg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/macros/vararg.s b/gas/testsuite/gas/macros/vararg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/macros/vararg.s
rename to gas/testsuite/gas/macros/vararg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mcore/allinsn.d b/gas/testsuite/gas/mcore/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mcore/allinsn.d
rename to gas/testsuite/gas/mcore/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mcore/allinsn.exp b/gas/testsuite/gas/mcore/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mcore/allinsn.exp
rename to gas/testsuite/gas/mcore/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mcore/allinsn.s b/gas/testsuite/gas/mcore/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mcore/allinsn.s
rename to gas/testsuite/gas/mcore/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.be.d b/gas/testsuite/gas/mep/allinsn.be.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.be.d
rename to gas/testsuite/gas/mep/allinsn.be.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.exp b/gas/testsuite/gas/mep/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.exp
rename to gas/testsuite/gas/mep/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.le.d b/gas/testsuite/gas/mep/allinsn.le.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.le.d
rename to gas/testsuite/gas/mep/allinsn.le.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.s b/gas/testsuite/gas/mep/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/allinsn.s
rename to gas/testsuite/gas/mep/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/branch1.be.d b/gas/testsuite/gas/mep/branch1.be.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/branch1.be.d
rename to gas/testsuite/gas/mep/branch1.be.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/branch1.le.d b/gas/testsuite/gas/mep/branch1.le.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/branch1.le.d
rename to gas/testsuite/gas/mep/branch1.le.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/branch1.s b/gas/testsuite/gas/mep/branch1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/branch1.s
rename to gas/testsuite/gas/mep/branch1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/complex-relocs.exp b/gas/testsuite/gas/mep/complex-relocs.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/complex-relocs.exp
rename to gas/testsuite/gas/mep/complex-relocs.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/dj1.be.d b/gas/testsuite/gas/mep/dj1.be.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/dj1.be.d
rename to gas/testsuite/gas/mep/dj1.be.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/dj1.le.d b/gas/testsuite/gas/mep/dj1.le.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/dj1.le.d
rename to gas/testsuite/gas/mep/dj1.le.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/dj1.s b/gas/testsuite/gas/mep/dj1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/dj1.s
rename to gas/testsuite/gas/mep/dj1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/dj2.be.d b/gas/testsuite/gas/mep/dj2.be.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/dj2.be.d
rename to gas/testsuite/gas/mep/dj2.be.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/dj2.le.d b/gas/testsuite/gas/mep/dj2.le.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/dj2.le.d
rename to gas/testsuite/gas/mep/dj2.le.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/dj2.s b/gas/testsuite/gas/mep/dj2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/dj2.s
rename to gas/testsuite/gas/mep/dj2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-bad3.s b/gas/testsuite/gas/mep/relocs-bad3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-bad3.s
rename to gas/testsuite/gas/mep/relocs-bad3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-junk1.s b/gas/testsuite/gas/mep/relocs-junk1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-junk1.s
rename to gas/testsuite/gas/mep/relocs-junk1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-junk2.s b/gas/testsuite/gas/mep/relocs-junk2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-junk2.s
rename to gas/testsuite/gas/mep/relocs-junk2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-refs.s b/gas/testsuite/gas/mep/relocs-refs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-refs.s
rename to gas/testsuite/gas/mep/relocs-refs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-syms.s b/gas/testsuite/gas/mep/relocs-syms.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/relocs-syms.s
rename to gas/testsuite/gas/mep/relocs-syms.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mep/relocs.d b/gas/testsuite/gas/mep/relocs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mep/relocs.d
rename to gas/testsuite/gas/mep/relocs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/abs.d b/gas/testsuite/gas/mips/abs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/abs.d
rename to gas/testsuite/gas/mips/abs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/abs.s b/gas/testsuite/gas/mips/abs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/abs.s
rename to gas/testsuite/gas/mips/abs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/add.d b/gas/testsuite/gas/mips/add.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/add.d
rename to gas/testsuite/gas/mips/add.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/add.s b/gas/testsuite/gas/mips/add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/add.s
rename to gas/testsuite/gas/mips/add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/aent.d b/gas/testsuite/gas/mips/aent.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/aent.d
rename to gas/testsuite/gas/mips/aent.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/aent.s b/gas/testsuite/gas/mips/aent.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/aent.s
rename to gas/testsuite/gas/mips/aent.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/align.d b/gas/testsuite/gas/mips/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/align.d
rename to gas/testsuite/gas/mips/align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/align.s b/gas/testsuite/gas/mips/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/align.s
rename to gas/testsuite/gas/mips/align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/align2-el.d b/gas/testsuite/gas/mips/align2-el.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/align2-el.d
rename to gas/testsuite/gas/mips/align2-el.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/align2.d b/gas/testsuite/gas/mips/align2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/align2.d
rename to gas/testsuite/gas/mips/align2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/align2.s b/gas/testsuite/gas/mips/align2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/align2.s
rename to gas/testsuite/gas/mips/align2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/and.d b/gas/testsuite/gas/mips/and.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/and.d
rename to gas/testsuite/gas/mips/and.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/and.s b/gas/testsuite/gas/mips/and.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/and.s
rename to gas/testsuite/gas/mips/and.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/at-1.d b/gas/testsuite/gas/mips/at-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/at-1.d
rename to gas/testsuite/gas/mips/at-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/at-1.s b/gas/testsuite/gas/mips/at-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/at-1.s
rename to gas/testsuite/gas/mips/at-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/at-2.l b/gas/testsuite/gas/mips/at-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/at-2.l
rename to gas/testsuite/gas/mips/at-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/at-2.s b/gas/testsuite/gas/mips/at-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/at-2.s
rename to gas/testsuite/gas/mips/at-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/baddata1.l b/gas/testsuite/gas/mips/baddata1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/baddata1.l
rename to gas/testsuite/gas/mips/baddata1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/baddata1.s b/gas/testsuite/gas/mips/baddata1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/baddata1.s
rename to gas/testsuite/gas/mips/baddata1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/beq.d b/gas/testsuite/gas/mips/beq.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/beq.d
rename to gas/testsuite/gas/mips/beq.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/beq.s b/gas/testsuite/gas/mips/beq.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/beq.s
rename to gas/testsuite/gas/mips/beq.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/bge.d b/gas/testsuite/gas/mips/bge.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/bge.d
rename to gas/testsuite/gas/mips/bge.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/bge.s b/gas/testsuite/gas/mips/bge.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/bge.s
rename to gas/testsuite/gas/mips/bge.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/bgeu.d b/gas/testsuite/gas/mips/bgeu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/bgeu.d
rename to gas/testsuite/gas/mips/bgeu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/bgeu.s b/gas/testsuite/gas/mips/bgeu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/bgeu.s
rename to gas/testsuite/gas/mips/bgeu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/blt.d b/gas/testsuite/gas/mips/blt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/blt.d
rename to gas/testsuite/gas/mips/blt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/blt.s b/gas/testsuite/gas/mips/blt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/blt.s
rename to gas/testsuite/gas/mips/blt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/bltu.d b/gas/testsuite/gas/mips/bltu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/bltu.d
rename to gas/testsuite/gas/mips/bltu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/bltu.s b/gas/testsuite/gas/mips/bltu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/bltu.s
rename to gas/testsuite/gas/mips/bltu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-likely.d b/gas/testsuite/gas/mips/branch-likely.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-likely.d
rename to gas/testsuite/gas/mips/branch-likely.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-likely.s b/gas/testsuite/gas/mips/branch-likely.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-likely.s
rename to gas/testsuite/gas/mips/branch-likely.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-1.d b/gas/testsuite/gas/mips/branch-misc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-1.d
rename to gas/testsuite/gas/mips/branch-misc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-1.s b/gas/testsuite/gas/mips/branch-misc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-1.s
rename to gas/testsuite/gas/mips/branch-misc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2-64.d b/gas/testsuite/gas/mips/branch-misc-2-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2-64.d
rename to gas/testsuite/gas/mips/branch-misc-2-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2.d b/gas/testsuite/gas/mips/branch-misc-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2.d
rename to gas/testsuite/gas/mips/branch-misc-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2.s b/gas/testsuite/gas/mips/branch-misc-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2.s
rename to gas/testsuite/gas/mips/branch-misc-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2pic-64.d b/gas/testsuite/gas/mips/branch-misc-2pic-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2pic-64.d
rename to gas/testsuite/gas/mips/branch-misc-2pic-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2pic.d b/gas/testsuite/gas/mips/branch-misc-2pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-2pic.d
rename to gas/testsuite/gas/mips/branch-misc-2pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-3.d b/gas/testsuite/gas/mips/branch-misc-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-3.d
rename to gas/testsuite/gas/mips/branch-misc-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-3.s b/gas/testsuite/gas/mips/branch-misc-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-misc-3.s
rename to gas/testsuite/gas/mips/branch-misc-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-swap.d b/gas/testsuite/gas/mips/branch-swap.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-swap.d
rename to gas/testsuite/gas/mips/branch-swap.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/branch-swap.s b/gas/testsuite/gas/mips/branch-swap.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/branch-swap.s
rename to gas/testsuite/gas/mips/branch-swap.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/break20.d b/gas/testsuite/gas/mips/break20.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/break20.d
rename to gas/testsuite/gas/mips/break20.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/break20.s b/gas/testsuite/gas/mips/break20.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/break20.s
rename to gas/testsuite/gas/mips/break20.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/call-nonpic-1.d b/gas/testsuite/gas/mips/call-nonpic-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/call-nonpic-1.d
rename to gas/testsuite/gas/mips/call-nonpic-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/call-nonpic-1.s b/gas/testsuite/gas/mips/call-nonpic-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/call-nonpic-1.s
rename to gas/testsuite/gas/mips/call-nonpic-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cfi-n64-1.d b/gas/testsuite/gas/mips/cfi-n64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cfi-n64-1.d
rename to gas/testsuite/gas/mips/cfi-n64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cfi-n64-1.s b/gas/testsuite/gas/mips/cfi-n64-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cfi-n64-1.s
rename to gas/testsuite/gas/mips/cfi-n64-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips32.d b/gas/testsuite/gas/mips/cp0-names-mips32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips32.d
rename to gas/testsuite/gas/mips/cp0-names-mips32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips32r2.d b/gas/testsuite/gas/mips/cp0-names-mips32r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips32r2.d
rename to gas/testsuite/gas/mips/cp0-names-mips32r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips64.d b/gas/testsuite/gas/mips/cp0-names-mips64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips64.d
rename to gas/testsuite/gas/mips/cp0-names-mips64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips64r2.d b/gas/testsuite/gas/mips/cp0-names-mips64r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-mips64r2.d
rename to gas/testsuite/gas/mips/cp0-names-mips64r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-numeric.d b/gas/testsuite/gas/mips/cp0-names-numeric.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-numeric.d
rename to gas/testsuite/gas/mips/cp0-names-numeric.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-r3000.d b/gas/testsuite/gas/mips/cp0-names-r3000.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-r3000.d
rename to gas/testsuite/gas/mips/cp0-names-r3000.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-r4000.d b/gas/testsuite/gas/mips/cp0-names-r4000.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-r4000.d
rename to gas/testsuite/gas/mips/cp0-names-r4000.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-sb1.d b/gas/testsuite/gas/mips/cp0-names-sb1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names-sb1.d
rename to gas/testsuite/gas/mips/cp0-names-sb1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names.s b/gas/testsuite/gas/mips/cp0-names.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0-names.s
rename to gas/testsuite/gas/mips/cp0-names.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips32.d b/gas/testsuite/gas/mips/cp0sel-names-mips32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips32.d
rename to gas/testsuite/gas/mips/cp0sel-names-mips32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d b/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
rename to gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips64.d b/gas/testsuite/gas/mips/cp0sel-names-mips64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips64.d
rename to gas/testsuite/gas/mips/cp0sel-names-mips64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips64r2.d b/gas/testsuite/gas/mips/cp0sel-names-mips64r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-mips64r2.d
rename to gas/testsuite/gas/mips/cp0sel-names-mips64r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-numeric.d b/gas/testsuite/gas/mips/cp0sel-names-numeric.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-numeric.d
rename to gas/testsuite/gas/mips/cp0sel-names-numeric.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-sb1.d b/gas/testsuite/gas/mips/cp0sel-names-sb1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names-sb1.d
rename to gas/testsuite/gas/mips/cp0sel-names-sb1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names.s b/gas/testsuite/gas/mips/cp0sel-names.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/cp0sel-names.s
rename to gas/testsuite/gas/mips/cp0sel-names.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/delay.d b/gas/testsuite/gas/mips/delay.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/delay.d
rename to gas/testsuite/gas/mips/delay.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/delay.s b/gas/testsuite/gas/mips/delay.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/delay.s
rename to gas/testsuite/gas/mips/delay.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/div-ilocks.d b/gas/testsuite/gas/mips/div-ilocks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/div-ilocks.d
rename to gas/testsuite/gas/mips/div-ilocks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/div.d b/gas/testsuite/gas/mips/div.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/div.d
rename to gas/testsuite/gas/mips/div.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/div.s b/gas/testsuite/gas/mips/div.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/div.s
rename to gas/testsuite/gas/mips/div.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/dli.d b/gas/testsuite/gas/mips/dli.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/dli.d
rename to gas/testsuite/gas/mips/dli.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/dli.s b/gas/testsuite/gas/mips/dli.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/dli.s
rename to gas/testsuite/gas/mips/dli.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/e32-rel2.d b/gas/testsuite/gas/mips/e32-rel2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/e32-rel2.d
rename to gas/testsuite/gas/mips/e32-rel2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/e32-rel4.d b/gas/testsuite/gas/mips/e32-rel4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/e32-rel4.d
rename to gas/testsuite/gas/mips/e32-rel4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/e32el-rel2.d b/gas/testsuite/gas/mips/e32el-rel2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/e32el-rel2.d
rename to gas/testsuite/gas/mips/e32el-rel2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@ld-forward.d b/gas/testsuite/gas/mips/ecoff@ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@ld-forward.d
rename to gas/testsuite/gas/mips/ecoff@ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@ld.d b/gas/testsuite/gas/mips/ecoff@ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@ld.d
rename to gas/testsuite/gas/mips/ecoff@ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@sd-forward.d b/gas/testsuite/gas/mips/ecoff@sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@sd-forward.d
rename to gas/testsuite/gas/mips/ecoff@sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@sd.d b/gas/testsuite/gas/mips/ecoff@sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ecoff@sd.d
rename to gas/testsuite/gas/mips/ecoff@sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-consthilo.d b/gas/testsuite/gas/mips/elf-consthilo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-consthilo.d
rename to gas/testsuite/gas/mips/elf-consthilo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-consthilo.s b/gas/testsuite/gas/mips/elf-consthilo.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-consthilo.s
rename to gas/testsuite/gas/mips/elf-consthilo.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-jal.d b/gas/testsuite/gas/mips/elf-jal.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-jal.d
rename to gas/testsuite/gas/mips/elf-jal.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n32.d b/gas/testsuite/gas/mips/elf-rel-got-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n32.d
rename to gas/testsuite/gas/mips/elf-rel-got-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n32.s b/gas/testsuite/gas/mips/elf-rel-got-n32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n32.s
rename to gas/testsuite/gas/mips/elf-rel-got-n32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n64.d b/gas/testsuite/gas/mips/elf-rel-got-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n64.d
rename to gas/testsuite/gas/mips/elf-rel-got-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n64.s b/gas/testsuite/gas/mips/elf-rel-got-n64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-got-n64.s
rename to gas/testsuite/gas/mips/elf-rel-got-n64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-xgot-n32.d b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
rename to gas/testsuite/gas/mips/elf-rel-xgot-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-xgot-n64.d b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
rename to gas/testsuite/gas/mips/elf-rel-xgot-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel.d b/gas/testsuite/gas/mips/elf-rel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel.d
rename to gas/testsuite/gas/mips/elf-rel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel.s b/gas/testsuite/gas/mips/elf-rel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel.s
rename to gas/testsuite/gas/mips/elf-rel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel10.d b/gas/testsuite/gas/mips/elf-rel10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel10.d
rename to gas/testsuite/gas/mips/elf-rel10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel10.s b/gas/testsuite/gas/mips/elf-rel10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel10.s
rename to gas/testsuite/gas/mips/elf-rel10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel11.d b/gas/testsuite/gas/mips/elf-rel11.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel11.d
rename to gas/testsuite/gas/mips/elf-rel11.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel11.s b/gas/testsuite/gas/mips/elf-rel11.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel11.s
rename to gas/testsuite/gas/mips/elf-rel11.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel12.d b/gas/testsuite/gas/mips/elf-rel12.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel12.d
rename to gas/testsuite/gas/mips/elf-rel12.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel12.s b/gas/testsuite/gas/mips/elf-rel12.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel12.s
rename to gas/testsuite/gas/mips/elf-rel12.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13-mips16.d b/gas/testsuite/gas/mips/elf-rel13-mips16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13-mips16.d
rename to gas/testsuite/gas/mips/elf-rel13-mips16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13-mips16.s b/gas/testsuite/gas/mips/elf-rel13-mips16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13-mips16.s
rename to gas/testsuite/gas/mips/elf-rel13-mips16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13.d b/gas/testsuite/gas/mips/elf-rel13.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13.d
rename to gas/testsuite/gas/mips/elf-rel13.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13.s b/gas/testsuite/gas/mips/elf-rel13.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel13.s
rename to gas/testsuite/gas/mips/elf-rel13.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel14.d b/gas/testsuite/gas/mips/elf-rel14.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel14.d
rename to gas/testsuite/gas/mips/elf-rel14.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel14.s b/gas/testsuite/gas/mips/elf-rel14.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel14.s
rename to gas/testsuite/gas/mips/elf-rel14.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel15.d b/gas/testsuite/gas/mips/elf-rel15.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel15.d
rename to gas/testsuite/gas/mips/elf-rel15.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel15.s b/gas/testsuite/gas/mips/elf-rel15.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel15.s
rename to gas/testsuite/gas/mips/elf-rel15.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel16.d b/gas/testsuite/gas/mips/elf-rel16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel16.d
rename to gas/testsuite/gas/mips/elf-rel16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel16.s b/gas/testsuite/gas/mips/elf-rel16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel16.s
rename to gas/testsuite/gas/mips/elf-rel16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel17.d b/gas/testsuite/gas/mips/elf-rel17.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel17.d
rename to gas/testsuite/gas/mips/elf-rel17.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel17.s b/gas/testsuite/gas/mips/elf-rel17.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel17.s
rename to gas/testsuite/gas/mips/elf-rel17.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel18.d b/gas/testsuite/gas/mips/elf-rel18.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel18.d
rename to gas/testsuite/gas/mips/elf-rel18.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel18.s b/gas/testsuite/gas/mips/elf-rel18.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel18.s
rename to gas/testsuite/gas/mips/elf-rel18.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel19.d b/gas/testsuite/gas/mips/elf-rel19.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel19.d
rename to gas/testsuite/gas/mips/elf-rel19.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel19.s b/gas/testsuite/gas/mips/elf-rel19.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel19.s
rename to gas/testsuite/gas/mips/elf-rel19.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel2.d b/gas/testsuite/gas/mips/elf-rel2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel2.d
rename to gas/testsuite/gas/mips/elf-rel2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel2.s b/gas/testsuite/gas/mips/elf-rel2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel2.s
rename to gas/testsuite/gas/mips/elf-rel2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel20.d b/gas/testsuite/gas/mips/elf-rel20.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel20.d
rename to gas/testsuite/gas/mips/elf-rel20.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel20.s b/gas/testsuite/gas/mips/elf-rel20.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel20.s
rename to gas/testsuite/gas/mips/elf-rel20.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel21.d b/gas/testsuite/gas/mips/elf-rel21.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel21.d
rename to gas/testsuite/gas/mips/elf-rel21.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel21.s b/gas/testsuite/gas/mips/elf-rel21.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel21.s
rename to gas/testsuite/gas/mips/elf-rel21.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel22.d b/gas/testsuite/gas/mips/elf-rel22.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel22.d
rename to gas/testsuite/gas/mips/elf-rel22.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel22.s b/gas/testsuite/gas/mips/elf-rel22.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel22.s
rename to gas/testsuite/gas/mips/elf-rel22.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23.d b/gas/testsuite/gas/mips/elf-rel23.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23.d
rename to gas/testsuite/gas/mips/elf-rel23.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23.s b/gas/testsuite/gas/mips/elf-rel23.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23.s
rename to gas/testsuite/gas/mips/elf-rel23.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23a.d b/gas/testsuite/gas/mips/elf-rel23a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23a.d
rename to gas/testsuite/gas/mips/elf-rel23a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23b.d b/gas/testsuite/gas/mips/elf-rel23b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel23b.d
rename to gas/testsuite/gas/mips/elf-rel23b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel24.d b/gas/testsuite/gas/mips/elf-rel24.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel24.d
rename to gas/testsuite/gas/mips/elf-rel24.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel24.s b/gas/testsuite/gas/mips/elf-rel24.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel24.s
rename to gas/testsuite/gas/mips/elf-rel24.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel25.d b/gas/testsuite/gas/mips/elf-rel25.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel25.d
rename to gas/testsuite/gas/mips/elf-rel25.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel25.s b/gas/testsuite/gas/mips/elf-rel25.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel25.s
rename to gas/testsuite/gas/mips/elf-rel25.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel25a.d b/gas/testsuite/gas/mips/elf-rel25a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel25a.d
rename to gas/testsuite/gas/mips/elf-rel25a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel26.d b/gas/testsuite/gas/mips/elf-rel26.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel26.d
rename to gas/testsuite/gas/mips/elf-rel26.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel26.s b/gas/testsuite/gas/mips/elf-rel26.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel26.s
rename to gas/testsuite/gas/mips/elf-rel26.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel27.d b/gas/testsuite/gas/mips/elf-rel27.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel27.d
rename to gas/testsuite/gas/mips/elf-rel27.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel27.s b/gas/testsuite/gas/mips/elf-rel27.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel27.s
rename to gas/testsuite/gas/mips/elf-rel27.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel28-n32.d b/gas/testsuite/gas/mips/elf-rel28-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel28-n32.d
rename to gas/testsuite/gas/mips/elf-rel28-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel28-n64.d b/gas/testsuite/gas/mips/elf-rel28-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel28-n64.d
rename to gas/testsuite/gas/mips/elf-rel28-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel28.s b/gas/testsuite/gas/mips/elf-rel28.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel28.s
rename to gas/testsuite/gas/mips/elf-rel28.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel3.d b/gas/testsuite/gas/mips/elf-rel3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel3.d
rename to gas/testsuite/gas/mips/elf-rel3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel3.s b/gas/testsuite/gas/mips/elf-rel3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel3.s
rename to gas/testsuite/gas/mips/elf-rel3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel4.d b/gas/testsuite/gas/mips/elf-rel4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel4.d
rename to gas/testsuite/gas/mips/elf-rel4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel4.s b/gas/testsuite/gas/mips/elf-rel4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel4.s
rename to gas/testsuite/gas/mips/elf-rel4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel5.d b/gas/testsuite/gas/mips/elf-rel5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel5.d
rename to gas/testsuite/gas/mips/elf-rel5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel5.s b/gas/testsuite/gas/mips/elf-rel5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel5.s
rename to gas/testsuite/gas/mips/elf-rel5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6-n32.d b/gas/testsuite/gas/mips/elf-rel6-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6-n32.d
rename to gas/testsuite/gas/mips/elf-rel6-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6-n64.d b/gas/testsuite/gas/mips/elf-rel6-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6-n64.d
rename to gas/testsuite/gas/mips/elf-rel6-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6.d b/gas/testsuite/gas/mips/elf-rel6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6.d
rename to gas/testsuite/gas/mips/elf-rel6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6.s b/gas/testsuite/gas/mips/elf-rel6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel6.s
rename to gas/testsuite/gas/mips/elf-rel6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel7.d b/gas/testsuite/gas/mips/elf-rel7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel7.d
rename to gas/testsuite/gas/mips/elf-rel7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel7.s b/gas/testsuite/gas/mips/elf-rel7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel7.s
rename to gas/testsuite/gas/mips/elf-rel7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8-mips16.d b/gas/testsuite/gas/mips/elf-rel8-mips16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8-mips16.d
rename to gas/testsuite/gas/mips/elf-rel8-mips16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8-mips16.s b/gas/testsuite/gas/mips/elf-rel8-mips16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8-mips16.s
rename to gas/testsuite/gas/mips/elf-rel8-mips16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8.d b/gas/testsuite/gas/mips/elf-rel8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8.d
rename to gas/testsuite/gas/mips/elf-rel8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8.s b/gas/testsuite/gas/mips/elf-rel8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel8.s
rename to gas/testsuite/gas/mips/elf-rel8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9-mips16.d b/gas/testsuite/gas/mips/elf-rel9-mips16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9-mips16.d
rename to gas/testsuite/gas/mips/elf-rel9-mips16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9-mips16.s b/gas/testsuite/gas/mips/elf-rel9-mips16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9-mips16.s
rename to gas/testsuite/gas/mips/elf-rel9-mips16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9.d b/gas/testsuite/gas/mips/elf-rel9.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9.d
rename to gas/testsuite/gas/mips/elf-rel9.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9.s b/gas/testsuite/gas/mips/elf-rel9.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf-rel9.s
rename to gas/testsuite/gas/mips/elf-rel9.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips1.d b/gas/testsuite/gas/mips/elf_arch_mips1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips1.d
rename to gas/testsuite/gas/mips/elf_arch_mips1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips2.d b/gas/testsuite/gas/mips/elf_arch_mips2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips2.d
rename to gas/testsuite/gas/mips/elf_arch_mips2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips3.d b/gas/testsuite/gas/mips/elf_arch_mips3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips3.d
rename to gas/testsuite/gas/mips/elf_arch_mips3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips32.d b/gas/testsuite/gas/mips/elf_arch_mips32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips32.d
rename to gas/testsuite/gas/mips/elf_arch_mips32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips32r2.d b/gas/testsuite/gas/mips/elf_arch_mips32r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips32r2.d
rename to gas/testsuite/gas/mips/elf_arch_mips32r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips4.d b/gas/testsuite/gas/mips/elf_arch_mips4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips4.d
rename to gas/testsuite/gas/mips/elf_arch_mips4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips5.d b/gas/testsuite/gas/mips/elf_arch_mips5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips5.d
rename to gas/testsuite/gas/mips/elf_arch_mips5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips64.d b/gas/testsuite/gas/mips/elf_arch_mips64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips64.d
rename to gas/testsuite/gas/mips/elf_arch_mips64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips64r2.d b/gas/testsuite/gas/mips/elf_arch_mips64r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_arch_mips64r2.d
rename to gas/testsuite/gas/mips/elf_arch_mips64r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_ase_mips16.d b/gas/testsuite/gas/mips/elf_ase_mips16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_ase_mips16.d
rename to gas/testsuite/gas/mips/elf_ase_mips16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags.c b/gas/testsuite/gas/mips/elf_e_flags.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags.c
rename to gas/testsuite/gas/mips/elf_e_flags.c
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags.s b/gas/testsuite/gas/mips/elf_e_flags.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags.s
rename to gas/testsuite/gas/mips/elf_e_flags.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags1.d b/gas/testsuite/gas/mips/elf_e_flags1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags1.d
rename to gas/testsuite/gas/mips/elf_e_flags1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags2.d b/gas/testsuite/gas/mips/elf_e_flags2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags2.d
rename to gas/testsuite/gas/mips/elf_e_flags2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags3.d b/gas/testsuite/gas/mips/elf_e_flags3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags3.d
rename to gas/testsuite/gas/mips/elf_e_flags3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags4.d b/gas/testsuite/gas/mips/elf_e_flags4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elf_e_flags4.d
rename to gas/testsuite/gas/mips/elf_e_flags4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elfel-rel.d b/gas/testsuite/gas/mips/elfel-rel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elfel-rel.d
rename to gas/testsuite/gas/mips/elfel-rel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elfel-rel2.d b/gas/testsuite/gas/mips/elfel-rel2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elfel-rel2.d
rename to gas/testsuite/gas/mips/elfel-rel2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/elfel-rel3.d b/gas/testsuite/gas/mips/elfel-rel3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/elfel-rel3.d
rename to gas/testsuite/gas/mips/elfel-rel3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/empty.s b/gas/testsuite/gas/mips/empty.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/empty.s
rename to gas/testsuite/gas/mips/empty.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/eret-1.d b/gas/testsuite/gas/mips/eret-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/eret-1.d
rename to gas/testsuite/gas/mips/eret-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/eret-1.s b/gas/testsuite/gas/mips/eret-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/eret-1.s
rename to gas/testsuite/gas/mips/eret-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/eret-2.d b/gas/testsuite/gas/mips/eret-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/eret-2.d
rename to gas/testsuite/gas/mips/eret-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/eret-2.s b/gas/testsuite/gas/mips/eret-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/eret-2.s
rename to gas/testsuite/gas/mips/eret-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/eret-3.d b/gas/testsuite/gas/mips/eret-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/eret-3.d
rename to gas/testsuite/gas/mips/eret-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/eret-3.s b/gas/testsuite/gas/mips/eret-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/eret-3.s
rename to gas/testsuite/gas/mips/eret-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/expr1.d b/gas/testsuite/gas/mips/expr1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/expr1.d
rename to gas/testsuite/gas/mips/expr1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/expr1.s b/gas/testsuite/gas/mips/expr1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/expr1.s
rename to gas/testsuite/gas/mips/expr1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-32.d b/gas/testsuite/gas/mips/fpr-names-32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-32.d
rename to gas/testsuite/gas/mips/fpr-names-32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-64.d b/gas/testsuite/gas/mips/fpr-names-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-64.d
rename to gas/testsuite/gas/mips/fpr-names-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-n32.d b/gas/testsuite/gas/mips/fpr-names-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-n32.d
rename to gas/testsuite/gas/mips/fpr-names-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-numeric.d b/gas/testsuite/gas/mips/fpr-names-numeric.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names-numeric.d
rename to gas/testsuite/gas/mips/fpr-names-numeric.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names.s b/gas/testsuite/gas/mips/fpr-names.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/fpr-names.s
rename to gas/testsuite/gas/mips/fpr-names.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-32.d b/gas/testsuite/gas/mips/gpr-names-32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-32.d
rename to gas/testsuite/gas/mips/gpr-names-32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-64.d b/gas/testsuite/gas/mips/gpr-names-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-64.d
rename to gas/testsuite/gas/mips/gpr-names-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-n32.d b/gas/testsuite/gas/mips/gpr-names-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-n32.d
rename to gas/testsuite/gas/mips/gpr-names-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-numeric.d b/gas/testsuite/gas/mips/gpr-names-numeric.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names-numeric.d
rename to gas/testsuite/gas/mips/gpr-names-numeric.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names.s b/gas/testsuite/gas/mips/gpr-names.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/gpr-names.s
rename to gas/testsuite/gas/mips/gpr-names.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names-mips32r2.d b/gas/testsuite/gas/mips/hwr-names-mips32r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names-mips32r2.d
rename to gas/testsuite/gas/mips/hwr-names-mips32r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names-mips64r2.d b/gas/testsuite/gas/mips/hwr-names-mips64r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names-mips64r2.d
rename to gas/testsuite/gas/mips/hwr-names-mips64r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names-numeric.d b/gas/testsuite/gas/mips/hwr-names-numeric.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names-numeric.d
rename to gas/testsuite/gas/mips/hwr-names-numeric.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names.s b/gas/testsuite/gas/mips/hwr-names.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/hwr-names.s
rename to gas/testsuite/gas/mips/hwr-names.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/illegal.l b/gas/testsuite/gas/mips/illegal.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/illegal.l
rename to gas/testsuite/gas/mips/illegal.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/illegal.s b/gas/testsuite/gas/mips/illegal.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/illegal.s
rename to gas/testsuite/gas/mips/illegal.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/itbl b/gas/testsuite/gas/mips/itbl
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/itbl
rename to gas/testsuite/gas/mips/itbl
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/itbl.s b/gas/testsuite/gas/mips/itbl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/itbl.s
rename to gas/testsuite/gas/mips/itbl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-newabi.d b/gas/testsuite/gas/mips/jal-newabi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-newabi.d
rename to gas/testsuite/gas/mips/jal-newabi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-newabi.s b/gas/testsuite/gas/mips/jal-newabi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-newabi.s
rename to gas/testsuite/gas/mips/jal-newabi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-range.l b/gas/testsuite/gas/mips/jal-range.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-range.l
rename to gas/testsuite/gas/mips/jal-range.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-range.s b/gas/testsuite/gas/mips/jal-range.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-range.s
rename to gas/testsuite/gas/mips/jal-range.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d b/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
rename to gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic-noreorder.s b/gas/testsuite/gas/mips/jal-svr4pic-noreorder.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic-noreorder.s
rename to gas/testsuite/gas/mips/jal-svr4pic-noreorder.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic.d b/gas/testsuite/gas/mips/jal-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic.d
rename to gas/testsuite/gas/mips/jal-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic.s b/gas/testsuite/gas/mips/jal-svr4pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-svr4pic.s
rename to gas/testsuite/gas/mips/jal-svr4pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal-xgot.d b/gas/testsuite/gas/mips/jal-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal-xgot.d
rename to gas/testsuite/gas/mips/jal-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal.d b/gas/testsuite/gas/mips/jal.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal.d
rename to gas/testsuite/gas/mips/jal.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jal.s b/gas/testsuite/gas/mips/jal.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jal.s
rename to gas/testsuite/gas/mips/jal.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jalr.l b/gas/testsuite/gas/mips/jalr.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jalr.l
rename to gas/testsuite/gas/mips/jalr.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jalr.s b/gas/testsuite/gas/mips/jalr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jalr.s
rename to gas/testsuite/gas/mips/jalr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jalr2.d b/gas/testsuite/gas/mips/jalr2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jalr2.d
rename to gas/testsuite/gas/mips/jalr2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/jalr2.s b/gas/testsuite/gas/mips/jalr2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/jalr2.s
rename to gas/testsuite/gas/mips/jalr2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-forward-n32.d b/gas/testsuite/gas/mips/l_d-forward-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-forward-n32.d
rename to gas/testsuite/gas/mips/l_d-forward-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-forward-n64.d b/gas/testsuite/gas/mips/l_d-forward-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-forward-n64.d
rename to gas/testsuite/gas/mips/l_d-forward-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-forward.d b/gas/testsuite/gas/mips/l_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-forward.d
rename to gas/testsuite/gas/mips/l_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-n32.d b/gas/testsuite/gas/mips/l_d-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-n32.d
rename to gas/testsuite/gas/mips/l_d-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-n64.d b/gas/testsuite/gas/mips/l_d-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/l_d-n64.d
rename to gas/testsuite/gas/mips/l_d-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/l_d.d b/gas/testsuite/gas/mips/l_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/l_d.d
rename to gas/testsuite/gas/mips/l_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/la-svr4pic.d b/gas/testsuite/gas/mips/la-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/la-svr4pic.d
rename to gas/testsuite/gas/mips/la-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/la-xgot.d b/gas/testsuite/gas/mips/la-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/la-xgot.d
rename to gas/testsuite/gas/mips/la-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/la.d b/gas/testsuite/gas/mips/la.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/la.d
rename to gas/testsuite/gas/mips/la.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/la.s b/gas/testsuite/gas/mips/la.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/la.s
rename to gas/testsuite/gas/mips/la.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lb-pic.s b/gas/testsuite/gas/mips/lb-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lb-pic.s
rename to gas/testsuite/gas/mips/lb-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lb-svr4pic-ilocks.d b/gas/testsuite/gas/mips/lb-svr4pic-ilocks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lb-svr4pic-ilocks.d
rename to gas/testsuite/gas/mips/lb-svr4pic-ilocks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lb-svr4pic.d b/gas/testsuite/gas/mips/lb-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lb-svr4pic.d
rename to gas/testsuite/gas/mips/lb-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lb-xgot-ilocks.d b/gas/testsuite/gas/mips/lb-xgot-ilocks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lb-xgot-ilocks.d
rename to gas/testsuite/gas/mips/lb-xgot-ilocks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lb-xgot.d b/gas/testsuite/gas/mips/lb-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lb-xgot.d
rename to gas/testsuite/gas/mips/lb-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lb.d b/gas/testsuite/gas/mips/lb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lb.d
rename to gas/testsuite/gas/mips/lb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lb.s b/gas/testsuite/gas/mips/lb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lb.s
rename to gas/testsuite/gas/mips/lb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lca-svr4pic.d b/gas/testsuite/gas/mips/lca-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lca-svr4pic.d
rename to gas/testsuite/gas/mips/lca-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lca-xgot.d b/gas/testsuite/gas/mips/lca-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lca-xgot.d
rename to gas/testsuite/gas/mips/lca-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lca.s b/gas/testsuite/gas/mips/lca.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lca.s
rename to gas/testsuite/gas/mips/lca.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-forward-n32.d b/gas/testsuite/gas/mips/ld-forward-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-forward-n32.d
rename to gas/testsuite/gas/mips/ld-forward-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-forward-n64.d b/gas/testsuite/gas/mips/ld-forward-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-forward-n64.d
rename to gas/testsuite/gas/mips/ld-forward-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-forward.d b/gas/testsuite/gas/mips/ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-forward.d
rename to gas/testsuite/gas/mips/ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-n32.d b/gas/testsuite/gas/mips/ld-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-n32.d
rename to gas/testsuite/gas/mips/ld-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-n64.d b/gas/testsuite/gas/mips/ld-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-n64.d
rename to gas/testsuite/gas/mips/ld-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-pic.s b/gas/testsuite/gas/mips/ld-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-pic.s
rename to gas/testsuite/gas/mips/ld-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-svr4pic.d b/gas/testsuite/gas/mips/ld-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-svr4pic.d
rename to gas/testsuite/gas/mips/ld-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld-xgot.d b/gas/testsuite/gas/mips/ld-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld-xgot.d
rename to gas/testsuite/gas/mips/ld-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld.d
rename to gas/testsuite/gas/mips/ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ld.s b/gas/testsuite/gas/mips/ld.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ld.s
rename to gas/testsuite/gas/mips/ld.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-forward-n32.d b/gas/testsuite/gas/mips/ldc1-forward-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-forward-n32.d
rename to gas/testsuite/gas/mips/ldc1-forward-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-forward-n64.d b/gas/testsuite/gas/mips/ldc1-forward-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-forward-n64.d
rename to gas/testsuite/gas/mips/ldc1-forward-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-forward.d b/gas/testsuite/gas/mips/ldc1-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-forward.d
rename to gas/testsuite/gas/mips/ldc1-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-n32.d b/gas/testsuite/gas/mips/ldc1-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-n32.d
rename to gas/testsuite/gas/mips/ldc1-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-n64.d b/gas/testsuite/gas/mips/ldc1-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1-n64.d
rename to gas/testsuite/gas/mips/ldc1-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1.d b/gas/testsuite/gas/mips/ldc1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldc1.d
rename to gas/testsuite/gas/mips/ldc1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-1.l b/gas/testsuite/gas/mips/ldstla-32-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-1.l
rename to gas/testsuite/gas/mips/ldstla-32-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-1.s b/gas/testsuite/gas/mips/ldstla-32-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-1.s
rename to gas/testsuite/gas/mips/ldstla-32-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3-1.l b/gas/testsuite/gas/mips/ldstla-32-mips3-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3-1.l
rename to gas/testsuite/gas/mips/ldstla-32-mips3-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3-1.s b/gas/testsuite/gas/mips/ldstla-32-mips3-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3-1.s
rename to gas/testsuite/gas/mips/ldstla-32-mips3-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3-shared.d b/gas/testsuite/gas/mips/ldstla-32-mips3-shared.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3-shared.d
rename to gas/testsuite/gas/mips/ldstla-32-mips3-shared.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3.d b/gas/testsuite/gas/mips/ldstla-32-mips3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3.d
rename to gas/testsuite/gas/mips/ldstla-32-mips3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3.s b/gas/testsuite/gas/mips/ldstla-32-mips3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-mips3.s
rename to gas/testsuite/gas/mips/ldstla-32-mips3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-shared.d b/gas/testsuite/gas/mips/ldstla-32-shared.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32-shared.d
rename to gas/testsuite/gas/mips/ldstla-32-shared.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32.d b/gas/testsuite/gas/mips/ldstla-32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32.d
rename to gas/testsuite/gas/mips/ldstla-32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32.s b/gas/testsuite/gas/mips/ldstla-32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-32.s
rename to gas/testsuite/gas/mips/ldstla-32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-eabi64.d b/gas/testsuite/gas/mips/ldstla-eabi64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-eabi64.d
rename to gas/testsuite/gas/mips/ldstla-eabi64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64-shared.d b/gas/testsuite/gas/mips/ldstla-n64-shared.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64-shared.d
rename to gas/testsuite/gas/mips/ldstla-n64-shared.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64-sym32.d b/gas/testsuite/gas/mips/ldstla-n64-sym32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64-sym32.d
rename to gas/testsuite/gas/mips/ldstla-n64-sym32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64.d b/gas/testsuite/gas/mips/ldstla-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64.d
rename to gas/testsuite/gas/mips/ldstla-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64.s b/gas/testsuite/gas/mips/ldstla-n64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-n64.s
rename to gas/testsuite/gas/mips/ldstla-n64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-sym32.s b/gas/testsuite/gas/mips/ldstla-sym32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ldstla-sym32.s
rename to gas/testsuite/gas/mips/ldstla-sym32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/li.d b/gas/testsuite/gas/mips/li.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/li.d
rename to gas/testsuite/gas/mips/li.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/li.s b/gas/testsuite/gas/mips/li.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/li.s
rename to gas/testsuite/gas/mips/li.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lif-svr4pic.d b/gas/testsuite/gas/mips/lif-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lif-svr4pic.d
rename to gas/testsuite/gas/mips/lif-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lif-xgot.d b/gas/testsuite/gas/mips/lif-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lif-xgot.d
rename to gas/testsuite/gas/mips/lif-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lifloat.d b/gas/testsuite/gas/mips/lifloat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lifloat.d
rename to gas/testsuite/gas/mips/lifloat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lifloat.s b/gas/testsuite/gas/mips/lifloat.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lifloat.s
rename to gas/testsuite/gas/mips/lifloat.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lineno.d b/gas/testsuite/gas/mips/lineno.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lineno.d
rename to gas/testsuite/gas/mips/lineno.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/lineno.s b/gas/testsuite/gas/mips/lineno.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/lineno.s
rename to gas/testsuite/gas/mips/lineno.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2e.d b/gas/testsuite/gas/mips/loongson-2e.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2e.d
rename to gas/testsuite/gas/mips/loongson-2e.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2e.s b/gas/testsuite/gas/mips/loongson-2e.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2e.s
rename to gas/testsuite/gas/mips/loongson-2e.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-2.d b/gas/testsuite/gas/mips/loongson-2f-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-2.d
rename to gas/testsuite/gas/mips/loongson-2f-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-2.s b/gas/testsuite/gas/mips/loongson-2f-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-2.s
rename to gas/testsuite/gas/mips/loongson-2f-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-3.d b/gas/testsuite/gas/mips/loongson-2f-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-3.d
rename to gas/testsuite/gas/mips/loongson-2f-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-3.s b/gas/testsuite/gas/mips/loongson-2f-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f-3.s
rename to gas/testsuite/gas/mips/loongson-2f-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f.d b/gas/testsuite/gas/mips/loongson-2f.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f.d
rename to gas/testsuite/gas/mips/loongson-2f.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f.s b/gas/testsuite/gas/mips/loongson-2f.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/loongson-2f.s
rename to gas/testsuite/gas/mips/loongson-2f.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1-n32.d b/gas/testsuite/gas/mips/macro-warn-1-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1-n32.d
rename to gas/testsuite/gas/mips/macro-warn-1-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1-n32.l b/gas/testsuite/gas/mips/macro-warn-1-n32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1-n32.l
rename to gas/testsuite/gas/mips/macro-warn-1-n32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1.d b/gas/testsuite/gas/mips/macro-warn-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1.d
rename to gas/testsuite/gas/mips/macro-warn-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1.l b/gas/testsuite/gas/mips/macro-warn-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1.l
rename to gas/testsuite/gas/mips/macro-warn-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1.s b/gas/testsuite/gas/mips/macro-warn-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-1.s
rename to gas/testsuite/gas/mips/macro-warn-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2-n32.d b/gas/testsuite/gas/mips/macro-warn-2-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2-n32.d
rename to gas/testsuite/gas/mips/macro-warn-2-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2.d b/gas/testsuite/gas/mips/macro-warn-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2.d
rename to gas/testsuite/gas/mips/macro-warn-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2.l b/gas/testsuite/gas/mips/macro-warn-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2.l
rename to gas/testsuite/gas/mips/macro-warn-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2.s b/gas/testsuite/gas/mips/macro-warn-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-2.s
rename to gas/testsuite/gas/mips/macro-warn-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-3.d b/gas/testsuite/gas/mips/macro-warn-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-3.d
rename to gas/testsuite/gas/mips/macro-warn-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-3.l b/gas/testsuite/gas/mips/macro-warn-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-3.l
rename to gas/testsuite/gas/mips/macro-warn-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-3.s b/gas/testsuite/gas/mips/macro-warn-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-3.s
rename to gas/testsuite/gas/mips/macro-warn-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-4.d b/gas/testsuite/gas/mips/macro-warn-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-4.d
rename to gas/testsuite/gas/mips/macro-warn-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-4.l b/gas/testsuite/gas/mips/macro-warn-4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-4.l
rename to gas/testsuite/gas/mips/macro-warn-4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-4.s b/gas/testsuite/gas/mips/macro-warn-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/macro-warn-4.s
rename to gas/testsuite/gas/mips/macro-warn-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic.d b/gas/testsuite/gas/mips/mips-abi32-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic.d
rename to gas/testsuite/gas/mips/mips-abi32-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic.s b/gas/testsuite/gas/mips/mips-abi32-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic.s
rename to gas/testsuite/gas/mips/mips-abi32-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic2.d b/gas/testsuite/gas/mips/mips-abi32-pic2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic2.d
rename to gas/testsuite/gas/mips/mips-abi32-pic2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic2.s b/gas/testsuite/gas/mips/mips-abi32-pic2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32-pic2.s
rename to gas/testsuite/gas/mips/mips-abi32-pic2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32.d b/gas/testsuite/gas/mips/mips-abi32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32.d
rename to gas/testsuite/gas/mips/mips-abi32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32.s b/gas/testsuite/gas/mips/mips-abi32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-abi32.s
rename to gas/testsuite/gas/mips/mips-abi32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-double-float-flag.l b/gas/testsuite/gas/mips/mips-double-float-flag.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-double-float-flag.l
rename to gas/testsuite/gas/mips/mips-double-float-flag.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-double-float-flag.s b/gas/testsuite/gas/mips/mips-double-float-flag.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-double-float-flag.s
rename to gas/testsuite/gas/mips/mips-double-float-flag.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
rename to gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32-pic.s b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32-pic.s
rename to gas/testsuite/gas/mips/mips-gp32-fp32-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32.d b/gas/testsuite/gas/mips/mips-gp32-fp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32.d
rename to gas/testsuite/gas/mips/mips-gp32-fp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32.s b/gas/testsuite/gas/mips/mips-gp32-fp32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp32.s
rename to gas/testsuite/gas/mips/mips-gp32-fp32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
rename to gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64-pic.s b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64-pic.s
rename to gas/testsuite/gas/mips/mips-gp32-fp64-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64.d b/gas/testsuite/gas/mips/mips-gp32-fp64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64.d
rename to gas/testsuite/gas/mips/mips-gp32-fp64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64.l b/gas/testsuite/gas/mips/mips-gp32-fp64.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64.l
rename to gas/testsuite/gas/mips/mips-gp32-fp64.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64.s b/gas/testsuite/gas/mips/mips-gp32-fp64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp32-fp64.s
rename to gas/testsuite/gas/mips/mips-gp32-fp64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
rename to gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32-pic.l b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32-pic.l
rename to gas/testsuite/gas/mips/mips-gp64-fp32-pic.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
rename to gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32.d b/gas/testsuite/gas/mips/mips-gp64-fp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32.d
rename to gas/testsuite/gas/mips/mips-gp64-fp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32.l b/gas/testsuite/gas/mips/mips-gp64-fp32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32.l
rename to gas/testsuite/gas/mips/mips-gp64-fp32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32.s b/gas/testsuite/gas/mips/mips-gp64-fp32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp32.s
rename to gas/testsuite/gas/mips/mips-gp64-fp32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
rename to gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
rename to gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64.d b/gas/testsuite/gas/mips/mips-gp64-fp64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64.d
rename to gas/testsuite/gas/mips/mips-gp64-fp64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64.l b/gas/testsuite/gas/mips/mips-gp64-fp64.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64.l
rename to gas/testsuite/gas/mips/mips-gp64-fp64.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64.s b/gas/testsuite/gas/mips/mips-gp64-fp64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-gp64-fp64.s
rename to gas/testsuite/gas/mips/mips-gp64-fp64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-hard-float-flag.l b/gas/testsuite/gas/mips/mips-hard-float-flag.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-hard-float-flag.l
rename to gas/testsuite/gas/mips/mips-hard-float-flag.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-hard-float-flag.s b/gas/testsuite/gas/mips/mips-hard-float-flag.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-hard-float-flag.s
rename to gas/testsuite/gas/mips/mips-hard-float-flag.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx-2.d b/gas/testsuite/gas/mips/mips-jalx-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx-2.d
rename to gas/testsuite/gas/mips/mips-jalx-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx-2.s b/gas/testsuite/gas/mips/mips-jalx-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx-2.s
rename to gas/testsuite/gas/mips/mips-jalx-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx.d b/gas/testsuite/gas/mips/mips-jalx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx.d
rename to gas/testsuite/gas/mips/mips-jalx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx.s b/gas/testsuite/gas/mips/mips-jalx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-jalx.s
rename to gas/testsuite/gas/mips/mips-jalx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-nofp.l b/gas/testsuite/gas/mips/mips-macro-ill-nofp.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-nofp.l
rename to gas/testsuite/gas/mips/mips-macro-ill-nofp.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-nofp.s b/gas/testsuite/gas/mips/mips-macro-ill-nofp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-nofp.s
rename to gas/testsuite/gas/mips/mips-macro-ill-nofp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-sfp.l b/gas/testsuite/gas/mips/mips-macro-ill-sfp.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-sfp.l
rename to gas/testsuite/gas/mips/mips-macro-ill-sfp.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-sfp.s b/gas/testsuite/gas/mips/mips-macro-ill-sfp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips-macro-ill-sfp.s
rename to gas/testsuite/gas/mips/mips-macro-ill-sfp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips.exp
rename to gas/testsuite/gas/mips/mips.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1-fp.d b/gas/testsuite/gas/mips/mips1-fp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1-fp.d
rename to gas/testsuite/gas/mips/mips1-fp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1-fp.l b/gas/testsuite/gas/mips/mips1-fp.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1-fp.l
rename to gas/testsuite/gas/mips/mips1-fp.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1-fp.s b/gas/testsuite/gas/mips/mips1-fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1-fp.s
rename to gas/testsuite/gas/mips/mips1-fp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-64.d b/gas/testsuite/gas/mips/mips16-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-64.d
rename to gas/testsuite/gas/mips/mips16-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-dwarf2-n32.d b/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
rename to gas/testsuite/gas/mips/mips16-dwarf2-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-dwarf2.d b/gas/testsuite/gas/mips/mips16-dwarf2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-dwarf2.d
rename to gas/testsuite/gas/mips/mips16-dwarf2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-dwarf2.s b/gas/testsuite/gas/mips/mips16-dwarf2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-dwarf2.s
rename to gas/testsuite/gas/mips/mips16-dwarf2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-e.d b/gas/testsuite/gas/mips/mips16-e.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-e.d
rename to gas/testsuite/gas/mips/mips16-e.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-e.s b/gas/testsuite/gas/mips/mips16-e.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-e.s
rename to gas/testsuite/gas/mips/mips16-e.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-f.d b/gas/testsuite/gas/mips/mips16-f.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-f.d
rename to gas/testsuite/gas/mips/mips16-f.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-f.s b/gas/testsuite/gas/mips/mips16-f.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-f.s
rename to gas/testsuite/gas/mips/mips16-f.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo-match.d b/gas/testsuite/gas/mips/mips16-hilo-match.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo-match.d
rename to gas/testsuite/gas/mips/mips16-hilo-match.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo-match.s b/gas/testsuite/gas/mips/mips16-hilo-match.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo-match.s
rename to gas/testsuite/gas/mips/mips16-hilo-match.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo-n32.d b/gas/testsuite/gas/mips/mips16-hilo-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo-n32.d
rename to gas/testsuite/gas/mips/mips16-hilo-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo.d b/gas/testsuite/gas/mips/mips16-hilo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo.d
rename to gas/testsuite/gas/mips/mips16-hilo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo.s b/gas/testsuite/gas/mips/mips16-hilo.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-hilo.s
rename to gas/testsuite/gas/mips/mips16-hilo.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-intermix.d b/gas/testsuite/gas/mips/mips16-intermix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-intermix.d
rename to gas/testsuite/gas/mips/mips16-intermix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-intermix.s b/gas/testsuite/gas/mips/mips16-intermix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-intermix.s
rename to gas/testsuite/gas/mips/mips16-intermix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-jalx.d b/gas/testsuite/gas/mips/mips16-jalx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-jalx.d
rename to gas/testsuite/gas/mips/mips16-jalx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-jalx.s b/gas/testsuite/gas/mips/mips16-jalx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-jalx.s
rename to gas/testsuite/gas/mips/mips16-jalx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-vis-1.d b/gas/testsuite/gas/mips/mips16-vis-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-vis-1.d
rename to gas/testsuite/gas/mips/mips16-vis-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-vis-1.s b/gas/testsuite/gas/mips/mips16-vis-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16-vis-1.s
rename to gas/testsuite/gas/mips/mips16-vis-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16.d b/gas/testsuite/gas/mips/mips16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16.d
rename to gas/testsuite/gas/mips/mips16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16.s b/gas/testsuite/gas/mips/mips16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16.s
rename to gas/testsuite/gas/mips/mips16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-64.d b/gas/testsuite/gas/mips/mips16e-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-64.d
rename to gas/testsuite/gas/mips/mips16e-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-64.l b/gas/testsuite/gas/mips/mips16e-64.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-64.l
rename to gas/testsuite/gas/mips/mips16e-64.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-64.s b/gas/testsuite/gas/mips/mips16e-64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-64.s
rename to gas/testsuite/gas/mips/mips16e-64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-jrc.d b/gas/testsuite/gas/mips/mips16e-jrc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-jrc.d
rename to gas/testsuite/gas/mips/mips16e-jrc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-jrc.s b/gas/testsuite/gas/mips/mips16e-jrc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-jrc.s
rename to gas/testsuite/gas/mips/mips16e-jrc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-save.d b/gas/testsuite/gas/mips/mips16e-save.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-save.d
rename to gas/testsuite/gas/mips/mips16e-save.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-save.s b/gas/testsuite/gas/mips/mips16e-save.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e-save.s
rename to gas/testsuite/gas/mips/mips16e-save.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e.d b/gas/testsuite/gas/mips/mips16e.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e.d
rename to gas/testsuite/gas/mips/mips16e.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e.s b/gas/testsuite/gas/mips/mips16e.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips16e.s
rename to gas/testsuite/gas/mips/mips16e.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ecoff@sd-forward.d b/gas/testsuite/gas/mips/mips1@ecoff@sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ecoff@sd-forward.d
rename to gas/testsuite/gas/mips/mips1@ecoff@sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ecoff@sd.d b/gas/testsuite/gas/mips/mips1@ecoff@sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ecoff@sd.d
rename to gas/testsuite/gas/mips/mips1@ecoff@sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d b/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
rename to gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@jal-svr4pic.d b/gas/testsuite/gas/mips/mips1@jal-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@jal-svr4pic.d
rename to gas/testsuite/gas/mips/mips1@jal-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@l_d-forward.d b/gas/testsuite/gas/mips/mips1@l_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@l_d-forward.d
rename to gas/testsuite/gas/mips/mips1@l_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@l_d.d b/gas/testsuite/gas/mips/mips1@l_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@l_d.d
rename to gas/testsuite/gas/mips/mips1@l_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ld-forward.d b/gas/testsuite/gas/mips/mips1@ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ld-forward.d
rename to gas/testsuite/gas/mips/mips1@ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ld.d b/gas/testsuite/gas/mips/mips1@ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@ld.d
rename to gas/testsuite/gas/mips/mips1@ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@s_d-forward.d b/gas/testsuite/gas/mips/mips1@s_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@s_d-forward.d
rename to gas/testsuite/gas/mips/mips1@s_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@s_d.d b/gas/testsuite/gas/mips/mips1@s_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips1@s_d.d
rename to gas/testsuite/gas/mips/mips1@s_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@ld-forward.d b/gas/testsuite/gas/mips/mips2@ecoff@ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@ld-forward.d
rename to gas/testsuite/gas/mips/mips2@ecoff@ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@ld.d b/gas/testsuite/gas/mips/mips2@ecoff@ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@ld.d
rename to gas/testsuite/gas/mips/mips2@ecoff@ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@sd-forward.d b/gas/testsuite/gas/mips/mips2@ecoff@sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@sd-forward.d
rename to gas/testsuite/gas/mips/mips2@ecoff@sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@sd.d b/gas/testsuite/gas/mips/mips2@ecoff@sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips2@ecoff@sd.d
rename to gas/testsuite/gas/mips/mips2@ecoff@sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-cp2.d b/gas/testsuite/gas/mips/mips32-cp2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-cp2.d
rename to gas/testsuite/gas/mips/mips32-cp2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-cp2.s b/gas/testsuite/gas/mips/mips32-cp2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-cp2.s
rename to gas/testsuite/gas/mips/mips32-cp2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dsp.d b/gas/testsuite/gas/mips/mips32-dsp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dsp.d
rename to gas/testsuite/gas/mips/mips32-dsp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dsp.s b/gas/testsuite/gas/mips/mips32-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dsp.s
rename to gas/testsuite/gas/mips/mips32-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dspr2.d b/gas/testsuite/gas/mips/mips32-dspr2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dspr2.d
rename to gas/testsuite/gas/mips/mips32-dspr2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dspr2.s b/gas/testsuite/gas/mips/mips32-dspr2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-dspr2.s
rename to gas/testsuite/gas/mips/mips32-dspr2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-mt.d b/gas/testsuite/gas/mips/mips32-mt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-mt.d
rename to gas/testsuite/gas/mips/mips32-mt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-mt.s b/gas/testsuite/gas/mips/mips32-mt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-mt.s
rename to gas/testsuite/gas/mips/mips32-mt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sf32.d b/gas/testsuite/gas/mips/mips32-sf32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sf32.d
rename to gas/testsuite/gas/mips/mips32-sf32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sf32.l b/gas/testsuite/gas/mips/mips32-sf32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sf32.l
rename to gas/testsuite/gas/mips/mips32-sf32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sf32.s b/gas/testsuite/gas/mips/mips32-sf32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sf32.s
rename to gas/testsuite/gas/mips/mips32-sf32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sync.d b/gas/testsuite/gas/mips/mips32-sync.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sync.d
rename to gas/testsuite/gas/mips/mips32-sync.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sync.s b/gas/testsuite/gas/mips/mips32-sync.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32-sync.s
rename to gas/testsuite/gas/mips/mips32-sync.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32.d b/gas/testsuite/gas/mips/mips32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32.d
rename to gas/testsuite/gas/mips/mips32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32.s b/gas/testsuite/gas/mips/mips32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32.s
rename to gas/testsuite/gas/mips/mips32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@ld-forward.d b/gas/testsuite/gas/mips/mips32@ecoff@ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@ld-forward.d
rename to gas/testsuite/gas/mips/mips32@ecoff@ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@ld.d b/gas/testsuite/gas/mips/mips32@ecoff@ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@ld.d
rename to gas/testsuite/gas/mips/mips32@ecoff@ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@sd-forward.d b/gas/testsuite/gas/mips/mips32@ecoff@sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@sd-forward.d
rename to gas/testsuite/gas/mips/mips32@ecoff@sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@sd.d b/gas/testsuite/gas/mips/mips32@ecoff@sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32@ecoff@sd.d
rename to gas/testsuite/gas/mips/mips32@ecoff@sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-cp2.d b/gas/testsuite/gas/mips/mips32r2-cp2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-cp2.d
rename to gas/testsuite/gas/mips/mips32r2-cp2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-cp2.s b/gas/testsuite/gas/mips/mips32r2-cp2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-cp2.s
rename to gas/testsuite/gas/mips/mips32r2-cp2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-fp32.d b/gas/testsuite/gas/mips/mips32r2-fp32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-fp32.d
rename to gas/testsuite/gas/mips/mips32r2-fp32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-fp32.l b/gas/testsuite/gas/mips/mips32r2-fp32.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-fp32.l
rename to gas/testsuite/gas/mips/mips32r2-fp32.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-fp32.s b/gas/testsuite/gas/mips/mips32r2-fp32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-fp32.s
rename to gas/testsuite/gas/mips/mips32r2-fp32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-fp64.l b/gas/testsuite/gas/mips/mips32r2-ill-fp64.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-fp64.l
rename to gas/testsuite/gas/mips/mips32r2-ill-fp64.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-fp64.s b/gas/testsuite/gas/mips/mips32r2-ill-fp64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-fp64.s
rename to gas/testsuite/gas/mips/mips32r2-ill-fp64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-nofp.l b/gas/testsuite/gas/mips/mips32r2-ill-nofp.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-nofp.l
rename to gas/testsuite/gas/mips/mips32r2-ill-nofp.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-nofp.s b/gas/testsuite/gas/mips/mips32r2-ill-nofp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill-nofp.s
rename to gas/testsuite/gas/mips/mips32r2-ill-nofp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill.l b/gas/testsuite/gas/mips/mips32r2-ill.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill.l
rename to gas/testsuite/gas/mips/mips32r2-ill.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill.s b/gas/testsuite/gas/mips/mips32r2-ill.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-ill.s
rename to gas/testsuite/gas/mips/mips32r2-ill.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-sync.d b/gas/testsuite/gas/mips/mips32r2-sync.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-sync.d
rename to gas/testsuite/gas/mips/mips32r2-sync.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-sync.s b/gas/testsuite/gas/mips/mips32r2-sync.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2-sync.s
rename to gas/testsuite/gas/mips/mips32r2-sync.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2.d b/gas/testsuite/gas/mips/mips32r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2.d
rename to gas/testsuite/gas/mips/mips32r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2.s b/gas/testsuite/gas/mips/mips32r2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2.s
rename to gas/testsuite/gas/mips/mips32r2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@ld-forward.d b/gas/testsuite/gas/mips/mips32r2@ecoff@ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@ld-forward.d
rename to gas/testsuite/gas/mips/mips32r2@ecoff@ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@ld.d b/gas/testsuite/gas/mips/mips32r2@ecoff@ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@ld.d
rename to gas/testsuite/gas/mips/mips32r2@ecoff@ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@sd-forward.d b/gas/testsuite/gas/mips/mips32r2@ecoff@sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@sd-forward.d
rename to gas/testsuite/gas/mips/mips32r2@ecoff@sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@sd.d b/gas/testsuite/gas/mips/mips32r2@ecoff@sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips32r2@ecoff@sd.d
rename to gas/testsuite/gas/mips/mips32r2@ecoff@sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-branch-likely.d b/gas/testsuite/gas/mips/mips4-branch-likely.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-branch-likely.d
rename to gas/testsuite/gas/mips/mips4-branch-likely.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-branch-likely.l b/gas/testsuite/gas/mips/mips4-branch-likely.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-branch-likely.l
rename to gas/testsuite/gas/mips/mips4-branch-likely.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-branch-likely.s b/gas/testsuite/gas/mips/mips4-branch-likely.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-branch-likely.s
rename to gas/testsuite/gas/mips/mips4-branch-likely.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-fp.d b/gas/testsuite/gas/mips/mips4-fp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-fp.d
rename to gas/testsuite/gas/mips/mips4-fp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-fp.l b/gas/testsuite/gas/mips/mips4-fp.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-fp.l
rename to gas/testsuite/gas/mips/mips4-fp.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-fp.s b/gas/testsuite/gas/mips/mips4-fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4-fp.s
rename to gas/testsuite/gas/mips/mips4-fp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4.d b/gas/testsuite/gas/mips/mips4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4.d
rename to gas/testsuite/gas/mips/mips4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4.s b/gas/testsuite/gas/mips/mips4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4.s
rename to gas/testsuite/gas/mips/mips4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4010.d b/gas/testsuite/gas/mips/mips4010.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4010.d
rename to gas/testsuite/gas/mips/mips4010.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4010.s b/gas/testsuite/gas/mips/mips4010.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4010.s
rename to gas/testsuite/gas/mips/mips4010.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4100.d b/gas/testsuite/gas/mips/mips4100.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4100.d
rename to gas/testsuite/gas/mips/mips4100.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4100.s b/gas/testsuite/gas/mips/mips4100.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4100.s
rename to gas/testsuite/gas/mips/mips4100.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4650.d b/gas/testsuite/gas/mips/mips4650.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4650.d
rename to gas/testsuite/gas/mips/mips4650.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips4650.s b/gas/testsuite/gas/mips/mips4650.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips4650.s
rename to gas/testsuite/gas/mips/mips4650.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips5.d b/gas/testsuite/gas/mips/mips5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips5.d
rename to gas/testsuite/gas/mips/mips5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips5.l b/gas/testsuite/gas/mips/mips5.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips5.l
rename to gas/testsuite/gas/mips/mips5.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips5.s b/gas/testsuite/gas/mips/mips5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips5.s
rename to gas/testsuite/gas/mips/mips5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-cp2.d b/gas/testsuite/gas/mips/mips64-cp2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-cp2.d
rename to gas/testsuite/gas/mips/mips64-cp2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-cp2.s b/gas/testsuite/gas/mips/mips64-cp2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-cp2.s
rename to gas/testsuite/gas/mips/mips64-cp2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-dsp.d b/gas/testsuite/gas/mips/mips64-dsp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-dsp.d
rename to gas/testsuite/gas/mips/mips64-dsp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-dsp.s b/gas/testsuite/gas/mips/mips64-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-dsp.s
rename to gas/testsuite/gas/mips/mips64-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mdmx.d b/gas/testsuite/gas/mips/mips64-mdmx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mdmx.d
rename to gas/testsuite/gas/mips/mips64-mdmx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mdmx.s b/gas/testsuite/gas/mips/mips64-mdmx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mdmx.s
rename to gas/testsuite/gas/mips/mips64-mdmx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d-incl.d b/gas/testsuite/gas/mips/mips64-mips3d-incl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d-incl.d
rename to gas/testsuite/gas/mips/mips64-mips3d-incl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d.d b/gas/testsuite/gas/mips/mips64-mips3d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d.d
rename to gas/testsuite/gas/mips/mips64-mips3d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d.l b/gas/testsuite/gas/mips/mips64-mips3d.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d.l
rename to gas/testsuite/gas/mips/mips64-mips3d.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d.s b/gas/testsuite/gas/mips/mips64-mips3d.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64-mips3d.s
rename to gas/testsuite/gas/mips/mips64-mips3d.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64.d b/gas/testsuite/gas/mips/mips64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64.d
rename to gas/testsuite/gas/mips/mips64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64.s b/gas/testsuite/gas/mips/mips64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64.s
rename to gas/testsuite/gas/mips/mips64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2-ill.l b/gas/testsuite/gas/mips/mips64r2-ill.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2-ill.l
rename to gas/testsuite/gas/mips/mips64r2-ill.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2-ill.s b/gas/testsuite/gas/mips/mips64r2-ill.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2-ill.s
rename to gas/testsuite/gas/mips/mips64r2-ill.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2.d b/gas/testsuite/gas/mips/mips64r2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2.d
rename to gas/testsuite/gas/mips/mips64r2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2.s b/gas/testsuite/gas/mips/mips64r2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mips64r2.s
rename to gas/testsuite/gas/mips/mips64r2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mipsel16-e.d b/gas/testsuite/gas/mips/mipsel16-e.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mipsel16-e.d
rename to gas/testsuite/gas/mips/mipsel16-e.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mipsel16-f.d b/gas/testsuite/gas/mips/mipsel16-f.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mipsel16-f.d
rename to gas/testsuite/gas/mips/mipsel16-f.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mul-ilocks.d b/gas/testsuite/gas/mips/mul-ilocks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mul-ilocks.d
rename to gas/testsuite/gas/mips/mul-ilocks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mul.d b/gas/testsuite/gas/mips/mul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mul.d
rename to gas/testsuite/gas/mips/mul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/mul.s b/gas/testsuite/gas/mips/mul.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/mul.s
rename to gas/testsuite/gas/mips/mul.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/n32-consec.d b/gas/testsuite/gas/mips/n32-consec.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/n32-consec.d
rename to gas/testsuite/gas/mips/n32-consec.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/n32-consec.s b/gas/testsuite/gas/mips/n32-consec.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/n32-consec.s
rename to gas/testsuite/gas/mips/n32-consec.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-1.d b/gas/testsuite/gas/mips/noat-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-1.d
rename to gas/testsuite/gas/mips/noat-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-1.s b/gas/testsuite/gas/mips/noat-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-1.s
rename to gas/testsuite/gas/mips/noat-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-2.l b/gas/testsuite/gas/mips/noat-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-2.l
rename to gas/testsuite/gas/mips/noat-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-2.s b/gas/testsuite/gas/mips/noat-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-2.s
rename to gas/testsuite/gas/mips/noat-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-3.l b/gas/testsuite/gas/mips/noat-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-3.l
rename to gas/testsuite/gas/mips/noat-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-3.s b/gas/testsuite/gas/mips/noat-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-3.s
rename to gas/testsuite/gas/mips/noat-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-4.l b/gas/testsuite/gas/mips/noat-4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-4.l
rename to gas/testsuite/gas/mips/noat-4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-4.s b/gas/testsuite/gas/mips/noat-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-4.s
rename to gas/testsuite/gas/mips/noat-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-5.l b/gas/testsuite/gas/mips/noat-5.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-5.l
rename to gas/testsuite/gas/mips/noat-5.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-5.s b/gas/testsuite/gas/mips/noat-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-5.s
rename to gas/testsuite/gas/mips/noat-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-6.l b/gas/testsuite/gas/mips/noat-6.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-6.l
rename to gas/testsuite/gas/mips/noat-6.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-6.s b/gas/testsuite/gas/mips/noat-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-6.s
rename to gas/testsuite/gas/mips/noat-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-7.l b/gas/testsuite/gas/mips/noat-7.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-7.l
rename to gas/testsuite/gas/mips/noat-7.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noat-7.s b/gas/testsuite/gas/mips/noat-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noat-7.s
rename to gas/testsuite/gas/mips/noat-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/nodelay.d b/gas/testsuite/gas/mips/nodelay.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/nodelay.d
rename to gas/testsuite/gas/mips/nodelay.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noreorder.d b/gas/testsuite/gas/mips/noreorder.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noreorder.d
rename to gas/testsuite/gas/mips/noreorder.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/noreorder.s b/gas/testsuite/gas/mips/noreorder.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/noreorder.s
rename to gas/testsuite/gas/mips/noreorder.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-ill.l b/gas/testsuite/gas/mips/octeon-ill.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-ill.l
rename to gas/testsuite/gas/mips/octeon-ill.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-ill.s b/gas/testsuite/gas/mips/octeon-ill.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-ill.s
rename to gas/testsuite/gas/mips/octeon-ill.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-pref.d b/gas/testsuite/gas/mips/octeon-pref.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-pref.d
rename to gas/testsuite/gas/mips/octeon-pref.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-pref.s b/gas/testsuite/gas/mips/octeon-pref.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/octeon-pref.s
rename to gas/testsuite/gas/mips/octeon-pref.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/octeon.d b/gas/testsuite/gas/mips/octeon.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/octeon.d
rename to gas/testsuite/gas/mips/octeon.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/octeon.s b/gas/testsuite/gas/mips/octeon.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/octeon.s
rename to gas/testsuite/gas/mips/octeon.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/octeon@mips32r2-sync.d b/gas/testsuite/gas/mips/octeon@mips32r2-sync.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/octeon@mips32r2-sync.d
rename to gas/testsuite/gas/mips/octeon@mips32r2-sync.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/odd-float.d b/gas/testsuite/gas/mips/odd-float.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/odd-float.d
rename to gas/testsuite/gas/mips/odd-float.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/odd-float.s b/gas/testsuite/gas/mips/odd-float.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/odd-float.s
rename to gas/testsuite/gas/mips/odd-float.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/perfcount.d b/gas/testsuite/gas/mips/perfcount.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/perfcount.d
rename to gas/testsuite/gas/mips/perfcount.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/perfcount.s b/gas/testsuite/gas/mips/perfcount.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/perfcount.s
rename to gas/testsuite/gas/mips/perfcount.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ecoff@sd-forward.d b/gas/testsuite/gas/mips/r3000@ecoff@sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ecoff@sd-forward.d
rename to gas/testsuite/gas/mips/r3000@ecoff@sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ecoff@sd.d b/gas/testsuite/gas/mips/r3000@ecoff@sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ecoff@sd.d
rename to gas/testsuite/gas/mips/r3000@ecoff@sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@jal-svr4pic-noreorder.d b/gas/testsuite/gas/mips/r3000@jal-svr4pic-noreorder.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@jal-svr4pic-noreorder.d
rename to gas/testsuite/gas/mips/r3000@jal-svr4pic-noreorder.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@jal-svr4pic.d b/gas/testsuite/gas/mips/r3000@jal-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@jal-svr4pic.d
rename to gas/testsuite/gas/mips/r3000@jal-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@l_d-forward.d b/gas/testsuite/gas/mips/r3000@l_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@l_d-forward.d
rename to gas/testsuite/gas/mips/r3000@l_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@l_d.d b/gas/testsuite/gas/mips/r3000@l_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@l_d.d
rename to gas/testsuite/gas/mips/r3000@l_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ld-forward.d b/gas/testsuite/gas/mips/r3000@ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ld-forward.d
rename to gas/testsuite/gas/mips/r3000@ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ld.d b/gas/testsuite/gas/mips/r3000@ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@ld.d
rename to gas/testsuite/gas/mips/r3000@ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@s_d-forward.d b/gas/testsuite/gas/mips/r3000@s_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@s_d-forward.d
rename to gas/testsuite/gas/mips/r3000@s_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@s_d.d b/gas/testsuite/gas/mips/r3000@s_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3000@s_d.d
rename to gas/testsuite/gas/mips/r3000@s_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@ld-forward.d b/gas/testsuite/gas/mips/r3900@ecoff@ld-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@ld-forward.d
rename to gas/testsuite/gas/mips/r3900@ecoff@ld-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@ld.d b/gas/testsuite/gas/mips/r3900@ecoff@ld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@ld.d
rename to gas/testsuite/gas/mips/r3900@ecoff@ld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@sd-forward.d b/gas/testsuite/gas/mips/r3900@ecoff@sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@sd-forward.d
rename to gas/testsuite/gas/mips/r3900@ecoff@sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@sd.d b/gas/testsuite/gas/mips/r3900@ecoff@sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@ecoff@sd.d
rename to gas/testsuite/gas/mips/r3900@ecoff@sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@l_d-forward.d b/gas/testsuite/gas/mips/r3900@l_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@l_d-forward.d
rename to gas/testsuite/gas/mips/r3900@l_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@l_d.d b/gas/testsuite/gas/mips/r3900@l_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@l_d.d
rename to gas/testsuite/gas/mips/r3900@l_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@s_d-forward.d b/gas/testsuite/gas/mips/r3900@s_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@s_d-forward.d
rename to gas/testsuite/gas/mips/r3900@s_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@s_d.d b/gas/testsuite/gas/mips/r3900@s_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/r3900@s_d.d
rename to gas/testsuite/gas/mips/r3900@s_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1-mips1.d b/gas/testsuite/gas/mips/relax-swap1-mips1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1-mips1.d
rename to gas/testsuite/gas/mips/relax-swap1-mips1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1-mips2.d b/gas/testsuite/gas/mips/relax-swap1-mips2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1-mips2.d
rename to gas/testsuite/gas/mips/relax-swap1-mips2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1.l b/gas/testsuite/gas/mips/relax-swap1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1.l
rename to gas/testsuite/gas/mips/relax-swap1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1.s b/gas/testsuite/gas/mips/relax-swap1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap1.s
rename to gas/testsuite/gas/mips/relax-swap1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap2.d b/gas/testsuite/gas/mips/relax-swap2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap2.d
rename to gas/testsuite/gas/mips/relax-swap2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap2.l b/gas/testsuite/gas/mips/relax-swap2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap2.l
rename to gas/testsuite/gas/mips/relax-swap2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap2.s b/gas/testsuite/gas/mips/relax-swap2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax-swap2.s
rename to gas/testsuite/gas/mips/relax-swap2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax.d b/gas/testsuite/gas/mips/relax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax.d
rename to gas/testsuite/gas/mips/relax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax.l b/gas/testsuite/gas/mips/relax.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax.l
rename to gas/testsuite/gas/mips/relax.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/relax.s b/gas/testsuite/gas/mips/relax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/relax.s
rename to gas/testsuite/gas/mips/relax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rm7000.d b/gas/testsuite/gas/mips/rm7000.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rm7000.d
rename to gas/testsuite/gas/mips/rm7000.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rm7000.s b/gas/testsuite/gas/mips/rm7000.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rm7000.s
rename to gas/testsuite/gas/mips/rm7000.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rol-hw.d b/gas/testsuite/gas/mips/rol-hw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rol-hw.d
rename to gas/testsuite/gas/mips/rol-hw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rol.d b/gas/testsuite/gas/mips/rol.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rol.d
rename to gas/testsuite/gas/mips/rol.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rol.s b/gas/testsuite/gas/mips/rol.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rol.s
rename to gas/testsuite/gas/mips/rol.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rol64-hw.d b/gas/testsuite/gas/mips/rol64-hw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rol64-hw.d
rename to gas/testsuite/gas/mips/rol64-hw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rol64.d b/gas/testsuite/gas/mips/rol64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rol64.d
rename to gas/testsuite/gas/mips/rol64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/rol64.s b/gas/testsuite/gas/mips/rol64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/rol64.s
rename to gas/testsuite/gas/mips/rol64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-forward-n32.d b/gas/testsuite/gas/mips/s_d-forward-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-forward-n32.d
rename to gas/testsuite/gas/mips/s_d-forward-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-forward-n64.d b/gas/testsuite/gas/mips/s_d-forward-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-forward-n64.d
rename to gas/testsuite/gas/mips/s_d-forward-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-forward.d b/gas/testsuite/gas/mips/s_d-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-forward.d
rename to gas/testsuite/gas/mips/s_d-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-n32.d b/gas/testsuite/gas/mips/s_d-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-n32.d
rename to gas/testsuite/gas/mips/s_d-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-n64.d b/gas/testsuite/gas/mips/s_d-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/s_d-n64.d
rename to gas/testsuite/gas/mips/s_d-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/s_d.d b/gas/testsuite/gas/mips/s_d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/s_d.d
rename to gas/testsuite/gas/mips/s_d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sb.d b/gas/testsuite/gas/mips/sb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sb.d
rename to gas/testsuite/gas/mips/sb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sb.s b/gas/testsuite/gas/mips/sb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sb.s
rename to gas/testsuite/gas/mips/sb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-mdmx.d b/gas/testsuite/gas/mips/sb1-ext-mdmx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-mdmx.d
rename to gas/testsuite/gas/mips/sb1-ext-mdmx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-mdmx.s b/gas/testsuite/gas/mips/sb1-ext-mdmx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-mdmx.s
rename to gas/testsuite/gas/mips/sb1-ext-mdmx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-ps.d b/gas/testsuite/gas/mips/sb1-ext-ps.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-ps.d
rename to gas/testsuite/gas/mips/sb1-ext-ps.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-ps.s b/gas/testsuite/gas/mips/sb1-ext-ps.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sb1-ext-ps.s
rename to gas/testsuite/gas/mips/sb1-ext-ps.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sd-forward-n32.d b/gas/testsuite/gas/mips/sd-forward-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sd-forward-n32.d
rename to gas/testsuite/gas/mips/sd-forward-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sd-forward-n64.d b/gas/testsuite/gas/mips/sd-forward-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sd-forward-n64.d
rename to gas/testsuite/gas/mips/sd-forward-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sd-forward.d b/gas/testsuite/gas/mips/sd-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sd-forward.d
rename to gas/testsuite/gas/mips/sd-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sd-n32.d b/gas/testsuite/gas/mips/sd-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sd-n32.d
rename to gas/testsuite/gas/mips/sd-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sd-n64.d b/gas/testsuite/gas/mips/sd-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sd-n64.d
rename to gas/testsuite/gas/mips/sd-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sd.d b/gas/testsuite/gas/mips/sd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sd.d
rename to gas/testsuite/gas/mips/sd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-forward-n32.d b/gas/testsuite/gas/mips/sdc1-forward-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-forward-n32.d
rename to gas/testsuite/gas/mips/sdc1-forward-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-forward-n64.d b/gas/testsuite/gas/mips/sdc1-forward-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-forward-n64.d
rename to gas/testsuite/gas/mips/sdc1-forward-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-forward.d b/gas/testsuite/gas/mips/sdc1-forward.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-forward.d
rename to gas/testsuite/gas/mips/sdc1-forward.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-n32.d b/gas/testsuite/gas/mips/sdc1-n32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-n32.d
rename to gas/testsuite/gas/mips/sdc1-n32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-n64.d b/gas/testsuite/gas/mips/sdc1-n64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1-n64.d
rename to gas/testsuite/gas/mips/sdc1-n64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1.d b/gas/testsuite/gas/mips/sdc1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sdc1.d
rename to gas/testsuite/gas/mips/sdc1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/set-arch.d b/gas/testsuite/gas/mips/set-arch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/set-arch.d
rename to gas/testsuite/gas/mips/set-arch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/set-arch.l b/gas/testsuite/gas/mips/set-arch.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/set-arch.l
rename to gas/testsuite/gas/mips/set-arch.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/set-arch.s b/gas/testsuite/gas/mips/set-arch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/set-arch.s
rename to gas/testsuite/gas/mips/set-arch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/smartmips.d b/gas/testsuite/gas/mips/smartmips.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/smartmips.d
rename to gas/testsuite/gas/mips/smartmips.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/smartmips.s b/gas/testsuite/gas/mips/smartmips.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/smartmips.s
rename to gas/testsuite/gas/mips/smartmips.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sync.d b/gas/testsuite/gas/mips/sync.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sync.d
rename to gas/testsuite/gas/mips/sync.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/sync.s b/gas/testsuite/gas/mips/sync.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/sync.s
rename to gas/testsuite/gas/mips/sync.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tls-ill.l b/gas/testsuite/gas/mips/tls-ill.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tls-ill.l
rename to gas/testsuite/gas/mips/tls-ill.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tls-ill.s b/gas/testsuite/gas/mips/tls-ill.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tls-ill.s
rename to gas/testsuite/gas/mips/tls-ill.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tls-o32.d b/gas/testsuite/gas/mips/tls-o32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tls-o32.d
rename to gas/testsuite/gas/mips/tls-o32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tls-o32.s b/gas/testsuite/gas/mips/tls-o32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tls-o32.s
rename to gas/testsuite/gas/mips/tls-o32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tmips16-e.d b/gas/testsuite/gas/mips/tmips16-e.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tmips16-e.d
rename to gas/testsuite/gas/mips/tmips16-e.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tmips16-f.d b/gas/testsuite/gas/mips/tmips16-f.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tmips16-f.d
rename to gas/testsuite/gas/mips/tmips16-f.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tmipsel16-e.d b/gas/testsuite/gas/mips/tmipsel16-e.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tmipsel16-e.d
rename to gas/testsuite/gas/mips/tmipsel16-e.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/tmipsel16-f.d b/gas/testsuite/gas/mips/tmipsel16-f.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/tmipsel16-f.d
rename to gas/testsuite/gas/mips/tmipsel16-f.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/trap20.d b/gas/testsuite/gas/mips/trap20.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/trap20.d
rename to gas/testsuite/gas/mips/trap20.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/trap20.s b/gas/testsuite/gas/mips/trap20.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/trap20.s
rename to gas/testsuite/gas/mips/trap20.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/trunc.d b/gas/testsuite/gas/mips/trunc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/trunc.d
rename to gas/testsuite/gas/mips/trunc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/trunc.s b/gas/testsuite/gas/mips/trunc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/trunc.s
rename to gas/testsuite/gas/mips/trunc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/uld.d b/gas/testsuite/gas/mips/uld.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/uld.d
rename to gas/testsuite/gas/mips/uld.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/uld.s b/gas/testsuite/gas/mips/uld.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/uld.s
rename to gas/testsuite/gas/mips/uld.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/uld2-eb.d b/gas/testsuite/gas/mips/uld2-eb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/uld2-eb.d
rename to gas/testsuite/gas/mips/uld2-eb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/uld2-el.d b/gas/testsuite/gas/mips/uld2-el.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/uld2-el.d
rename to gas/testsuite/gas/mips/uld2-el.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/uld2.s b/gas/testsuite/gas/mips/uld2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/uld2.s
rename to gas/testsuite/gas/mips/uld2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh-pic.s b/gas/testsuite/gas/mips/ulh-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh-pic.s
rename to gas/testsuite/gas/mips/ulh-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh-svr4pic.d b/gas/testsuite/gas/mips/ulh-svr4pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh-svr4pic.d
rename to gas/testsuite/gas/mips/ulh-svr4pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh-xgot.d b/gas/testsuite/gas/mips/ulh-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh-xgot.d
rename to gas/testsuite/gas/mips/ulh-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh.d b/gas/testsuite/gas/mips/ulh.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh.d
rename to gas/testsuite/gas/mips/ulh.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh.s b/gas/testsuite/gas/mips/ulh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh.s
rename to gas/testsuite/gas/mips/ulh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh2-eb.d b/gas/testsuite/gas/mips/ulh2-eb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh2-eb.d
rename to gas/testsuite/gas/mips/ulh2-eb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh2-el.d b/gas/testsuite/gas/mips/ulh2-el.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh2-el.d
rename to gas/testsuite/gas/mips/ulh2-el.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulh2.s b/gas/testsuite/gas/mips/ulh2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulh2.s
rename to gas/testsuite/gas/mips/ulh2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulw.d b/gas/testsuite/gas/mips/ulw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulw.d
rename to gas/testsuite/gas/mips/ulw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulw.s b/gas/testsuite/gas/mips/ulw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulw.s
rename to gas/testsuite/gas/mips/ulw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-eb-ilocks.d b/gas/testsuite/gas/mips/ulw2-eb-ilocks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-eb-ilocks.d
rename to gas/testsuite/gas/mips/ulw2-eb-ilocks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-eb.d b/gas/testsuite/gas/mips/ulw2-eb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-eb.d
rename to gas/testsuite/gas/mips/ulw2-eb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-el-ilocks.d b/gas/testsuite/gas/mips/ulw2-el-ilocks.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-el-ilocks.d
rename to gas/testsuite/gas/mips/ulw2-el-ilocks.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-el.d b/gas/testsuite/gas/mips/ulw2-el.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2-el.d
rename to gas/testsuite/gas/mips/ulw2-el.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2.s b/gas/testsuite/gas/mips/ulw2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ulw2.s
rename to gas/testsuite/gas/mips/ulw2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/usd.d b/gas/testsuite/gas/mips/usd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/usd.d
rename to gas/testsuite/gas/mips/usd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/usd.s b/gas/testsuite/gas/mips/usd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/usd.s
rename to gas/testsuite/gas/mips/usd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ush.d b/gas/testsuite/gas/mips/ush.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ush.d
rename to gas/testsuite/gas/mips/ush.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/ush.s b/gas/testsuite/gas/mips/ush.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/ush.s
rename to gas/testsuite/gas/mips/ush.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/usw.d b/gas/testsuite/gas/mips/usw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/usw.d
rename to gas/testsuite/gas/mips/usw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/usw.s b/gas/testsuite/gas/mips/usw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/usw.s
rename to gas/testsuite/gas/mips/usw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4111.d b/gas/testsuite/gas/mips/vr4111.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4111.d
rename to gas/testsuite/gas/mips/vr4111.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4111.s b/gas/testsuite/gas/mips/vr4111.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4111.s
rename to gas/testsuite/gas/mips/vr4111.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120-2.d b/gas/testsuite/gas/mips/vr4120-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120-2.d
rename to gas/testsuite/gas/mips/vr4120-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120-2.s b/gas/testsuite/gas/mips/vr4120-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120-2.s
rename to gas/testsuite/gas/mips/vr4120-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120.d b/gas/testsuite/gas/mips/vr4120.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120.d
rename to gas/testsuite/gas/mips/vr4120.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120.s b/gas/testsuite/gas/mips/vr4120.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4120.s
rename to gas/testsuite/gas/mips/vr4120.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4130.d b/gas/testsuite/gas/mips/vr4130.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4130.d
rename to gas/testsuite/gas/mips/vr4130.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr4130.s b/gas/testsuite/gas/mips/vr4130.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr4130.s
rename to gas/testsuite/gas/mips/vr4130.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr5400.d b/gas/testsuite/gas/mips/vr5400.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr5400.d
rename to gas/testsuite/gas/mips/vr5400.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr5400.s b/gas/testsuite/gas/mips/vr5400.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr5400.s
rename to gas/testsuite/gas/mips/vr5400.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr5500.d b/gas/testsuite/gas/mips/vr5500.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr5500.d
rename to gas/testsuite/gas/mips/vr5500.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vr5500.s b/gas/testsuite/gas/mips/vr5500.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vr5500.s
rename to gas/testsuite/gas/mips/vr5500.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1-el.d b/gas/testsuite/gas/mips/vxworks1-el.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1-el.d
rename to gas/testsuite/gas/mips/vxworks1-el.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1-xgot-el.d b/gas/testsuite/gas/mips/vxworks1-xgot-el.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1-xgot-el.d
rename to gas/testsuite/gas/mips/vxworks1-xgot-el.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1-xgot.d b/gas/testsuite/gas/mips/vxworks1-xgot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1-xgot.d
rename to gas/testsuite/gas/mips/vxworks1-xgot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1.d b/gas/testsuite/gas/mips/vxworks1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1.d
rename to gas/testsuite/gas/mips/vxworks1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1.s b/gas/testsuite/gas/mips/vxworks1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/vxworks1.s
rename to gas/testsuite/gas/mips/vxworks1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/xlr-ext.d b/gas/testsuite/gas/mips/xlr-ext.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/xlr-ext.d
rename to gas/testsuite/gas/mips/xlr-ext.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mips/xlr-ext.s b/gas/testsuite/gas/mips/xlr-ext.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mips/xlr-ext.s
rename to gas/testsuite/gas/mips/xlr-ext.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b-n.d b/gas/testsuite/gas/mmix/1cjmp1b-n.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b-n.d
rename to gas/testsuite/gas/mmix/1cjmp1b-n.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b-r.d b/gas/testsuite/gas/mmix/1cjmp1b-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b-r.d
rename to gas/testsuite/gas/mmix/1cjmp1b-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b.d b/gas/testsuite/gas/mmix/1cjmp1b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b.d
rename to gas/testsuite/gas/mmix/1cjmp1b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b.l b/gas/testsuite/gas/mmix/1cjmp1b.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b.l
rename to gas/testsuite/gas/mmix/1cjmp1b.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b.s b/gas/testsuite/gas/mmix/1cjmp1b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1b.s
rename to gas/testsuite/gas/mmix/1cjmp1b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1brn.d b/gas/testsuite/gas/mmix/1cjmp1brn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1cjmp1brn.d
rename to gas/testsuite/gas/mmix/1cjmp1brn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1hjmp1b.d b/gas/testsuite/gas/mmix/1hjmp1b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1hjmp1b.d
rename to gas/testsuite/gas/mmix/1hjmp1b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1hjmp1b.l b/gas/testsuite/gas/mmix/1hjmp1b.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1hjmp1b.l
rename to gas/testsuite/gas/mmix/1hjmp1b.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/1hjmp1b.s b/gas/testsuite/gas/mmix/1hjmp1b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/1hjmp1b.s
rename to gas/testsuite/gas/mmix/1hjmp1b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/align-1.d b/gas/testsuite/gas/mmix/align-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/align-1.d
rename to gas/testsuite/gas/mmix/align-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/align-1.s b/gas/testsuite/gas/mmix/align-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/align-1.s
rename to gas/testsuite/gas/mmix/align-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-1.d b/gas/testsuite/gas/mmix/basep-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-1.d
rename to gas/testsuite/gas/mmix/basep-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-1.s b/gas/testsuite/gas/mmix/basep-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-1.s
rename to gas/testsuite/gas/mmix/basep-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-10.d b/gas/testsuite/gas/mmix/basep-10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-10.d
rename to gas/testsuite/gas/mmix/basep-10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-10.s b/gas/testsuite/gas/mmix/basep-10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-10.s
rename to gas/testsuite/gas/mmix/basep-10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-11.d b/gas/testsuite/gas/mmix/basep-11.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-11.d
rename to gas/testsuite/gas/mmix/basep-11.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-11.s b/gas/testsuite/gas/mmix/basep-11.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-11.s
rename to gas/testsuite/gas/mmix/basep-11.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-1b.d b/gas/testsuite/gas/mmix/basep-1b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-1b.d
rename to gas/testsuite/gas/mmix/basep-1b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-2.d b/gas/testsuite/gas/mmix/basep-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-2.d
rename to gas/testsuite/gas/mmix/basep-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-2.s b/gas/testsuite/gas/mmix/basep-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-2.s
rename to gas/testsuite/gas/mmix/basep-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-2b.d b/gas/testsuite/gas/mmix/basep-2b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-2b.d
rename to gas/testsuite/gas/mmix/basep-2b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-3.d b/gas/testsuite/gas/mmix/basep-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-3.d
rename to gas/testsuite/gas/mmix/basep-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-3.s b/gas/testsuite/gas/mmix/basep-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-3.s
rename to gas/testsuite/gas/mmix/basep-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-3b.d b/gas/testsuite/gas/mmix/basep-3b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-3b.d
rename to gas/testsuite/gas/mmix/basep-3b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-4.d b/gas/testsuite/gas/mmix/basep-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-4.d
rename to gas/testsuite/gas/mmix/basep-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-5.d b/gas/testsuite/gas/mmix/basep-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-5.d
rename to gas/testsuite/gas/mmix/basep-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-6.d b/gas/testsuite/gas/mmix/basep-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-6.d
rename to gas/testsuite/gas/mmix/basep-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-7.d b/gas/testsuite/gas/mmix/basep-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-7.d
rename to gas/testsuite/gas/mmix/basep-7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-8.d b/gas/testsuite/gas/mmix/basep-8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-8.d
rename to gas/testsuite/gas/mmix/basep-8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-8.s b/gas/testsuite/gas/mmix/basep-8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-8.s
rename to gas/testsuite/gas/mmix/basep-8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-9.d b/gas/testsuite/gas/mmix/basep-9.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-9.d
rename to gas/testsuite/gas/mmix/basep-9.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-9.s b/gas/testsuite/gas/mmix/basep-9.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/basep-9.s
rename to gas/testsuite/gas/mmix/basep-9.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-1.d b/gas/testsuite/gas/mmix/bspec-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-1.d
rename to gas/testsuite/gas/mmix/bspec-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-1.s b/gas/testsuite/gas/mmix/bspec-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-1.s
rename to gas/testsuite/gas/mmix/bspec-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-2.d b/gas/testsuite/gas/mmix/bspec-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-2.d
rename to gas/testsuite/gas/mmix/bspec-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-2.s b/gas/testsuite/gas/mmix/bspec-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/bspec-2.s
rename to gas/testsuite/gas/mmix/bspec-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin1.d b/gas/testsuite/gas/mmix/builtin1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin1.d
rename to gas/testsuite/gas/mmix/builtin1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin1.s b/gas/testsuite/gas/mmix/builtin1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin1.s
rename to gas/testsuite/gas/mmix/builtin1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin2.d b/gas/testsuite/gas/mmix/builtin2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin2.d
rename to gas/testsuite/gas/mmix/builtin2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin3.d b/gas/testsuite/gas/mmix/builtin3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/builtin3.d
rename to gas/testsuite/gas/mmix/builtin3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/byte-1.d b/gas/testsuite/gas/mmix/byte-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/byte-1.d
rename to gas/testsuite/gas/mmix/byte-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/byte-1.s b/gas/testsuite/gas/mmix/byte-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/byte-1.s
rename to gas/testsuite/gas/mmix/byte-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/bz-c.d b/gas/testsuite/gas/mmix/bz-c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/bz-c.d
rename to gas/testsuite/gas/mmix/bz-c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/bz-c.s b/gas/testsuite/gas/mmix/bz-c.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/bz-c.s
rename to gas/testsuite/gas/mmix/bz-c.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-1.d b/gas/testsuite/gas/mmix/comment-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-1.d
rename to gas/testsuite/gas/mmix/comment-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-1.s b/gas/testsuite/gas/mmix/comment-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-1.s
rename to gas/testsuite/gas/mmix/comment-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-2.d b/gas/testsuite/gas/mmix/comment-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-2.d
rename to gas/testsuite/gas/mmix/comment-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-2.s b/gas/testsuite/gas/mmix/comment-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-2.s
rename to gas/testsuite/gas/mmix/comment-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-3.d b/gas/testsuite/gas/mmix/comment-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-3.d
rename to gas/testsuite/gas/mmix/comment-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-3.s b/gas/testsuite/gas/mmix/comment-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/comment-3.s
rename to gas/testsuite/gas/mmix/comment-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-1.d b/gas/testsuite/gas/mmix/cons-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-1.d
rename to gas/testsuite/gas/mmix/cons-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-1.s b/gas/testsuite/gas/mmix/cons-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-1.s
rename to gas/testsuite/gas/mmix/cons-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-2.d b/gas/testsuite/gas/mmix/cons-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-2.d
rename to gas/testsuite/gas/mmix/cons-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-2.s b/gas/testsuite/gas/mmix/cons-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/cons-2.s
rename to gas/testsuite/gas/mmix/cons-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo1.s b/gas/testsuite/gas/mmix/err-bpo1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo1.s
rename to gas/testsuite/gas/mmix/err-bpo1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo2.s b/gas/testsuite/gas/mmix/err-bpo2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo2.s
rename to gas/testsuite/gas/mmix/err-bpo2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo3.s b/gas/testsuite/gas/mmix/err-bpo3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo3.s
rename to gas/testsuite/gas/mmix/err-bpo3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo4.s b/gas/testsuite/gas/mmix/err-bpo4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo4.s
rename to gas/testsuite/gas/mmix/err-bpo4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo5.s b/gas/testsuite/gas/mmix/err-bpo5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo5.s
rename to gas/testsuite/gas/mmix/err-bpo5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo6.s b/gas/testsuite/gas/mmix/err-bpo6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bpo6.s
rename to gas/testsuite/gas/mmix/err-bpo6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-1.s b/gas/testsuite/gas/mmix/err-bspec-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-1.s
rename to gas/testsuite/gas/mmix/err-bspec-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-2.s b/gas/testsuite/gas/mmix/err-bspec-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-2.s
rename to gas/testsuite/gas/mmix/err-bspec-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-3.s b/gas/testsuite/gas/mmix/err-bspec-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-3.s
rename to gas/testsuite/gas/mmix/err-bspec-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-4.s b/gas/testsuite/gas/mmix/err-bspec-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-4.s
rename to gas/testsuite/gas/mmix/err-bspec-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-5.s b/gas/testsuite/gas/mmix/err-bspec-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-bspec-5.s
rename to gas/testsuite/gas/mmix/err-bspec-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-builtin.s b/gas/testsuite/gas/mmix/err-builtin.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-builtin.s
rename to gas/testsuite/gas/mmix/err-builtin.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-byte1.s b/gas/testsuite/gas/mmix/err-byte1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-byte1.s
rename to gas/testsuite/gas/mmix/err-byte1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-byte2.s b/gas/testsuite/gas/mmix/err-byte2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-byte2.s
rename to gas/testsuite/gas/mmix/err-byte2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-case.s b/gas/testsuite/gas/mmix/err-case.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-case.s
rename to gas/testsuite/gas/mmix/err-case.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-fb-1.s b/gas/testsuite/gas/mmix/err-fb-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-fb-1.s
rename to gas/testsuite/gas/mmix/err-fb-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-greg1.s b/gas/testsuite/gas/mmix/err-greg1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-greg1.s
rename to gas/testsuite/gas/mmix/err-greg1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-insn.s b/gas/testsuite/gas/mmix/err-insn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-insn.s
rename to gas/testsuite/gas/mmix/err-insn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-is-1.s b/gas/testsuite/gas/mmix/err-is-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-is-1.s
rename to gas/testsuite/gas/mmix/err-is-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-1.s b/gas/testsuite/gas/mmix/err-loc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-1.s
rename to gas/testsuite/gas/mmix/err-loc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-10.s b/gas/testsuite/gas/mmix/err-loc-10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-10.s
rename to gas/testsuite/gas/mmix/err-loc-10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-2.s b/gas/testsuite/gas/mmix/err-loc-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-2.s
rename to gas/testsuite/gas/mmix/err-loc-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-3.s b/gas/testsuite/gas/mmix/err-loc-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-3.s
rename to gas/testsuite/gas/mmix/err-loc-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-4.s b/gas/testsuite/gas/mmix/err-loc-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-4.s
rename to gas/testsuite/gas/mmix/err-loc-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-5.s b/gas/testsuite/gas/mmix/err-loc-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-5.s
rename to gas/testsuite/gas/mmix/err-loc-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-6.s b/gas/testsuite/gas/mmix/err-loc-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-6.s
rename to gas/testsuite/gas/mmix/err-loc-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-7.s b/gas/testsuite/gas/mmix/err-loc-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-7.s
rename to gas/testsuite/gas/mmix/err-loc-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-8.s b/gas/testsuite/gas/mmix/err-loc-8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-8.s
rename to gas/testsuite/gas/mmix/err-loc-8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-9.s b/gas/testsuite/gas/mmix/err-loc-9.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-loc-9.s
rename to gas/testsuite/gas/mmix/err-loc-9.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-local1.s b/gas/testsuite/gas/mmix/err-local1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-local1.s
rename to gas/testsuite/gas/mmix/err-local1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-local2.s b/gas/testsuite/gas/mmix/err-local2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-local2.s
rename to gas/testsuite/gas/mmix/err-local2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-ser-1.s b/gas/testsuite/gas/mmix/err-ser-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-ser-1.s
rename to gas/testsuite/gas/mmix/err-ser-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-set.s b/gas/testsuite/gas/mmix/err-set.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-set.s
rename to gas/testsuite/gas/mmix/err-set.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/err-swym1.s b/gas/testsuite/gas/mmix/err-swym1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/err-swym1.s
rename to gas/testsuite/gas/mmix/err-swym1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/expr-1.d b/gas/testsuite/gas/mmix/expr-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/expr-1.d
rename to gas/testsuite/gas/mmix/expr-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/expr-1.s b/gas/testsuite/gas/mmix/expr-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/expr-1.s
rename to gas/testsuite/gas/mmix/expr-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-1.d b/gas/testsuite/gas/mmix/fb-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-1.d
rename to gas/testsuite/gas/mmix/fb-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-1.s b/gas/testsuite/gas/mmix/fb-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-1.s
rename to gas/testsuite/gas/mmix/fb-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-2.d b/gas/testsuite/gas/mmix/fb-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-2.d
rename to gas/testsuite/gas/mmix/fb-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-2.s b/gas/testsuite/gas/mmix/fb-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/fb-2.s
rename to gas/testsuite/gas/mmix/fb-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op-r.d b/gas/testsuite/gas/mmix/get-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op-r.d
rename to gas/testsuite/gas/mmix/get-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op.d b/gas/testsuite/gas/mmix/get-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op.d
rename to gas/testsuite/gas/mmix/get-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op.l b/gas/testsuite/gas/mmix/get-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op.l
rename to gas/testsuite/gas/mmix/get-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op.s b/gas/testsuite/gas/mmix/get-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/get-op.s
rename to gas/testsuite/gas/mmix/get-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-c.d b/gas/testsuite/gas/mmix/geta-c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-c.d
rename to gas/testsuite/gas/mmix/geta-c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-c.s b/gas/testsuite/gas/mmix/geta-c.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-c.s
rename to gas/testsuite/gas/mmix/geta-c.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op-r.d b/gas/testsuite/gas/mmix/geta-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op-r.d
rename to gas/testsuite/gas/mmix/geta-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op.d b/gas/testsuite/gas/mmix/geta-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op.d
rename to gas/testsuite/gas/mmix/geta-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op.l b/gas/testsuite/gas/mmix/geta-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op.l
rename to gas/testsuite/gas/mmix/geta-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op.s b/gas/testsuite/gas/mmix/geta-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-op.s
rename to gas/testsuite/gas/mmix/geta-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-opn.d b/gas/testsuite/gas/mmix/geta-opn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-opn.d
rename to gas/testsuite/gas/mmix/geta-opn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-oprn.d b/gas/testsuite/gas/mmix/geta-oprn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/geta-oprn.d
rename to gas/testsuite/gas/mmix/geta-oprn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg1.d b/gas/testsuite/gas/mmix/greg1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg1.d
rename to gas/testsuite/gas/mmix/greg1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg1.s b/gas/testsuite/gas/mmix/greg1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg1.s
rename to gas/testsuite/gas/mmix/greg1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg1a.d b/gas/testsuite/gas/mmix/greg1a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg1a.d
rename to gas/testsuite/gas/mmix/greg1a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg2.d b/gas/testsuite/gas/mmix/greg2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg2.d
rename to gas/testsuite/gas/mmix/greg2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg2.s b/gas/testsuite/gas/mmix/greg2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg2.s
rename to gas/testsuite/gas/mmix/greg2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg2a.d b/gas/testsuite/gas/mmix/greg2a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg2a.d
rename to gas/testsuite/gas/mmix/greg2a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg3.d b/gas/testsuite/gas/mmix/greg3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg3.d
rename to gas/testsuite/gas/mmix/greg3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg3.s b/gas/testsuite/gas/mmix/greg3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg3.s
rename to gas/testsuite/gas/mmix/greg3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg4.d b/gas/testsuite/gas/mmix/greg4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg4.d
rename to gas/testsuite/gas/mmix/greg4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg4.s b/gas/testsuite/gas/mmix/greg4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg4.s
rename to gas/testsuite/gas/mmix/greg4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg5.d b/gas/testsuite/gas/mmix/greg5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg5.d
rename to gas/testsuite/gas/mmix/greg5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg5.s b/gas/testsuite/gas/mmix/greg5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg5.s
rename to gas/testsuite/gas/mmix/greg5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg6.d b/gas/testsuite/gas/mmix/greg6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg6.d
rename to gas/testsuite/gas/mmix/greg6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg6.s b/gas/testsuite/gas/mmix/greg6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg6.s
rename to gas/testsuite/gas/mmix/greg6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg7.d b/gas/testsuite/gas/mmix/greg7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg7.d
rename to gas/testsuite/gas/mmix/greg7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg7.s b/gas/testsuite/gas/mmix/greg7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg7.s
rename to gas/testsuite/gas/mmix/greg7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg8.d b/gas/testsuite/gas/mmix/greg8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg8.d
rename to gas/testsuite/gas/mmix/greg8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg8.s b/gas/testsuite/gas/mmix/greg8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg8.s
rename to gas/testsuite/gas/mmix/greg8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg9.d b/gas/testsuite/gas/mmix/greg9.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg9.d
rename to gas/testsuite/gas/mmix/greg9.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/greg9.s b/gas/testsuite/gas/mmix/greg9.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/greg9.s
rename to gas/testsuite/gas/mmix/greg9.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/hex-r.d b/gas/testsuite/gas/mmix/hex-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/hex-r.d
rename to gas/testsuite/gas/mmix/hex-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/hex.d b/gas/testsuite/gas/mmix/hex.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/hex.d
rename to gas/testsuite/gas/mmix/hex.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/hex.l b/gas/testsuite/gas/mmix/hex.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/hex.l
rename to gas/testsuite/gas/mmix/hex.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/hex.s b/gas/testsuite/gas/mmix/hex.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/hex.s
rename to gas/testsuite/gas/mmix/hex.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/hex2.d b/gas/testsuite/gas/mmix/hex2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/hex2.d
rename to gas/testsuite/gas/mmix/hex2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/hex2.s b/gas/testsuite/gas/mmix/hex2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/hex2.s
rename to gas/testsuite/gas/mmix/hex2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/is-1.d b/gas/testsuite/gas/mmix/is-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/is-1.d
rename to gas/testsuite/gas/mmix/is-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/is-1.s b/gas/testsuite/gas/mmix/is-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/is-1.s
rename to gas/testsuite/gas/mmix/is-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op-n.d b/gas/testsuite/gas/mmix/jmp-op-n.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op-n.d
rename to gas/testsuite/gas/mmix/jmp-op-n.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op-r.d b/gas/testsuite/gas/mmix/jmp-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op-r.d
rename to gas/testsuite/gas/mmix/jmp-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op.d b/gas/testsuite/gas/mmix/jmp-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op.d
rename to gas/testsuite/gas/mmix/jmp-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op.l b/gas/testsuite/gas/mmix/jmp-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op.l
rename to gas/testsuite/gas/mmix/jmp-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op.s b/gas/testsuite/gas/mmix/jmp-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-op.s
rename to gas/testsuite/gas/mmix/jmp-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-oprn.d b/gas/testsuite/gas/mmix/jmp-oprn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jmp-oprn.d
rename to gas/testsuite/gas/mmix/jmp-oprn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jump-c.d b/gas/testsuite/gas/mmix/jump-c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jump-c.d
rename to gas/testsuite/gas/mmix/jump-c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/jump-c.s b/gas/testsuite/gas/mmix/jump-c.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/jump-c.s
rename to gas/testsuite/gas/mmix/jump-c.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-in-n.d b/gas/testsuite/gas/mmix/list-in-n.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-in-n.d
rename to gas/testsuite/gas/mmix/list-in-n.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-in-r.d b/gas/testsuite/gas/mmix/list-in-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-in-r.d
rename to gas/testsuite/gas/mmix/list-in-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-in-rn.d b/gas/testsuite/gas/mmix/list-in-rn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-in-rn.d
rename to gas/testsuite/gas/mmix/list-in-rn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-insns.d b/gas/testsuite/gas/mmix/list-insns.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-insns.d
rename to gas/testsuite/gas/mmix/list-insns.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-insns.l b/gas/testsuite/gas/mmix/list-insns.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-insns.l
rename to gas/testsuite/gas/mmix/list-insns.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-insns.s b/gas/testsuite/gas/mmix/list-insns.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-insns.s
rename to gas/testsuite/gas/mmix/list-insns.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-pseudoints.l b/gas/testsuite/gas/mmix/list-pseudoints.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-pseudoints.l
rename to gas/testsuite/gas/mmix/list-pseudoints.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-pseudoints.s b/gas/testsuite/gas/mmix/list-pseudoints.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-pseudoints.s
rename to gas/testsuite/gas/mmix/list-pseudoints.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-textfirst b/gas/testsuite/gas/mmix/list-textfirst
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-textfirst
rename to gas/testsuite/gas/mmix/list-textfirst
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-textfirst.l b/gas/testsuite/gas/mmix/list-textfirst.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-textfirst.l
rename to gas/testsuite/gas/mmix/list-textfirst.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/list-textfirst.s b/gas/testsuite/gas/mmix/list-textfirst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/list-textfirst.s
rename to gas/testsuite/gas/mmix/list-textfirst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-1.d b/gas/testsuite/gas/mmix/loc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-1.d
rename to gas/testsuite/gas/mmix/loc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-1.s b/gas/testsuite/gas/mmix/loc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-1.s
rename to gas/testsuite/gas/mmix/loc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-2.d b/gas/testsuite/gas/mmix/loc-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-2.d
rename to gas/testsuite/gas/mmix/loc-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-2.s b/gas/testsuite/gas/mmix/loc-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-2.s
rename to gas/testsuite/gas/mmix/loc-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-3.d b/gas/testsuite/gas/mmix/loc-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-3.d
rename to gas/testsuite/gas/mmix/loc-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-3.s b/gas/testsuite/gas/mmix/loc-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-3.s
rename to gas/testsuite/gas/mmix/loc-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-4.d b/gas/testsuite/gas/mmix/loc-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-4.d
rename to gas/testsuite/gas/mmix/loc-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-4.s b/gas/testsuite/gas/mmix/loc-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-4.s
rename to gas/testsuite/gas/mmix/loc-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-5.d b/gas/testsuite/gas/mmix/loc-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-5.d
rename to gas/testsuite/gas/mmix/loc-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-5.s b/gas/testsuite/gas/mmix/loc-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-5.s
rename to gas/testsuite/gas/mmix/loc-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-6.d b/gas/testsuite/gas/mmix/loc-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-6.d
rename to gas/testsuite/gas/mmix/loc-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-6.s b/gas/testsuite/gas/mmix/loc-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-6.s
rename to gas/testsuite/gas/mmix/loc-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-7.d b/gas/testsuite/gas/mmix/loc-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-7.d
rename to gas/testsuite/gas/mmix/loc-7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-7.s b/gas/testsuite/gas/mmix/loc-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/loc-7.s
rename to gas/testsuite/gas/mmix/loc-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/local-1.d b/gas/testsuite/gas/mmix/local-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/local-1.d
rename to gas/testsuite/gas/mmix/local-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/local-1.s b/gas/testsuite/gas/mmix/local-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/local-1.s
rename to gas/testsuite/gas/mmix/local-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/locall1.d b/gas/testsuite/gas/mmix/locall1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/locall1.d
rename to gas/testsuite/gas/mmix/locall1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/locall1.s b/gas/testsuite/gas/mmix/locall1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/locall1.s
rename to gas/testsuite/gas/mmix/locall1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/mmix-err.exp b/gas/testsuite/gas/mmix/mmix-err.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/mmix-err.exp
rename to gas/testsuite/gas/mmix/mmix-err.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/mmix-list.exp b/gas/testsuite/gas/mmix/mmix-list.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/mmix-list.exp
rename to gas/testsuite/gas/mmix/mmix-list.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/mmix.exp b/gas/testsuite/gas/mmix/mmix.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/mmix.exp
rename to gas/testsuite/gas/mmix/mmix.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/odd-1.d b/gas/testsuite/gas/mmix/odd-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/odd-1.d
rename to gas/testsuite/gas/mmix/odd-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/odd-1.s b/gas/testsuite/gas/mmix/odd-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/odd-1.s
rename to gas/testsuite/gas/mmix/odd-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-1.d b/gas/testsuite/gas/mmix/op-0-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-1.d
rename to gas/testsuite/gas/mmix/op-0-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-1.s b/gas/testsuite/gas/mmix/op-0-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-1.s
rename to gas/testsuite/gas/mmix/op-0-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-1s.d b/gas/testsuite/gas/mmix/op-0-1s.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-1s.d
rename to gas/testsuite/gas/mmix/op-0-1s.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-2.d b/gas/testsuite/gas/mmix/op-0-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/op-0-2.d
rename to gas/testsuite/gas/mmix/op-0-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op-r.d b/gas/testsuite/gas/mmix/pop-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op-r.d
rename to gas/testsuite/gas/mmix/pop-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op.d b/gas/testsuite/gas/mmix/pop-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op.d
rename to gas/testsuite/gas/mmix/pop-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op.l b/gas/testsuite/gas/mmix/pop-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op.l
rename to gas/testsuite/gas/mmix/pop-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op.s b/gas/testsuite/gas/mmix/pop-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pop-op.s
rename to gas/testsuite/gas/mmix/pop-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix1.d b/gas/testsuite/gas/mmix/prefix1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix1.d
rename to gas/testsuite/gas/mmix/prefix1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix1.s b/gas/testsuite/gas/mmix/prefix1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix1.s
rename to gas/testsuite/gas/mmix/prefix1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix2.d b/gas/testsuite/gas/mmix/prefix2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix2.d
rename to gas/testsuite/gas/mmix/prefix2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix2.s b/gas/testsuite/gas/mmix/prefix2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix2.s
rename to gas/testsuite/gas/mmix/prefix2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix3.d b/gas/testsuite/gas/mmix/prefix3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix3.d
rename to gas/testsuite/gas/mmix/prefix3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix3.s b/gas/testsuite/gas/mmix/prefix3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/prefix3.s
rename to gas/testsuite/gas/mmix/prefix3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pseudo-1.d b/gas/testsuite/gas/mmix/pseudo-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pseudo-1.d
rename to gas/testsuite/gas/mmix/pseudo-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pseudo-1.s b/gas/testsuite/gas/mmix/pseudo-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pseudo-1.s
rename to gas/testsuite/gas/mmix/pseudo-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op-r.d b/gas/testsuite/gas/mmix/pushgo-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op-r.d
rename to gas/testsuite/gas/mmix/pushgo-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op.d b/gas/testsuite/gas/mmix/pushgo-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op.d
rename to gas/testsuite/gas/mmix/pushgo-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op.l b/gas/testsuite/gas/mmix/pushgo-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op.l
rename to gas/testsuite/gas/mmix/pushgo-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op.s b/gas/testsuite/gas/mmix/pushgo-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pushgo-op.s
rename to gas/testsuite/gas/mmix/pushgo-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pushj-c.d b/gas/testsuite/gas/mmix/pushj-c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pushj-c.d
rename to gas/testsuite/gas/mmix/pushj-c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pushj-c.s b/gas/testsuite/gas/mmix/pushj-c.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pushj-c.s
rename to gas/testsuite/gas/mmix/pushj-c.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/pushj-cs.d b/gas/testsuite/gas/mmix/pushj-cs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/pushj-cs.d
rename to gas/testsuite/gas/mmix/pushj-cs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op-r.d b/gas/testsuite/gas/mmix/put-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op-r.d
rename to gas/testsuite/gas/mmix/put-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op.d b/gas/testsuite/gas/mmix/put-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op.d
rename to gas/testsuite/gas/mmix/put-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op.l b/gas/testsuite/gas/mmix/put-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op.l
rename to gas/testsuite/gas/mmix/put-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op.s b/gas/testsuite/gas/mmix/put-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/put-op.s
rename to gas/testsuite/gas/mmix/put-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op-r.d b/gas/testsuite/gas/mmix/reg-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op-r.d
rename to gas/testsuite/gas/mmix/reg-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op.d b/gas/testsuite/gas/mmix/reg-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op.d
rename to gas/testsuite/gas/mmix/reg-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op.l b/gas/testsuite/gas/mmix/reg-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op.l
rename to gas/testsuite/gas/mmix/reg-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op.s b/gas/testsuite/gas/mmix/reg-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg-op.s
rename to gas/testsuite/gas/mmix/reg-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op-r.d b/gas/testsuite/gas/mmix/reg3-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op-r.d
rename to gas/testsuite/gas/mmix/reg3-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op.d b/gas/testsuite/gas/mmix/reg3-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op.d
rename to gas/testsuite/gas/mmix/reg3-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op.l b/gas/testsuite/gas/mmix/reg3-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op.l
rename to gas/testsuite/gas/mmix/reg3-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op.s b/gas/testsuite/gas/mmix/reg3-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reg3-op.s
rename to gas/testsuite/gas/mmix/reg3-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op-r.d b/gas/testsuite/gas/mmix/regt-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op-r.d
rename to gas/testsuite/gas/mmix/regt-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op.d b/gas/testsuite/gas/mmix/regt-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op.d
rename to gas/testsuite/gas/mmix/regt-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op.l b/gas/testsuite/gas/mmix/regt-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op.l
rename to gas/testsuite/gas/mmix/regt-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op.s b/gas/testsuite/gas/mmix/regt-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regt-op.s
rename to gas/testsuite/gas/mmix/regt-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op-r.d b/gas/testsuite/gas/mmix/regx-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op-r.d
rename to gas/testsuite/gas/mmix/regx-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op.d b/gas/testsuite/gas/mmix/regx-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op.d
rename to gas/testsuite/gas/mmix/regx-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op.l b/gas/testsuite/gas/mmix/regx-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op.l
rename to gas/testsuite/gas/mmix/regx-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op.s b/gas/testsuite/gas/mmix/regx-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regx-op.s
rename to gas/testsuite/gas/mmix/regx-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op-r.d b/gas/testsuite/gas/mmix/regy-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op-r.d
rename to gas/testsuite/gas/mmix/regy-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op.d b/gas/testsuite/gas/mmix/regy-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op.d
rename to gas/testsuite/gas/mmix/regy-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op.l b/gas/testsuite/gas/mmix/regy-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op.l
rename to gas/testsuite/gas/mmix/regy-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op.s b/gas/testsuite/gas/mmix/regy-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/regy-op.s
rename to gas/testsuite/gas/mmix/regy-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1-n.d b/gas/testsuite/gas/mmix/relax1-n.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1-n.d
rename to gas/testsuite/gas/mmix/relax1-n.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1-r.d b/gas/testsuite/gas/mmix/relax1-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1-r.d
rename to gas/testsuite/gas/mmix/relax1-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1-rn.d b/gas/testsuite/gas/mmix/relax1-rn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1-rn.d
rename to gas/testsuite/gas/mmix/relax1-rn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1.d b/gas/testsuite/gas/mmix/relax1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1.d
rename to gas/testsuite/gas/mmix/relax1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1.l b/gas/testsuite/gas/mmix/relax1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1.l
rename to gas/testsuite/gas/mmix/relax1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1.s b/gas/testsuite/gas/mmix/relax1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax1.s
rename to gas/testsuite/gas/mmix/relax1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax2.d b/gas/testsuite/gas/mmix/relax2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax2.d
rename to gas/testsuite/gas/mmix/relax2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relax2.s b/gas/testsuite/gas/mmix/relax2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relax2.s
rename to gas/testsuite/gas/mmix/relax2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16-n.d b/gas/testsuite/gas/mmix/reloc16-n.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16-n.d
rename to gas/testsuite/gas/mmix/reloc16-n.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16-r.d b/gas/testsuite/gas/mmix/reloc16-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16-r.d
rename to gas/testsuite/gas/mmix/reloc16-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16.d b/gas/testsuite/gas/mmix/reloc16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16.d
rename to gas/testsuite/gas/mmix/reloc16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16.l b/gas/testsuite/gas/mmix/reloc16.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16.l
rename to gas/testsuite/gas/mmix/reloc16.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16.s b/gas/testsuite/gas/mmix/reloc16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc16.s
rename to gas/testsuite/gas/mmix/reloc16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8-r.d b/gas/testsuite/gas/mmix/reloc8-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8-r.d
rename to gas/testsuite/gas/mmix/reloc8-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8.d b/gas/testsuite/gas/mmix/reloc8.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8.d
rename to gas/testsuite/gas/mmix/reloc8.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8.l b/gas/testsuite/gas/mmix/reloc8.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8.l
rename to gas/testsuite/gas/mmix/reloc8.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8.s b/gas/testsuite/gas/mmix/reloc8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloc8.s
rename to gas/testsuite/gas/mmix/reloc8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relocl-n.d b/gas/testsuite/gas/mmix/relocl-n.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relocl-n.d
rename to gas/testsuite/gas/mmix/relocl-n.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab-r.d b/gas/testsuite/gas/mmix/reloclab-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab-r.d
rename to gas/testsuite/gas/mmix/reloclab-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab-rs.d b/gas/testsuite/gas/mmix/reloclab-rs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab-rs.d
rename to gas/testsuite/gas/mmix/reloclab-rs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab-s.d b/gas/testsuite/gas/mmix/reloclab-s.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab-s.d
rename to gas/testsuite/gas/mmix/reloclab-s.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab.d b/gas/testsuite/gas/mmix/reloclab.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab.d
rename to gas/testsuite/gas/mmix/reloclab.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab.l b/gas/testsuite/gas/mmix/reloclab.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab.l
rename to gas/testsuite/gas/mmix/reloclab.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab.s b/gas/testsuite/gas/mmix/reloclab.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclab.s
rename to gas/testsuite/gas/mmix/reloclab.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclrn.d b/gas/testsuite/gas/mmix/reloclrn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/reloclrn.d
rename to gas/testsuite/gas/mmix/reloclrn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/relocxrn.d b/gas/testsuite/gas/mmix/relocxrn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/relocxrn.d
rename to gas/testsuite/gas/mmix/relocxrn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op-r.d b/gas/testsuite/gas/mmix/resume-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op-r.d
rename to gas/testsuite/gas/mmix/resume-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op.d b/gas/testsuite/gas/mmix/resume-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op.d
rename to gas/testsuite/gas/mmix/resume-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op.l b/gas/testsuite/gas/mmix/resume-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op.l
rename to gas/testsuite/gas/mmix/resume-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op.s b/gas/testsuite/gas/mmix/resume-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/resume-op.s
rename to gas/testsuite/gas/mmix/resume-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op-r.d b/gas/testsuite/gas/mmix/round2-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op-r.d
rename to gas/testsuite/gas/mmix/round2-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op.d b/gas/testsuite/gas/mmix/round2-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op.d
rename to gas/testsuite/gas/mmix/round2-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op.l b/gas/testsuite/gas/mmix/round2-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op.l
rename to gas/testsuite/gas/mmix/round2-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op.s b/gas/testsuite/gas/mmix/round2-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/round2-op.s
rename to gas/testsuite/gas/mmix/round2-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op-r.d b/gas/testsuite/gas/mmix/roundi-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op-r.d
rename to gas/testsuite/gas/mmix/roundi-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op.d b/gas/testsuite/gas/mmix/roundi-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op.d
rename to gas/testsuite/gas/mmix/roundi-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op.l b/gas/testsuite/gas/mmix/roundi-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op.l
rename to gas/testsuite/gas/mmix/roundi-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op.s b/gas/testsuite/gas/mmix/roundi-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundi-op.s
rename to gas/testsuite/gas/mmix/roundi-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op-r.d b/gas/testsuite/gas/mmix/roundr-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op-r.d
rename to gas/testsuite/gas/mmix/roundr-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op.d b/gas/testsuite/gas/mmix/roundr-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op.d
rename to gas/testsuite/gas/mmix/roundr-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op.l b/gas/testsuite/gas/mmix/roundr-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op.l
rename to gas/testsuite/gas/mmix/roundr-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op.s b/gas/testsuite/gas/mmix/roundr-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/roundr-op.s
rename to gas/testsuite/gas/mmix/roundr-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op-r.d b/gas/testsuite/gas/mmix/save-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op-r.d
rename to gas/testsuite/gas/mmix/save-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op.d b/gas/testsuite/gas/mmix/save-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op.d
rename to gas/testsuite/gas/mmix/save-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op.l b/gas/testsuite/gas/mmix/save-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op.l
rename to gas/testsuite/gas/mmix/save-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op.s b/gas/testsuite/gas/mmix/save-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/save-op.s
rename to gas/testsuite/gas/mmix/save-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/set-r.d b/gas/testsuite/gas/mmix/set-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/set-r.d
rename to gas/testsuite/gas/mmix/set-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/set.d b/gas/testsuite/gas/mmix/set.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/set.d
rename to gas/testsuite/gas/mmix/set.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/set.l b/gas/testsuite/gas/mmix/set.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/set.l
rename to gas/testsuite/gas/mmix/set.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/set.s b/gas/testsuite/gas/mmix/set.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/set.s
rename to gas/testsuite/gas/mmix/set.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op-r.d b/gas/testsuite/gas/mmix/swym-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op-r.d
rename to gas/testsuite/gas/mmix/swym-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op.d b/gas/testsuite/gas/mmix/swym-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op.d
rename to gas/testsuite/gas/mmix/swym-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op.l b/gas/testsuite/gas/mmix/swym-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op.l
rename to gas/testsuite/gas/mmix/swym-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op.s b/gas/testsuite/gas/mmix/swym-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-op.s
rename to gas/testsuite/gas/mmix/swym-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg1.d b/gas/testsuite/gas/mmix/swym-opreg1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg1.d
rename to gas/testsuite/gas/mmix/swym-opreg1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg1.s b/gas/testsuite/gas/mmix/swym-opreg1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg1.s
rename to gas/testsuite/gas/mmix/swym-opreg1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg2.d b/gas/testsuite/gas/mmix/swym-opreg2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg2.d
rename to gas/testsuite/gas/mmix/swym-opreg2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg2.s b/gas/testsuite/gas/mmix/swym-opreg2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/swym-opreg2.s
rename to gas/testsuite/gas/mmix/swym-opreg2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/sym-1.d b/gas/testsuite/gas/mmix/sym-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/sym-1.d
rename to gas/testsuite/gas/mmix/sym-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/sym-1.s b/gas/testsuite/gas/mmix/sym-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/sym-1.s
rename to gas/testsuite/gas/mmix/sym-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op-r.d b/gas/testsuite/gas/mmix/sync-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op-r.d
rename to gas/testsuite/gas/mmix/sync-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op.d b/gas/testsuite/gas/mmix/sync-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op.d
rename to gas/testsuite/gas/mmix/sync-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op.l b/gas/testsuite/gas/mmix/sync-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op.l
rename to gas/testsuite/gas/mmix/sync-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op.s b/gas/testsuite/gas/mmix/sync-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/sync-op.s
rename to gas/testsuite/gas/mmix/sync-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op-r.d b/gas/testsuite/gas/mmix/two-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op-r.d
rename to gas/testsuite/gas/mmix/two-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op.d b/gas/testsuite/gas/mmix/two-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op.d
rename to gas/testsuite/gas/mmix/two-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op.l b/gas/testsuite/gas/mmix/two-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op.l
rename to gas/testsuite/gas/mmix/two-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op.s b/gas/testsuite/gas/mmix/two-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/two-op.s
rename to gas/testsuite/gas/mmix/two-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op-r.d b/gas/testsuite/gas/mmix/unsave-op-r.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op-r.d
rename to gas/testsuite/gas/mmix/unsave-op-r.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op.d b/gas/testsuite/gas/mmix/unsave-op.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op.d
rename to gas/testsuite/gas/mmix/unsave-op.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op.l b/gas/testsuite/gas/mmix/unsave-op.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op.l
rename to gas/testsuite/gas/mmix/unsave-op.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op.s b/gas/testsuite/gas/mmix/unsave-op.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/unsave-op.s
rename to gas/testsuite/gas/mmix/unsave-op.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/weak1-s.d b/gas/testsuite/gas/mmix/weak1-s.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/weak1-s.d
rename to gas/testsuite/gas/mmix/weak1-s.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/weak1.d b/gas/testsuite/gas/mmix/weak1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/weak1.d
rename to gas/testsuite/gas/mmix/weak1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/weak1.s b/gas/testsuite/gas/mmix/weak1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/weak1.s
rename to gas/testsuite/gas/mmix/weak1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/zerop-1.d b/gas/testsuite/gas/mmix/zerop-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/zerop-1.d
rename to gas/testsuite/gas/mmix/zerop-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mmix/zerop-1.s b/gas/testsuite/gas/mmix/zerop-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mmix/zerop-1.s
rename to gas/testsuite/gas/mmix/zerop-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/add.s b/gas/testsuite/gas/mn10200/add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/add.s
rename to gas/testsuite/gas/mn10200/add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/basic.exp b/gas/testsuite/gas/mn10200/basic.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/basic.exp
rename to gas/testsuite/gas/mn10200/basic.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/bcc.s b/gas/testsuite/gas/mn10200/bcc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/bcc.s
rename to gas/testsuite/gas/mn10200/bcc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/bccx.s b/gas/testsuite/gas/mn10200/bccx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/bccx.s
rename to gas/testsuite/gas/mn10200/bccx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/bit.s b/gas/testsuite/gas/mn10200/bit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/bit.s
rename to gas/testsuite/gas/mn10200/bit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/cmp.s b/gas/testsuite/gas/mn10200/cmp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/cmp.s
rename to gas/testsuite/gas/mn10200/cmp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/ext.s b/gas/testsuite/gas/mn10200/ext.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/ext.s
rename to gas/testsuite/gas/mn10200/ext.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/logical.s b/gas/testsuite/gas/mn10200/logical.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/logical.s
rename to gas/testsuite/gas/mn10200/logical.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov1.s b/gas/testsuite/gas/mn10200/mov1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov1.s
rename to gas/testsuite/gas/mn10200/mov1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov2.s b/gas/testsuite/gas/mn10200/mov2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov2.s
rename to gas/testsuite/gas/mn10200/mov2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov3.s b/gas/testsuite/gas/mn10200/mov3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov3.s
rename to gas/testsuite/gas/mn10200/mov3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov4.s b/gas/testsuite/gas/mn10200/mov4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/mov4.s
rename to gas/testsuite/gas/mn10200/mov4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/movb.s b/gas/testsuite/gas/mn10200/movb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/movb.s
rename to gas/testsuite/gas/mn10200/movb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/movbu.s b/gas/testsuite/gas/mn10200/movbu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/movbu.s
rename to gas/testsuite/gas/mn10200/movbu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/movx.s b/gas/testsuite/gas/mn10200/movx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/movx.s
rename to gas/testsuite/gas/mn10200/movx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/muldiv.s b/gas/testsuite/gas/mn10200/muldiv.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/muldiv.s
rename to gas/testsuite/gas/mn10200/muldiv.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/other.s b/gas/testsuite/gas/mn10200/other.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/other.s
rename to gas/testsuite/gas/mn10200/other.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/shift.s b/gas/testsuite/gas/mn10200/shift.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/shift.s
rename to gas/testsuite/gas/mn10200/shift.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10200/sub.s b/gas/testsuite/gas/mn10200/sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10200/sub.s
rename to gas/testsuite/gas/mn10200/sub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/add.s b/gas/testsuite/gas/mn10300/add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/add.s
rename to gas/testsuite/gas/mn10300/add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33-2.c b/gas/testsuite/gas/mn10300/am33-2.c
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33-2.c
rename to gas/testsuite/gas/mn10300/am33-2.c
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33-2.d b/gas/testsuite/gas/mn10300/am33-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33-2.d
rename to gas/testsuite/gas/mn10300/am33-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33-2.s b/gas/testsuite/gas/mn10300/am33-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33-2.s
rename to gas/testsuite/gas/mn10300/am33-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33.s b/gas/testsuite/gas/mn10300/am33.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33.s
rename to gas/testsuite/gas/mn10300/am33.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_2.s b/gas/testsuite/gas/mn10300/am33_2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_2.s
rename to gas/testsuite/gas/mn10300/am33_2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_3.s b/gas/testsuite/gas/mn10300/am33_3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_3.s
rename to gas/testsuite/gas/mn10300/am33_3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_4.s b/gas/testsuite/gas/mn10300/am33_4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_4.s
rename to gas/testsuite/gas/mn10300/am33_4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_5.s b/gas/testsuite/gas/mn10300/am33_5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_5.s
rename to gas/testsuite/gas/mn10300/am33_5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_6.s b/gas/testsuite/gas/mn10300/am33_6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_6.s
rename to gas/testsuite/gas/mn10300/am33_6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_7.s b/gas/testsuite/gas/mn10300/am33_7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_7.s
rename to gas/testsuite/gas/mn10300/am33_7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_8.s b/gas/testsuite/gas/mn10300/am33_8.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/am33_8.s
rename to gas/testsuite/gas/mn10300/am33_8.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/basic.exp b/gas/testsuite/gas/mn10300/basic.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/basic.exp
rename to gas/testsuite/gas/mn10300/basic.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/bcc.s b/gas/testsuite/gas/mn10300/bcc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/bcc.s
rename to gas/testsuite/gas/mn10300/bcc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/bit.s b/gas/testsuite/gas/mn10300/bit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/bit.s
rename to gas/testsuite/gas/mn10300/bit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/cmp.s b/gas/testsuite/gas/mn10300/cmp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/cmp.s
rename to gas/testsuite/gas/mn10300/cmp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/ext.s b/gas/testsuite/gas/mn10300/ext.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/ext.s
rename to gas/testsuite/gas/mn10300/ext.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/extend.s b/gas/testsuite/gas/mn10300/extend.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/extend.s
rename to gas/testsuite/gas/mn10300/extend.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/logical.s b/gas/testsuite/gas/mn10300/logical.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/logical.s
rename to gas/testsuite/gas/mn10300/logical.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/loop.s b/gas/testsuite/gas/mn10300/loop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/loop.s
rename to gas/testsuite/gas/mn10300/loop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov1.s b/gas/testsuite/gas/mn10300/mov1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov1.s
rename to gas/testsuite/gas/mn10300/mov1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov2.s b/gas/testsuite/gas/mn10300/mov2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov2.s
rename to gas/testsuite/gas/mn10300/mov2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov3.s b/gas/testsuite/gas/mn10300/mov3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov3.s
rename to gas/testsuite/gas/mn10300/mov3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov4.s b/gas/testsuite/gas/mn10300/mov4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov4.s
rename to gas/testsuite/gas/mn10300/mov4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov5.s b/gas/testsuite/gas/mn10300/mov5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/mov5.s
rename to gas/testsuite/gas/mn10300/mov5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/movbu.s b/gas/testsuite/gas/mn10300/movbu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/movbu.s
rename to gas/testsuite/gas/mn10300/movbu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/movhu.s b/gas/testsuite/gas/mn10300/movhu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/movhu.s
rename to gas/testsuite/gas/mn10300/movhu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/movm.s b/gas/testsuite/gas/mn10300/movm.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/movm.s
rename to gas/testsuite/gas/mn10300/movm.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/movpc.l b/gas/testsuite/gas/mn10300/movpc.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/movpc.l
rename to gas/testsuite/gas/mn10300/movpc.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/movpc.s b/gas/testsuite/gas/mn10300/movpc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/movpc.s
rename to gas/testsuite/gas/mn10300/movpc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/muldiv.s b/gas/testsuite/gas/mn10300/muldiv.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/muldiv.s
rename to gas/testsuite/gas/mn10300/muldiv.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/other.s b/gas/testsuite/gas/mn10300/other.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/other.s
rename to gas/testsuite/gas/mn10300/other.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr11973.d b/gas/testsuite/gas/mn10300/pr11973.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr11973.d
rename to gas/testsuite/gas/mn10300/pr11973.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr11973.s b/gas/testsuite/gas/mn10300/pr11973.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr11973.s
rename to gas/testsuite/gas/mn10300/pr11973.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr997.l b/gas/testsuite/gas/mn10300/pr997.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr997.l
rename to gas/testsuite/gas/mn10300/pr997.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr997.s b/gas/testsuite/gas/mn10300/pr997.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/pr997.s
rename to gas/testsuite/gas/mn10300/pr997.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/relax.d b/gas/testsuite/gas/mn10300/relax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/relax.d
rename to gas/testsuite/gas/mn10300/relax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/relax.s b/gas/testsuite/gas/mn10300/relax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/relax.s
rename to gas/testsuite/gas/mn10300/relax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/shift.s b/gas/testsuite/gas/mn10300/shift.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/shift.s
rename to gas/testsuite/gas/mn10300/shift.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/sub.s b/gas/testsuite/gas/mn10300/sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/sub.s
rename to gas/testsuite/gas/mn10300/sub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mn10300/udf.s b/gas/testsuite/gas/mn10300/udf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mn10300/udf.s
rename to gas/testsuite/gas/mn10300/udf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/char.d b/gas/testsuite/gas/mri/char.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/char.d
rename to gas/testsuite/gas/mri/char.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/char.s b/gas/testsuite/gas/mri/char.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/char.s
rename to gas/testsuite/gas/mri/char.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/comment.d b/gas/testsuite/gas/mri/comment.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/comment.d
rename to gas/testsuite/gas/mri/comment.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/comment.s b/gas/testsuite/gas/mri/comment.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/comment.s
rename to gas/testsuite/gas/mri/comment.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/common.d b/gas/testsuite/gas/mri/common.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/common.d
rename to gas/testsuite/gas/mri/common.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/common.s b/gas/testsuite/gas/mri/common.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/common.s
rename to gas/testsuite/gas/mri/common.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/constants.d b/gas/testsuite/gas/mri/constants.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/constants.d
rename to gas/testsuite/gas/mri/constants.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/constants.s b/gas/testsuite/gas/mri/constants.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/constants.s
rename to gas/testsuite/gas/mri/constants.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/empty.s b/gas/testsuite/gas/mri/empty.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/empty.s
rename to gas/testsuite/gas/mri/empty.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/equ.d b/gas/testsuite/gas/mri/equ.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/equ.d
rename to gas/testsuite/gas/mri/equ.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/equ.s b/gas/testsuite/gas/mri/equ.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/equ.s
rename to gas/testsuite/gas/mri/equ.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/expr.d b/gas/testsuite/gas/mri/expr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/expr.d
rename to gas/testsuite/gas/mri/expr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/expr.s b/gas/testsuite/gas/mri/expr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/expr.s
rename to gas/testsuite/gas/mri/expr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/float.d b/gas/testsuite/gas/mri/float.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/float.d
rename to gas/testsuite/gas/mri/float.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/float.s b/gas/testsuite/gas/mri/float.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/float.s
rename to gas/testsuite/gas/mri/float.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/for.d b/gas/testsuite/gas/mri/for.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/for.d
rename to gas/testsuite/gas/mri/for.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/for.s b/gas/testsuite/gas/mri/for.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/for.s
rename to gas/testsuite/gas/mri/for.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/if.d b/gas/testsuite/gas/mri/if.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/if.d
rename to gas/testsuite/gas/mri/if.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/if.s b/gas/testsuite/gas/mri/if.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/if.s
rename to gas/testsuite/gas/mri/if.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/immconst.d b/gas/testsuite/gas/mri/immconst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/immconst.d
rename to gas/testsuite/gas/mri/immconst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/label.d b/gas/testsuite/gas/mri/label.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/label.d
rename to gas/testsuite/gas/mri/label.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/label.s b/gas/testsuite/gas/mri/label.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/label.s
rename to gas/testsuite/gas/mri/label.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/moveml.d b/gas/testsuite/gas/mri/moveml.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/moveml.d
rename to gas/testsuite/gas/mri/moveml.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/moveml.s b/gas/testsuite/gas/mri/moveml.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/moveml.s
rename to gas/testsuite/gas/mri/moveml.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/mri.exp b/gas/testsuite/gas/mri/mri.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/mri.exp
rename to gas/testsuite/gas/mri/mri.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/repeat.d b/gas/testsuite/gas/mri/repeat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/repeat.d
rename to gas/testsuite/gas/mri/repeat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/repeat.s b/gas/testsuite/gas/mri/repeat.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/repeat.s
rename to gas/testsuite/gas/mri/repeat.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/semi.d b/gas/testsuite/gas/mri/semi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/semi.d
rename to gas/testsuite/gas/mri/semi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/semi.s b/gas/testsuite/gas/mri/semi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/semi.s
rename to gas/testsuite/gas/mri/semi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/while.d b/gas/testsuite/gas/mri/while.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/while.d
rename to gas/testsuite/gas/mri/while.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mri/while.s b/gas/testsuite/gas/mri/while.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mri/while.s
rename to gas/testsuite/gas/mri/while.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/msp430/msp430.exp b/gas/testsuite/gas/msp430/msp430.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/msp430/msp430.exp
rename to gas/testsuite/gas/msp430/msp430.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/msp430/opcode.d b/gas/testsuite/gas/msp430/opcode.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/msp430/opcode.d
rename to gas/testsuite/gas/msp430/opcode.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/msp430/opcode.s b/gas/testsuite/gas/msp430/opcode.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/msp430/opcode.s
rename to gas/testsuite/gas/msp430/opcode.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/allinsn.d b/gas/testsuite/gas/mt/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/allinsn.d
rename to gas/testsuite/gas/mt/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/allinsn.s b/gas/testsuite/gas/mt/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/allinsn.s
rename to gas/testsuite/gas/mt/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badinsn.s b/gas/testsuite/gas/mt/badinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badinsn.s
rename to gas/testsuite/gas/mt/badinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badinsn1.s b/gas/testsuite/gas/mt/badinsn1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badinsn1.s
rename to gas/testsuite/gas/mt/badinsn1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badoffsethigh.s b/gas/testsuite/gas/mt/badoffsethigh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badoffsethigh.s
rename to gas/testsuite/gas/mt/badoffsethigh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badoffsetlow.s b/gas/testsuite/gas/mt/badoffsetlow.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badoffsetlow.s
rename to gas/testsuite/gas/mt/badoffsetlow.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badorder.s b/gas/testsuite/gas/mt/badorder.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badorder.s
rename to gas/testsuite/gas/mt/badorder.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badreg.s b/gas/testsuite/gas/mt/badreg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badreg.s
rename to gas/testsuite/gas/mt/badreg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badsignedimmhigh.s b/gas/testsuite/gas/mt/badsignedimmhigh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badsignedimmhigh.s
rename to gas/testsuite/gas/mt/badsignedimmhigh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badsignedimmlow.s b/gas/testsuite/gas/mt/badsignedimmlow.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badsignedimmlow.s
rename to gas/testsuite/gas/mt/badsignedimmlow.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badsyntax.s b/gas/testsuite/gas/mt/badsyntax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badsyntax.s
rename to gas/testsuite/gas/mt/badsyntax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badsyntax1.s b/gas/testsuite/gas/mt/badsyntax1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badsyntax1.s
rename to gas/testsuite/gas/mt/badsyntax1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badunsignedimmhigh.s b/gas/testsuite/gas/mt/badunsignedimmhigh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badunsignedimmhigh.s
rename to gas/testsuite/gas/mt/badunsignedimmhigh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/badunsignedimmlow.s b/gas/testsuite/gas/mt/badunsignedimmlow.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/badunsignedimmlow.s
rename to gas/testsuite/gas/mt/badunsignedimmlow.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/errors.exp b/gas/testsuite/gas/mt/errors.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/errors.exp
rename to gas/testsuite/gas/mt/errors.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/ldst.s b/gas/testsuite/gas/mt/ldst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/ldst.s
rename to gas/testsuite/gas/mt/ldst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/misc.d b/gas/testsuite/gas/mt/misc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/misc.d
rename to gas/testsuite/gas/mt/misc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/misc.s b/gas/testsuite/gas/mt/misc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/misc.s
rename to gas/testsuite/gas/mt/misc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/ms1-16-003.d b/gas/testsuite/gas/mt/ms1-16-003.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/ms1-16-003.d
rename to gas/testsuite/gas/mt/ms1-16-003.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/ms1-16-003.s b/gas/testsuite/gas/mt/ms1-16-003.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/ms1-16-003.s
rename to gas/testsuite/gas/mt/ms1-16-003.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/ms2.d b/gas/testsuite/gas/mt/ms2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/ms2.d
rename to gas/testsuite/gas/mt/ms2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/ms2.s b/gas/testsuite/gas/mt/ms2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/ms2.s
rename to gas/testsuite/gas/mt/ms2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/msys.d b/gas/testsuite/gas/mt/msys.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/msys.d
rename to gas/testsuite/gas/mt/msys.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/msys.s b/gas/testsuite/gas/mt/msys.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/msys.s
rename to gas/testsuite/gas/mt/msys.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/mt.exp b/gas/testsuite/gas/mt/mt.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/mt.exp
rename to gas/testsuite/gas/mt/mt.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/relocs.d b/gas/testsuite/gas/mt/relocs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/relocs.d
rename to gas/testsuite/gas/mt/relocs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/relocs.exp b/gas/testsuite/gas/mt/relocs.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/relocs.exp
rename to gas/testsuite/gas/mt/relocs.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/relocs1.s b/gas/testsuite/gas/mt/relocs1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/relocs1.s
rename to gas/testsuite/gas/mt/relocs1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/mt/relocs2.s b/gas/testsuite/gas/mt/relocs2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/mt/relocs2.s
rename to gas/testsuite/gas/mt/relocs2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/addi.d b/gas/testsuite/gas/openrisc/addi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/addi.d
rename to gas/testsuite/gas/openrisc/addi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/addi.s b/gas/testsuite/gas/openrisc/addi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/addi.s
rename to gas/testsuite/gas/openrisc/addi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/allinsn.d b/gas/testsuite/gas/openrisc/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/allinsn.d
rename to gas/testsuite/gas/openrisc/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/allinsn.exp b/gas/testsuite/gas/openrisc/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/allinsn.exp
rename to gas/testsuite/gas/openrisc/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/allinsn.s b/gas/testsuite/gas/openrisc/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/allinsn.s
rename to gas/testsuite/gas/openrisc/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/lohi.d b/gas/testsuite/gas/openrisc/lohi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/lohi.d
rename to gas/testsuite/gas/openrisc/lohi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/lohi.s b/gas/testsuite/gas/openrisc/lohi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/lohi.s
rename to gas/testsuite/gas/openrisc/lohi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/store.d b/gas/testsuite/gas/openrisc/store.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/store.d
rename to gas/testsuite/gas/openrisc/store.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/openrisc/store.s b/gas/testsuite/gas/openrisc/store.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/openrisc/store.s
rename to gas/testsuite/gas/openrisc/store.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pdp11/opcode.d b/gas/testsuite/gas/pdp11/opcode.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pdp11/opcode.d
rename to gas/testsuite/gas/pdp11/opcode.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pdp11/opcode.s b/gas/testsuite/gas/pdp11/opcode.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pdp11/opcode.s
rename to gas/testsuite/gas/pdp11/opcode.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pdp11/pdp11.exp b/gas/testsuite/gas/pdp11/pdp11.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pdp11/pdp11.exp
rename to gas/testsuite/gas/pdp11/pdp11.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-a.d b/gas/testsuite/gas/pe/aligncomm-a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-a.d
rename to gas/testsuite/gas/pe/aligncomm-a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-a.s b/gas/testsuite/gas/pe/aligncomm-a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-a.s
rename to gas/testsuite/gas/pe/aligncomm-a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-b.d b/gas/testsuite/gas/pe/aligncomm-b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-b.d
rename to gas/testsuite/gas/pe/aligncomm-b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-b.s b/gas/testsuite/gas/pe/aligncomm-b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-b.s
rename to gas/testsuite/gas/pe/aligncomm-b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-c.d b/gas/testsuite/gas/pe/aligncomm-c.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-c.d
rename to gas/testsuite/gas/pe/aligncomm-c.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-c.s b/gas/testsuite/gas/pe/aligncomm-c.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-c.s
rename to gas/testsuite/gas/pe/aligncomm-c.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-d.d b/gas/testsuite/gas/pe/aligncomm-d.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-d.d
rename to gas/testsuite/gas/pe/aligncomm-d.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-d.s b/gas/testsuite/gas/pe/aligncomm-d.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/aligncomm-d.s
rename to gas/testsuite/gas/pe/aligncomm-d.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/pe.exp b/gas/testsuite/gas/pe/pe.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/pe.exp
rename to gas/testsuite/gas/pe/pe.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-2.d b/gas/testsuite/gas/pe/peseh-x64-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-2.d
rename to gas/testsuite/gas/pe/peseh-x64-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-2.s b/gas/testsuite/gas/pe/peseh-x64-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-2.s
rename to gas/testsuite/gas/pe/peseh-x64-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-3.d b/gas/testsuite/gas/pe/peseh-x64-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-3.d
rename to gas/testsuite/gas/pe/peseh-x64-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-3.s b/gas/testsuite/gas/pe/peseh-x64-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-3.s
rename to gas/testsuite/gas/pe/peseh-x64-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-4.d b/gas/testsuite/gas/pe/peseh-x64-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-4.d
rename to gas/testsuite/gas/pe/peseh-x64-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-4.s b/gas/testsuite/gas/pe/peseh-x64-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-4.s
rename to gas/testsuite/gas/pe/peseh-x64-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-5.d b/gas/testsuite/gas/pe/peseh-x64-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-5.d
rename to gas/testsuite/gas/pe/peseh-x64-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-6.d b/gas/testsuite/gas/pe/peseh-x64-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64-6.d
rename to gas/testsuite/gas/pe/peseh-x64-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64.d b/gas/testsuite/gas/pe/peseh-x64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64.d
rename to gas/testsuite/gas/pe/peseh-x64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64.s b/gas/testsuite/gas/pe/peseh-x64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/peseh-x64.s
rename to gas/testsuite/gas/pe/peseh-x64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-1.d b/gas/testsuite/gas/pe/section-align-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-1.d
rename to gas/testsuite/gas/pe/section-align-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-1.s b/gas/testsuite/gas/pe/section-align-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-1.s
rename to gas/testsuite/gas/pe/section-align-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-3.d b/gas/testsuite/gas/pe/section-align-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-3.d
rename to gas/testsuite/gas/pe/section-align-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-3.s b/gas/testsuite/gas/pe/section-align-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/section-align-3.s
rename to gas/testsuite/gas/pe/section-align-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/seh-x64-err-1.l b/gas/testsuite/gas/pe/seh-x64-err-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/seh-x64-err-1.l
rename to gas/testsuite/gas/pe/seh-x64-err-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pe/seh-x64-err-1.s b/gas/testsuite/gas/pe/seh-x64-err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pe/seh-x64-err-1.s
rename to gas/testsuite/gas/pe/seh-x64-err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pj/ops.d b/gas/testsuite/gas/pj/ops.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pj/ops.d
rename to gas/testsuite/gas/pj/ops.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pj/ops.s b/gas/testsuite/gas/pj/ops.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pj/ops.s
rename to gas/testsuite/gas/pj/ops.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/pj/pj.exp b/gas/testsuite/gas/pj/pj.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/pj/pj.exp
rename to gas/testsuite/gas/pj/pj.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/476.d b/gas/testsuite/gas/ppc/476.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/476.d
rename to gas/testsuite/gas/ppc/476.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/476.s b/gas/testsuite/gas/ppc/476.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/476.s
rename to gas/testsuite/gas/ppc/476.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/a2.d b/gas/testsuite/gas/ppc/a2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/a2.d
rename to gas/testsuite/gas/ppc/a2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/a2.s b/gas/testsuite/gas/ppc/a2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/a2.s
rename to gas/testsuite/gas/ppc/a2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/aix.exp b/gas/testsuite/gas/ppc/aix.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/aix.exp
rename to gas/testsuite/gas/ppc/aix.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/align.s b/gas/testsuite/gas/ppc/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/align.s
rename to gas/testsuite/gas/ppc/align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec.d b/gas/testsuite/gas/ppc/altivec.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec.d
rename to gas/testsuite/gas/ppc/altivec.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec.s b/gas/testsuite/gas/ppc/altivec.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec.s
rename to gas/testsuite/gas/ppc/altivec.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_and_spe.d b/gas/testsuite/gas/ppc/altivec_and_spe.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_and_spe.d
rename to gas/testsuite/gas/ppc/altivec_and_spe.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_and_spe.s b/gas/testsuite/gas/ppc/altivec_and_spe.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_and_spe.s
rename to gas/testsuite/gas/ppc/altivec_and_spe.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff.d b/gas/testsuite/gas/ppc/altivec_xcoff.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff.d
rename to gas/testsuite/gas/ppc/altivec_xcoff.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff.s b/gas/testsuite/gas/ppc/altivec_xcoff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff.s
rename to gas/testsuite/gas/ppc/altivec_xcoff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff64.d b/gas/testsuite/gas/ppc/altivec_xcoff64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff64.d
rename to gas/testsuite/gas/ppc/altivec_xcoff64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff64.s b/gas/testsuite/gas/ppc/altivec_xcoff64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/altivec_xcoff64.s
rename to gas/testsuite/gas/ppc/altivec_xcoff64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest.d b/gas/testsuite/gas/ppc/astest.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest.d
rename to gas/testsuite/gas/ppc/astest.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest.s b/gas/testsuite/gas/ppc/astest.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest.s
rename to gas/testsuite/gas/ppc/astest.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2.d b/gas/testsuite/gas/ppc/astest2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2.d
rename to gas/testsuite/gas/ppc/astest2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2.s b/gas/testsuite/gas/ppc/astest2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2.s
rename to gas/testsuite/gas/ppc/astest2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2_64.d b/gas/testsuite/gas/ppc/astest2_64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2_64.d
rename to gas/testsuite/gas/ppc/astest2_64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2_64.s b/gas/testsuite/gas/ppc/astest2_64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest2_64.s
rename to gas/testsuite/gas/ppc/astest2_64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest64.d b/gas/testsuite/gas/ppc/astest64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest64.d
rename to gas/testsuite/gas/ppc/astest64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/astest64.s b/gas/testsuite/gas/ppc/astest64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/astest64.s
rename to gas/testsuite/gas/ppc/astest64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/booke.d b/gas/testsuite/gas/ppc/booke.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/booke.d
rename to gas/testsuite/gas/ppc/booke.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/booke.s b/gas/testsuite/gas/ppc/booke.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/booke.s
rename to gas/testsuite/gas/ppc/booke.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/booke_xcoff.d b/gas/testsuite/gas/ppc/booke_xcoff.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/booke_xcoff.d
rename to gas/testsuite/gas/ppc/booke_xcoff.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/booke_xcoff.s b/gas/testsuite/gas/ppc/booke_xcoff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/booke_xcoff.s
rename to gas/testsuite/gas/ppc/booke_xcoff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/cell.d b/gas/testsuite/gas/ppc/cell.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/cell.d
rename to gas/testsuite/gas/ppc/cell.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/cell.s b/gas/testsuite/gas/ppc/cell.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/cell.s
rename to gas/testsuite/gas/ppc/cell.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/common.d b/gas/testsuite/gas/ppc/common.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/common.d
rename to gas/testsuite/gas/ppc/common.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/common.s b/gas/testsuite/gas/ppc/common.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/common.s
rename to gas/testsuite/gas/ppc/common.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/e500.d b/gas/testsuite/gas/ppc/e500.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/e500.d
rename to gas/testsuite/gas/ppc/e500.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/e500.s b/gas/testsuite/gas/ppc/e500.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/e500.s
rename to gas/testsuite/gas/ppc/e500.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/e500mc.d b/gas/testsuite/gas/ppc/e500mc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/e500mc.d
rename to gas/testsuite/gas/ppc/e500mc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/e500mc.s b/gas/testsuite/gas/ppc/e500mc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/e500mc.s
rename to gas/testsuite/gas/ppc/e500mc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/generate.sh b/gas/testsuite/gas/ppc/generate.sh
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/generate.sh
rename to gas/testsuite/gas/ppc/generate.sh
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/machine.d b/gas/testsuite/gas/ppc/machine.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/machine.d
rename to gas/testsuite/gas/ppc/machine.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/machine.s b/gas/testsuite/gas/ppc/machine.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/machine.s
rename to gas/testsuite/gas/ppc/machine.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power4.d b/gas/testsuite/gas/ppc/power4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power4.d
rename to gas/testsuite/gas/ppc/power4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power4.s b/gas/testsuite/gas/ppc/power4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power4.s
rename to gas/testsuite/gas/ppc/power4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power4_32.d b/gas/testsuite/gas/ppc/power4_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power4_32.d
rename to gas/testsuite/gas/ppc/power4_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power4_32.s b/gas/testsuite/gas/ppc/power4_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power4_32.s
rename to gas/testsuite/gas/ppc/power4_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power6.d b/gas/testsuite/gas/ppc/power6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power6.d
rename to gas/testsuite/gas/ppc/power6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power6.s b/gas/testsuite/gas/ppc/power6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power6.s
rename to gas/testsuite/gas/ppc/power6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power7.d b/gas/testsuite/gas/ppc/power7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power7.d
rename to gas/testsuite/gas/ppc/power7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/power7.s b/gas/testsuite/gas/ppc/power7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/power7.s
rename to gas/testsuite/gas/ppc/power7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/ppc.exp b/gas/testsuite/gas/ppc/ppc.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/ppc.exp
rename to gas/testsuite/gas/ppc/ppc.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/ppc750ps.d b/gas/testsuite/gas/ppc/ppc750ps.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/ppc750ps.d
rename to gas/testsuite/gas/ppc/ppc750ps.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/ppc750ps.s b/gas/testsuite/gas/ppc/ppc750ps.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/ppc750ps.s
rename to gas/testsuite/gas/ppc/ppc750ps.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/range.l b/gas/testsuite/gas/ppc/range.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/range.l
rename to gas/testsuite/gas/ppc/range.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/range.s b/gas/testsuite/gas/ppc/range.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/range.s
rename to gas/testsuite/gas/ppc/range.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/range64.l b/gas/testsuite/gas/ppc/range64.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/range64.l
rename to gas/testsuite/gas/ppc/range64.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/range64.s b/gas/testsuite/gas/ppc/range64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/range64.s
rename to gas/testsuite/gas/ppc/range64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/regnames.d b/gas/testsuite/gas/ppc/regnames.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/regnames.d
rename to gas/testsuite/gas/ppc/regnames.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/regnames.s b/gas/testsuite/gas/ppc/regnames.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/regnames.s
rename to gas/testsuite/gas/ppc/regnames.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/reloc.d b/gas/testsuite/gas/ppc/reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/reloc.d
rename to gas/testsuite/gas/ppc/reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/reloc.s b/gas/testsuite/gas/ppc/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/reloc.s
rename to gas/testsuite/gas/ppc/reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/simpshft.d b/gas/testsuite/gas/ppc/simpshft.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/simpshft.d
rename to gas/testsuite/gas/ppc/simpshft.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/simpshft.s b/gas/testsuite/gas/ppc/simpshft.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/simpshft.s
rename to gas/testsuite/gas/ppc/simpshft.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf.asm b/gas/testsuite/gas/ppc/test1elf.asm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf.asm
rename to gas/testsuite/gas/ppc/test1elf.asm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf32.d b/gas/testsuite/gas/ppc/test1elf32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf32.d
rename to gas/testsuite/gas/ppc/test1elf32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf32.s b/gas/testsuite/gas/ppc/test1elf32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf32.s
rename to gas/testsuite/gas/ppc/test1elf32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf64.d b/gas/testsuite/gas/ppc/test1elf64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf64.d
rename to gas/testsuite/gas/ppc/test1elf64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf64.s b/gas/testsuite/gas/ppc/test1elf64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1elf64.s
rename to gas/testsuite/gas/ppc/test1elf64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1xcoff.asm b/gas/testsuite/gas/ppc/test1xcoff.asm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1xcoff.asm
rename to gas/testsuite/gas/ppc/test1xcoff.asm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1xcoff32.d b/gas/testsuite/gas/ppc/test1xcoff32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1xcoff32.d
rename to gas/testsuite/gas/ppc/test1xcoff32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/test1xcoff32.s b/gas/testsuite/gas/ppc/test1xcoff32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/test1xcoff32.s
rename to gas/testsuite/gas/ppc/test1xcoff32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/textalign-xcoff-001.d b/gas/testsuite/gas/ppc/textalign-xcoff-001.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/textalign-xcoff-001.d
rename to gas/testsuite/gas/ppc/textalign-xcoff-001.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/textalign-xcoff-001.s b/gas/testsuite/gas/ppc/textalign-xcoff-001.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/textalign-xcoff-001.s
rename to gas/testsuite/gas/ppc/textalign-xcoff-001.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/textalign-xcoff-002.d b/gas/testsuite/gas/ppc/textalign-xcoff-002.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/textalign-xcoff-002.d
rename to gas/testsuite/gas/ppc/textalign-xcoff-002.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/titan.d b/gas/testsuite/gas/ppc/titan.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/titan.d
rename to gas/testsuite/gas/ppc/titan.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/titan.s b/gas/testsuite/gas/ppc/titan.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/titan.s
rename to gas/testsuite/gas/ppc/titan.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/vsx.d b/gas/testsuite/gas/ppc/vsx.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/vsx.d
rename to gas/testsuite/gas/ppc/vsx.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/vsx.s b/gas/testsuite/gas/ppc/vsx.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/vsx.s
rename to gas/testsuite/gas/ppc/vsx.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-branch-1-32.d b/gas/testsuite/gas/ppc/xcoff-branch-1-32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-branch-1-32.d
rename to gas/testsuite/gas/ppc/xcoff-branch-1-32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-branch-1-64.d b/gas/testsuite/gas/ppc/xcoff-branch-1-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-branch-1-64.d
rename to gas/testsuite/gas/ppc/xcoff-branch-1-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-branch-1.s b/gas/testsuite/gas/ppc/xcoff-branch-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-branch-1.s
rename to gas/testsuite/gas/ppc/xcoff-branch-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-ref-1.l b/gas/testsuite/gas/ppc/xcoff-ref-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-ref-1.l
rename to gas/testsuite/gas/ppc/xcoff-ref-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-ref-1.s b/gas/testsuite/gas/ppc/xcoff-ref-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/ppc/xcoff-ref-1.s
rename to gas/testsuite/gas/ppc/xcoff-ref-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/abs.d b/gas/testsuite/gas/rx/abs.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/abs.d
rename to gas/testsuite/gas/rx/abs.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/abs.sm b/gas/testsuite/gas/rx/abs.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/abs.sm
rename to gas/testsuite/gas/rx/abs.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/adc.d b/gas/testsuite/gas/rx/adc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/adc.d
rename to gas/testsuite/gas/rx/adc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/adc.sm b/gas/testsuite/gas/rx/adc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/adc.sm
rename to gas/testsuite/gas/rx/adc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/add.d b/gas/testsuite/gas/rx/add.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/add.d
rename to gas/testsuite/gas/rx/add.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/add.sm b/gas/testsuite/gas/rx/add.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/add.sm
rename to gas/testsuite/gas/rx/add.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/and.d b/gas/testsuite/gas/rx/and.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/and.d
rename to gas/testsuite/gas/rx/and.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/and.sm b/gas/testsuite/gas/rx/and.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/and.sm
rename to gas/testsuite/gas/rx/and.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bclr.d b/gas/testsuite/gas/rx/bclr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bclr.d
rename to gas/testsuite/gas/rx/bclr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bclr.sm b/gas/testsuite/gas/rx/bclr.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bclr.sm
rename to gas/testsuite/gas/rx/bclr.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bcnd.d b/gas/testsuite/gas/rx/bcnd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bcnd.d
rename to gas/testsuite/gas/rx/bcnd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bcnd.sm b/gas/testsuite/gas/rx/bcnd.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bcnd.sm
rename to gas/testsuite/gas/rx/bcnd.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bmcnd.d b/gas/testsuite/gas/rx/bmcnd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bmcnd.d
rename to gas/testsuite/gas/rx/bmcnd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bmcnd.sm b/gas/testsuite/gas/rx/bmcnd.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bmcnd.sm
rename to gas/testsuite/gas/rx/bmcnd.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bnot.d b/gas/testsuite/gas/rx/bnot.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bnot.d
rename to gas/testsuite/gas/rx/bnot.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bnot.sm b/gas/testsuite/gas/rx/bnot.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bnot.sm
rename to gas/testsuite/gas/rx/bnot.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bra.d b/gas/testsuite/gas/rx/bra.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bra.d
rename to gas/testsuite/gas/rx/bra.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bra.sm b/gas/testsuite/gas/rx/bra.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bra.sm
rename to gas/testsuite/gas/rx/bra.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/brk.d b/gas/testsuite/gas/rx/brk.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/brk.d
rename to gas/testsuite/gas/rx/brk.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/brk.sm b/gas/testsuite/gas/rx/brk.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/brk.sm
rename to gas/testsuite/gas/rx/brk.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bset.d b/gas/testsuite/gas/rx/bset.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bset.d
rename to gas/testsuite/gas/rx/bset.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bset.sm b/gas/testsuite/gas/rx/bset.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bset.sm
rename to gas/testsuite/gas/rx/bset.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bsr.d b/gas/testsuite/gas/rx/bsr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bsr.d
rename to gas/testsuite/gas/rx/bsr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/bsr.sm b/gas/testsuite/gas/rx/bsr.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/bsr.sm
rename to gas/testsuite/gas/rx/bsr.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/btst.d b/gas/testsuite/gas/rx/btst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/btst.d
rename to gas/testsuite/gas/rx/btst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/btst.sm b/gas/testsuite/gas/rx/btst.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/btst.sm
rename to gas/testsuite/gas/rx/btst.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/clrpsw.d b/gas/testsuite/gas/rx/clrpsw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/clrpsw.d
rename to gas/testsuite/gas/rx/clrpsw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/clrpsw.sm b/gas/testsuite/gas/rx/clrpsw.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/clrpsw.sm
rename to gas/testsuite/gas/rx/clrpsw.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/cmp.d b/gas/testsuite/gas/rx/cmp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/cmp.d
rename to gas/testsuite/gas/rx/cmp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/cmp.sm b/gas/testsuite/gas/rx/cmp.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/cmp.sm
rename to gas/testsuite/gas/rx/cmp.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/dbt.d b/gas/testsuite/gas/rx/dbt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/dbt.d
rename to gas/testsuite/gas/rx/dbt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/dbt.sm b/gas/testsuite/gas/rx/dbt.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/dbt.sm
rename to gas/testsuite/gas/rx/dbt.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/div.d b/gas/testsuite/gas/rx/div.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/div.d
rename to gas/testsuite/gas/rx/div.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/div.sm b/gas/testsuite/gas/rx/div.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/div.sm
rename to gas/testsuite/gas/rx/div.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/divu.d b/gas/testsuite/gas/rx/divu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/divu.d
rename to gas/testsuite/gas/rx/divu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/divu.sm b/gas/testsuite/gas/rx/divu.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/divu.sm
rename to gas/testsuite/gas/rx/divu.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/emul.d b/gas/testsuite/gas/rx/emul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/emul.d
rename to gas/testsuite/gas/rx/emul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/emul.sm b/gas/testsuite/gas/rx/emul.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/emul.sm
rename to gas/testsuite/gas/rx/emul.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/emulu.d b/gas/testsuite/gas/rx/emulu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/emulu.d
rename to gas/testsuite/gas/rx/emulu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/emulu.sm b/gas/testsuite/gas/rx/emulu.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/emulu.sm
rename to gas/testsuite/gas/rx/emulu.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/explode b/gas/testsuite/gas/rx/explode
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/explode
rename to gas/testsuite/gas/rx/explode
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fadd.d b/gas/testsuite/gas/rx/fadd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fadd.d
rename to gas/testsuite/gas/rx/fadd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fadd.sm b/gas/testsuite/gas/rx/fadd.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fadd.sm
rename to gas/testsuite/gas/rx/fadd.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fcmp.d b/gas/testsuite/gas/rx/fcmp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fcmp.d
rename to gas/testsuite/gas/rx/fcmp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fcmp.sm b/gas/testsuite/gas/rx/fcmp.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fcmp.sm
rename to gas/testsuite/gas/rx/fcmp.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fdiv.d b/gas/testsuite/gas/rx/fdiv.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fdiv.d
rename to gas/testsuite/gas/rx/fdiv.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fdiv.sm b/gas/testsuite/gas/rx/fdiv.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fdiv.sm
rename to gas/testsuite/gas/rx/fdiv.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fmul.d b/gas/testsuite/gas/rx/fmul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fmul.d
rename to gas/testsuite/gas/rx/fmul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fmul.sm b/gas/testsuite/gas/rx/fmul.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fmul.sm
rename to gas/testsuite/gas/rx/fmul.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fsub.d b/gas/testsuite/gas/rx/fsub.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fsub.d
rename to gas/testsuite/gas/rx/fsub.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/fsub.sm b/gas/testsuite/gas/rx/fsub.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/fsub.sm
rename to gas/testsuite/gas/rx/fsub.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/ftoi.d b/gas/testsuite/gas/rx/ftoi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/ftoi.d
rename to gas/testsuite/gas/rx/ftoi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/ftoi.sm b/gas/testsuite/gas/rx/ftoi.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/ftoi.sm
rename to gas/testsuite/gas/rx/ftoi.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/gprel.d b/gas/testsuite/gas/rx/gprel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/gprel.d
rename to gas/testsuite/gas/rx/gprel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/gprel.sm b/gas/testsuite/gas/rx/gprel.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/gprel.sm
rename to gas/testsuite/gas/rx/gprel.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/int.d b/gas/testsuite/gas/rx/int.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/int.d
rename to gas/testsuite/gas/rx/int.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/int.sm b/gas/testsuite/gas/rx/int.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/int.sm
rename to gas/testsuite/gas/rx/int.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/itof.d b/gas/testsuite/gas/rx/itof.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/itof.d
rename to gas/testsuite/gas/rx/itof.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/itof.sm b/gas/testsuite/gas/rx/itof.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/itof.sm
rename to gas/testsuite/gas/rx/itof.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/jmp.d b/gas/testsuite/gas/rx/jmp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/jmp.d
rename to gas/testsuite/gas/rx/jmp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/jmp.sm b/gas/testsuite/gas/rx/jmp.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/jmp.sm
rename to gas/testsuite/gas/rx/jmp.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/jsr.d b/gas/testsuite/gas/rx/jsr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/jsr.d
rename to gas/testsuite/gas/rx/jsr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/jsr.sm b/gas/testsuite/gas/rx/jsr.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/jsr.sm
rename to gas/testsuite/gas/rx/jsr.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/machi.d b/gas/testsuite/gas/rx/machi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/machi.d
rename to gas/testsuite/gas/rx/machi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/machi.sm b/gas/testsuite/gas/rx/machi.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/machi.sm
rename to gas/testsuite/gas/rx/machi.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/maclo.d b/gas/testsuite/gas/rx/maclo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/maclo.d
rename to gas/testsuite/gas/rx/maclo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/maclo.sm b/gas/testsuite/gas/rx/maclo.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/maclo.sm
rename to gas/testsuite/gas/rx/maclo.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/macros.inc b/gas/testsuite/gas/rx/macros.inc
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/macros.inc
rename to gas/testsuite/gas/rx/macros.inc
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/make-d b/gas/testsuite/gas/rx/make-d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/make-d
rename to gas/testsuite/gas/rx/make-d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/max.d b/gas/testsuite/gas/rx/max.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/max.d
rename to gas/testsuite/gas/rx/max.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/max.sm b/gas/testsuite/gas/rx/max.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/max.sm
rename to gas/testsuite/gas/rx/max.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/min.d b/gas/testsuite/gas/rx/min.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/min.d
rename to gas/testsuite/gas/rx/min.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/min.sm b/gas/testsuite/gas/rx/min.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/min.sm
rename to gas/testsuite/gas/rx/min.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mov.d b/gas/testsuite/gas/rx/mov.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mov.d
rename to gas/testsuite/gas/rx/mov.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mov.sm b/gas/testsuite/gas/rx/mov.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mov.sm
rename to gas/testsuite/gas/rx/mov.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/movu.d b/gas/testsuite/gas/rx/movu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/movu.d
rename to gas/testsuite/gas/rx/movu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/movu.sm b/gas/testsuite/gas/rx/movu.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/movu.sm
rename to gas/testsuite/gas/rx/movu.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mul.d b/gas/testsuite/gas/rx/mul.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mul.d
rename to gas/testsuite/gas/rx/mul.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mul.sm b/gas/testsuite/gas/rx/mul.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mul.sm
rename to gas/testsuite/gas/rx/mul.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mulhi.d b/gas/testsuite/gas/rx/mulhi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mulhi.d
rename to gas/testsuite/gas/rx/mulhi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mulhi.sm b/gas/testsuite/gas/rx/mulhi.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mulhi.sm
rename to gas/testsuite/gas/rx/mulhi.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mullo.d b/gas/testsuite/gas/rx/mullo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mullo.d
rename to gas/testsuite/gas/rx/mullo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mullo.sm b/gas/testsuite/gas/rx/mullo.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mullo.sm
rename to gas/testsuite/gas/rx/mullo.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfachi.d b/gas/testsuite/gas/rx/mvfachi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfachi.d
rename to gas/testsuite/gas/rx/mvfachi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfachi.sm b/gas/testsuite/gas/rx/mvfachi.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfachi.sm
rename to gas/testsuite/gas/rx/mvfachi.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfaclo.d b/gas/testsuite/gas/rx/mvfaclo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfaclo.d
rename to gas/testsuite/gas/rx/mvfaclo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfaclo.sm b/gas/testsuite/gas/rx/mvfaclo.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfaclo.sm
rename to gas/testsuite/gas/rx/mvfaclo.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfacmi.d b/gas/testsuite/gas/rx/mvfacmi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfacmi.d
rename to gas/testsuite/gas/rx/mvfacmi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfacmi.sm b/gas/testsuite/gas/rx/mvfacmi.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfacmi.sm
rename to gas/testsuite/gas/rx/mvfacmi.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfc.d b/gas/testsuite/gas/rx/mvfc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfc.d
rename to gas/testsuite/gas/rx/mvfc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfc.sm b/gas/testsuite/gas/rx/mvfc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfc.sm
rename to gas/testsuite/gas/rx/mvfc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfcp.d b/gas/testsuite/gas/rx/mvfcp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfcp.d
rename to gas/testsuite/gas/rx/mvfcp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvfcp.sm b/gas/testsuite/gas/rx/mvfcp.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvfcp.sm
rename to gas/testsuite/gas/rx/mvfcp.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtachi.d b/gas/testsuite/gas/rx/mvtachi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtachi.d
rename to gas/testsuite/gas/rx/mvtachi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtachi.sm b/gas/testsuite/gas/rx/mvtachi.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtachi.sm
rename to gas/testsuite/gas/rx/mvtachi.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtaclo.d b/gas/testsuite/gas/rx/mvtaclo.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtaclo.d
rename to gas/testsuite/gas/rx/mvtaclo.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtaclo.sm b/gas/testsuite/gas/rx/mvtaclo.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtaclo.sm
rename to gas/testsuite/gas/rx/mvtaclo.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtc.d b/gas/testsuite/gas/rx/mvtc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtc.d
rename to gas/testsuite/gas/rx/mvtc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtc.sm b/gas/testsuite/gas/rx/mvtc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtc.sm
rename to gas/testsuite/gas/rx/mvtc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtcp.d b/gas/testsuite/gas/rx/mvtcp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtcp.d
rename to gas/testsuite/gas/rx/mvtcp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/mvtcp.sm b/gas/testsuite/gas/rx/mvtcp.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/mvtcp.sm
rename to gas/testsuite/gas/rx/mvtcp.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/neg.d b/gas/testsuite/gas/rx/neg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/neg.d
rename to gas/testsuite/gas/rx/neg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/neg.sm b/gas/testsuite/gas/rx/neg.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/neg.sm
rename to gas/testsuite/gas/rx/neg.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/nop.d b/gas/testsuite/gas/rx/nop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/nop.d
rename to gas/testsuite/gas/rx/nop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/nop.sm b/gas/testsuite/gas/rx/nop.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/nop.sm
rename to gas/testsuite/gas/rx/nop.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/not.d b/gas/testsuite/gas/rx/not.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/not.d
rename to gas/testsuite/gas/rx/not.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/not.sm b/gas/testsuite/gas/rx/not.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/not.sm
rename to gas/testsuite/gas/rx/not.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/opecp.d b/gas/testsuite/gas/rx/opecp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/opecp.d
rename to gas/testsuite/gas/rx/opecp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/opecp.sm b/gas/testsuite/gas/rx/opecp.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/opecp.sm
rename to gas/testsuite/gas/rx/opecp.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/or.d b/gas/testsuite/gas/rx/or.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/or.d
rename to gas/testsuite/gas/rx/or.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/or.sm b/gas/testsuite/gas/rx/or.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/or.sm
rename to gas/testsuite/gas/rx/or.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/pop.d b/gas/testsuite/gas/rx/pop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/pop.d
rename to gas/testsuite/gas/rx/pop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/pop.sm b/gas/testsuite/gas/rx/pop.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/pop.sm
rename to gas/testsuite/gas/rx/pop.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/popc.d b/gas/testsuite/gas/rx/popc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/popc.d
rename to gas/testsuite/gas/rx/popc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/popc.sm b/gas/testsuite/gas/rx/popc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/popc.sm
rename to gas/testsuite/gas/rx/popc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/popm.d b/gas/testsuite/gas/rx/popm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/popm.d
rename to gas/testsuite/gas/rx/popm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/popm.sm b/gas/testsuite/gas/rx/popm.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/popm.sm
rename to gas/testsuite/gas/rx/popm.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/push.d b/gas/testsuite/gas/rx/push.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/push.d
rename to gas/testsuite/gas/rx/push.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/push.sm b/gas/testsuite/gas/rx/push.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/push.sm
rename to gas/testsuite/gas/rx/push.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/pushc.d b/gas/testsuite/gas/rx/pushc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/pushc.d
rename to gas/testsuite/gas/rx/pushc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/pushc.sm b/gas/testsuite/gas/rx/pushc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/pushc.sm
rename to gas/testsuite/gas/rx/pushc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/pushm.d b/gas/testsuite/gas/rx/pushm.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/pushm.d
rename to gas/testsuite/gas/rx/pushm.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/pushm.sm b/gas/testsuite/gas/rx/pushm.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/pushm.sm
rename to gas/testsuite/gas/rx/pushm.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/r-bcc.d b/gas/testsuite/gas/rx/r-bcc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/r-bcc.d
rename to gas/testsuite/gas/rx/r-bcc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/r-bcc.sm b/gas/testsuite/gas/rx/r-bcc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/r-bcc.sm
rename to gas/testsuite/gas/rx/r-bcc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/r-bra.d b/gas/testsuite/gas/rx/r-bra.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/r-bra.d
rename to gas/testsuite/gas/rx/r-bra.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/r-bra.sm b/gas/testsuite/gas/rx/r-bra.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/r-bra.sm
rename to gas/testsuite/gas/rx/r-bra.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/racw.d b/gas/testsuite/gas/rx/racw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/racw.d
rename to gas/testsuite/gas/rx/racw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/racw.sm b/gas/testsuite/gas/rx/racw.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/racw.sm
rename to gas/testsuite/gas/rx/racw.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/revl.d b/gas/testsuite/gas/rx/revl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/revl.d
rename to gas/testsuite/gas/rx/revl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/revl.sm b/gas/testsuite/gas/rx/revl.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/revl.sm
rename to gas/testsuite/gas/rx/revl.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/revw.d b/gas/testsuite/gas/rx/revw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/revw.d
rename to gas/testsuite/gas/rx/revw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/revw.sm b/gas/testsuite/gas/rx/revw.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/revw.sm
rename to gas/testsuite/gas/rx/revw.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rmpa.d b/gas/testsuite/gas/rx/rmpa.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rmpa.d
rename to gas/testsuite/gas/rx/rmpa.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rmpa.sm b/gas/testsuite/gas/rx/rmpa.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rmpa.sm
rename to gas/testsuite/gas/rx/rmpa.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rolc.d b/gas/testsuite/gas/rx/rolc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rolc.d
rename to gas/testsuite/gas/rx/rolc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rolc.sm b/gas/testsuite/gas/rx/rolc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rolc.sm
rename to gas/testsuite/gas/rx/rolc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rorc.d b/gas/testsuite/gas/rx/rorc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rorc.d
rename to gas/testsuite/gas/rx/rorc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rorc.sm b/gas/testsuite/gas/rx/rorc.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rorc.sm
rename to gas/testsuite/gas/rx/rorc.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rotl.d b/gas/testsuite/gas/rx/rotl.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rotl.d
rename to gas/testsuite/gas/rx/rotl.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rotl.sm b/gas/testsuite/gas/rx/rotl.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rotl.sm
rename to gas/testsuite/gas/rx/rotl.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rotr.d b/gas/testsuite/gas/rx/rotr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rotr.d
rename to gas/testsuite/gas/rx/rotr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rotr.sm b/gas/testsuite/gas/rx/rotr.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rotr.sm
rename to gas/testsuite/gas/rx/rotr.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/round.d b/gas/testsuite/gas/rx/round.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/round.d
rename to gas/testsuite/gas/rx/round.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/round.sm b/gas/testsuite/gas/rx/round.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/round.sm
rename to gas/testsuite/gas/rx/round.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rte.d b/gas/testsuite/gas/rx/rte.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rte.d
rename to gas/testsuite/gas/rx/rte.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rte.sm b/gas/testsuite/gas/rx/rte.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rte.sm
rename to gas/testsuite/gas/rx/rte.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rtfi.d b/gas/testsuite/gas/rx/rtfi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rtfi.d
rename to gas/testsuite/gas/rx/rtfi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rtfi.sm b/gas/testsuite/gas/rx/rtfi.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rtfi.sm
rename to gas/testsuite/gas/rx/rtfi.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rts.d b/gas/testsuite/gas/rx/rts.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rts.d
rename to gas/testsuite/gas/rx/rts.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rts.sm b/gas/testsuite/gas/rx/rts.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rts.sm
rename to gas/testsuite/gas/rx/rts.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rtsd.d b/gas/testsuite/gas/rx/rtsd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rtsd.d
rename to gas/testsuite/gas/rx/rtsd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rtsd.sm b/gas/testsuite/gas/rx/rtsd.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rtsd.sm
rename to gas/testsuite/gas/rx/rtsd.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-bad.l b/gas/testsuite/gas/rx/rx-asm-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-bad.l
rename to gas/testsuite/gas/rx/rx-asm-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-bad.s b/gas/testsuite/gas/rx/rx-asm-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-bad.s
rename to gas/testsuite/gas/rx/rx-asm-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-good.d b/gas/testsuite/gas/rx/rx-asm-good.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-good.d
rename to gas/testsuite/gas/rx/rx-asm-good.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-good.inc b/gas/testsuite/gas/rx/rx-asm-good.inc
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-good.inc
rename to gas/testsuite/gas/rx/rx-asm-good.inc
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-good.s b/gas/testsuite/gas/rx/rx-asm-good.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rx-asm-good.s
rename to gas/testsuite/gas/rx/rx-asm-good.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/rx.exp b/gas/testsuite/gas/rx/rx.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/rx.exp
rename to gas/testsuite/gas/rx/rx.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sat.d b/gas/testsuite/gas/rx/sat.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sat.d
rename to gas/testsuite/gas/rx/sat.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sat.sm b/gas/testsuite/gas/rx/sat.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sat.sm
rename to gas/testsuite/gas/rx/sat.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/satr.d b/gas/testsuite/gas/rx/satr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/satr.d
rename to gas/testsuite/gas/rx/satr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/satr.sm b/gas/testsuite/gas/rx/satr.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/satr.sm
rename to gas/testsuite/gas/rx/satr.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sbb.d b/gas/testsuite/gas/rx/sbb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sbb.d
rename to gas/testsuite/gas/rx/sbb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sbb.sm b/gas/testsuite/gas/rx/sbb.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sbb.sm
rename to gas/testsuite/gas/rx/sbb.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sccnd.d b/gas/testsuite/gas/rx/sccnd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sccnd.d
rename to gas/testsuite/gas/rx/sccnd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sccnd.sm b/gas/testsuite/gas/rx/sccnd.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sccnd.sm
rename to gas/testsuite/gas/rx/sccnd.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/scmpu.d b/gas/testsuite/gas/rx/scmpu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/scmpu.d
rename to gas/testsuite/gas/rx/scmpu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/scmpu.sm b/gas/testsuite/gas/rx/scmpu.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/scmpu.sm
rename to gas/testsuite/gas/rx/scmpu.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/setpsw.d b/gas/testsuite/gas/rx/setpsw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/setpsw.d
rename to gas/testsuite/gas/rx/setpsw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/setpsw.sm b/gas/testsuite/gas/rx/setpsw.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/setpsw.sm
rename to gas/testsuite/gas/rx/setpsw.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/shar.d b/gas/testsuite/gas/rx/shar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/shar.d
rename to gas/testsuite/gas/rx/shar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/shar.sm b/gas/testsuite/gas/rx/shar.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/shar.sm
rename to gas/testsuite/gas/rx/shar.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/shll.d b/gas/testsuite/gas/rx/shll.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/shll.d
rename to gas/testsuite/gas/rx/shll.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/shll.sm b/gas/testsuite/gas/rx/shll.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/shll.sm
rename to gas/testsuite/gas/rx/shll.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/shlr.d b/gas/testsuite/gas/rx/shlr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/shlr.d
rename to gas/testsuite/gas/rx/shlr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/shlr.sm b/gas/testsuite/gas/rx/shlr.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/shlr.sm
rename to gas/testsuite/gas/rx/shlr.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/smovb.d b/gas/testsuite/gas/rx/smovb.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/smovb.d
rename to gas/testsuite/gas/rx/smovb.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/smovb.sm b/gas/testsuite/gas/rx/smovb.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/smovb.sm
rename to gas/testsuite/gas/rx/smovb.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/smovf.d b/gas/testsuite/gas/rx/smovf.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/smovf.d
rename to gas/testsuite/gas/rx/smovf.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/smovf.sm b/gas/testsuite/gas/rx/smovf.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/smovf.sm
rename to gas/testsuite/gas/rx/smovf.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/smovu.d b/gas/testsuite/gas/rx/smovu.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/smovu.d
rename to gas/testsuite/gas/rx/smovu.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/smovu.sm b/gas/testsuite/gas/rx/smovu.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/smovu.sm
rename to gas/testsuite/gas/rx/smovu.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sstr.d b/gas/testsuite/gas/rx/sstr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sstr.d
rename to gas/testsuite/gas/rx/sstr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sstr.sm b/gas/testsuite/gas/rx/sstr.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sstr.sm
rename to gas/testsuite/gas/rx/sstr.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/stnz.d b/gas/testsuite/gas/rx/stnz.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/stnz.d
rename to gas/testsuite/gas/rx/stnz.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/stnz.sm b/gas/testsuite/gas/rx/stnz.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/stnz.sm
rename to gas/testsuite/gas/rx/stnz.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/stz.d b/gas/testsuite/gas/rx/stz.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/stz.d
rename to gas/testsuite/gas/rx/stz.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/stz.sm b/gas/testsuite/gas/rx/stz.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/stz.sm
rename to gas/testsuite/gas/rx/stz.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sub.d b/gas/testsuite/gas/rx/sub.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sub.d
rename to gas/testsuite/gas/rx/sub.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/sub.sm b/gas/testsuite/gas/rx/sub.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/sub.sm
rename to gas/testsuite/gas/rx/sub.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/suntil.d b/gas/testsuite/gas/rx/suntil.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/suntil.d
rename to gas/testsuite/gas/rx/suntil.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/suntil.sm b/gas/testsuite/gas/rx/suntil.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/suntil.sm
rename to gas/testsuite/gas/rx/suntil.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/swhile.d b/gas/testsuite/gas/rx/swhile.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/swhile.d
rename to gas/testsuite/gas/rx/swhile.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/swhile.sm b/gas/testsuite/gas/rx/swhile.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/swhile.sm
rename to gas/testsuite/gas/rx/swhile.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/tst.d b/gas/testsuite/gas/rx/tst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/tst.d
rename to gas/testsuite/gas/rx/tst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/tst.sm b/gas/testsuite/gas/rx/tst.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/tst.sm
rename to gas/testsuite/gas/rx/tst.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/wait.d b/gas/testsuite/gas/rx/wait.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/wait.d
rename to gas/testsuite/gas/rx/wait.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/wait.sm b/gas/testsuite/gas/rx/wait.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/wait.sm
rename to gas/testsuite/gas/rx/wait.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/xchg.d b/gas/testsuite/gas/rx/xchg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/xchg.d
rename to gas/testsuite/gas/rx/xchg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/xchg.sm b/gas/testsuite/gas/rx/xchg.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/xchg.sm
rename to gas/testsuite/gas/rx/xchg.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/xor.d b/gas/testsuite/gas/rx/xor.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/xor.d
rename to gas/testsuite/gas/rx/xor.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/rx/xor.sm b/gas/testsuite/gas/rx/xor.sm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/rx/xor.sm
rename to gas/testsuite/gas/rx/xor.sm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-g5.d
rename to gas/testsuite/gas/s390/esa-g5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-g5.s
rename to gas/testsuite/gas/s390/esa-g5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-operands.d b/gas/testsuite/gas/s390/esa-operands.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-operands.d
rename to gas/testsuite/gas/s390/esa-operands.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-operands.s b/gas/testsuite/gas/s390/esa-operands.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-operands.s
rename to gas/testsuite/gas/s390/esa-operands.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-reloc.d b/gas/testsuite/gas/s390/esa-reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-reloc.d
rename to gas/testsuite/gas/s390/esa-reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-reloc.s b/gas/testsuite/gas/s390/esa-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-reloc.s
rename to gas/testsuite/gas/s390/esa-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z9-109.d b/gas/testsuite/gas/s390/esa-z9-109.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z9-109.d
rename to gas/testsuite/gas/s390/esa-z9-109.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z9-109.s b/gas/testsuite/gas/s390/esa-z9-109.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z9-109.s
rename to gas/testsuite/gas/s390/esa-z9-109.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z900.d b/gas/testsuite/gas/s390/esa-z900.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z900.d
rename to gas/testsuite/gas/s390/esa-z900.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z900.s b/gas/testsuite/gas/s390/esa-z900.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z900.s
rename to gas/testsuite/gas/s390/esa-z900.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z990.d b/gas/testsuite/gas/s390/esa-z990.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z990.d
rename to gas/testsuite/gas/s390/esa-z990.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z990.s b/gas/testsuite/gas/s390/esa-z990.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/esa-z990.s
rename to gas/testsuite/gas/s390/esa-z990.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/s390.exp b/gas/testsuite/gas/s390/s390.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/s390.exp
rename to gas/testsuite/gas/s390/s390.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-operands.d b/gas/testsuite/gas/s390/zarch-operands.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-operands.d
rename to gas/testsuite/gas/s390/zarch-operands.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-operands.s b/gas/testsuite/gas/s390/zarch-operands.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-operands.s
rename to gas/testsuite/gas/s390/zarch-operands.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-reloc.d b/gas/testsuite/gas/s390/zarch-reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-reloc.d
rename to gas/testsuite/gas/s390/zarch-reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-reloc.s b/gas/testsuite/gas/s390/zarch-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-reloc.s
rename to gas/testsuite/gas/s390/zarch-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z10.d
rename to gas/testsuite/gas/s390/zarch-z10.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z10.s b/gas/testsuite/gas/s390/zarch-z10.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z10.s
rename to gas/testsuite/gas/s390/zarch-z10.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z196.d b/gas/testsuite/gas/s390/zarch-z196.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z196.d
rename to gas/testsuite/gas/s390/zarch-z196.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z196.s b/gas/testsuite/gas/s390/zarch-z196.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z196.s
rename to gas/testsuite/gas/s390/zarch-z196.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-109.d b/gas/testsuite/gas/s390/zarch-z9-109.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-109.d
rename to gas/testsuite/gas/s390/zarch-z9-109.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-109.s b/gas/testsuite/gas/s390/zarch-z9-109.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-109.s
rename to gas/testsuite/gas/s390/zarch-z9-109.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-ec.d b/gas/testsuite/gas/s390/zarch-z9-ec.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-ec.d
rename to gas/testsuite/gas/s390/zarch-z9-ec.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-ec.s b/gas/testsuite/gas/s390/zarch-z9-ec.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z9-ec.s
rename to gas/testsuite/gas/s390/zarch-z9-ec.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z900.d b/gas/testsuite/gas/s390/zarch-z900.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z900.d
rename to gas/testsuite/gas/s390/zarch-z900.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z900.s b/gas/testsuite/gas/s390/zarch-z900.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z900.s
rename to gas/testsuite/gas/s390/zarch-z900.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z990.d b/gas/testsuite/gas/s390/zarch-z990.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z990.d
rename to gas/testsuite/gas/s390/zarch-z990.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z990.s b/gas/testsuite/gas/s390/zarch-z990.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/s390/zarch-z990.s
rename to gas/testsuite/gas/s390/zarch-z990.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/addi.d b/gas/testsuite/gas/score/addi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/addi.d
rename to gas/testsuite/gas/score/addi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/addi.s b/gas/testsuite/gas/score/addi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/addi.s
rename to gas/testsuite/gas/score/addi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/arith_32-lt.d b/gas/testsuite/gas/score/arith_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/arith_32-lt.d
rename to gas/testsuite/gas/score/arith_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/arith_32.d b/gas/testsuite/gas/score/arith_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/arith_32.d
rename to gas/testsuite/gas/score/arith_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/arith_32.s b/gas/testsuite/gas/score/arith_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/arith_32.s
rename to gas/testsuite/gas/score/arith_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/b.d b/gas/testsuite/gas/score/b.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/b.d
rename to gas/testsuite/gas/score/b.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/b.s b/gas/testsuite/gas/score/b.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/b.s
rename to gas/testsuite/gas/score/b.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/bit_32-lt.d b/gas/testsuite/gas/score/bit_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/bit_32-lt.d
rename to gas/testsuite/gas/score/bit_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/bit_32.d b/gas/testsuite/gas/score/bit_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/bit_32.d
rename to gas/testsuite/gas/score/bit_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/bit_32.s b/gas/testsuite/gas/score/bit_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/bit_32.s
rename to gas/testsuite/gas/score/bit_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/bittst.d b/gas/testsuite/gas/score/bittst.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/bittst.d
rename to gas/testsuite/gas/score/bittst.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/bittst.s b/gas/testsuite/gas/score/bittst.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/bittst.s
rename to gas/testsuite/gas/score/bittst.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/br.d b/gas/testsuite/gas/score/br.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/br.d
rename to gas/testsuite/gas/score/br.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/br.s b/gas/testsuite/gas/score/br.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/br.s
rename to gas/testsuite/gas/score/br.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/branch_32-lt.d b/gas/testsuite/gas/score/branch_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/branch_32-lt.d
rename to gas/testsuite/gas/score/branch_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/branch_32.d b/gas/testsuite/gas/score/branch_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/branch_32.d
rename to gas/testsuite/gas/score/branch_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/branch_32.s b/gas/testsuite/gas/score/branch_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/branch_32.s
rename to gas/testsuite/gas/score/branch_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/cmp_32-lt.d b/gas/testsuite/gas/score/cmp_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/cmp_32-lt.d
rename to gas/testsuite/gas/score/cmp_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/cmp_32.d b/gas/testsuite/gas/score/cmp_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/cmp_32.d
rename to gas/testsuite/gas/score/cmp_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/cmp_32.s b/gas/testsuite/gas/score/cmp_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/cmp_32.s
rename to gas/testsuite/gas/score/cmp_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/ldi.d b/gas/testsuite/gas/score/ldi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/ldi.d
rename to gas/testsuite/gas/score/ldi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/ldi.s b/gas/testsuite/gas/score/ldi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/ldi.s
rename to gas/testsuite/gas/score/ldi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/load_store_32-lt.d b/gas/testsuite/gas/score/load_store_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/load_store_32-lt.d
rename to gas/testsuite/gas/score/load_store_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/load_store_32.d b/gas/testsuite/gas/score/load_store_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/load_store_32.d
rename to gas/testsuite/gas/score/load_store_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/load_store_32.s b/gas/testsuite/gas/score/load_store_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/load_store_32.s
rename to gas/testsuite/gas/score/load_store_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/logical_32-lt.d b/gas/testsuite/gas/score/logical_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/logical_32-lt.d
rename to gas/testsuite/gas/score/logical_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/logical_32.d b/gas/testsuite/gas/score/logical_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/logical_32.d
rename to gas/testsuite/gas/score/logical_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/logical_32.s b/gas/testsuite/gas/score/logical_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/logical_32.s
rename to gas/testsuite/gas/score/logical_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16.d b/gas/testsuite/gas/score/ls32ls16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16.d
rename to gas/testsuite/gas/score/ls32ls16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16.s b/gas/testsuite/gas/score/ls32ls16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16.s
rename to gas/testsuite/gas/score/ls32ls16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16p.d b/gas/testsuite/gas/score/ls32ls16p.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16p.d
rename to gas/testsuite/gas/score/ls32ls16p.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16p.s b/gas/testsuite/gas/score/ls32ls16p.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/ls32ls16p.s
rename to gas/testsuite/gas/score/ls32ls16p.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/move.d b/gas/testsuite/gas/score/move.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/move.d
rename to gas/testsuite/gas/score/move.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/move.s b/gas/testsuite/gas/score/move.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/move.s
rename to gas/testsuite/gas/score/move.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/mv_32-lt.d b/gas/testsuite/gas/score/mv_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/mv_32-lt.d
rename to gas/testsuite/gas/score/mv_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/mv_32.d b/gas/testsuite/gas/score/mv_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/mv_32.d
rename to gas/testsuite/gas/score/mv_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/mv_32.s b/gas/testsuite/gas/score/mv_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/mv_32.s
rename to gas/testsuite/gas/score/mv_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/nop.d b/gas/testsuite/gas/score/nop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/nop.d
rename to gas/testsuite/gas/score/nop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/nop.s b/gas/testsuite/gas/score/nop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/nop.s
rename to gas/testsuite/gas/score/nop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/postlw.d b/gas/testsuite/gas/score/postlw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/postlw.d
rename to gas/testsuite/gas/score/postlw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/postlw.s b/gas/testsuite/gas/score/postlw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/postlw.s
rename to gas/testsuite/gas/score/postlw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/presw.d b/gas/testsuite/gas/score/presw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/presw.d
rename to gas/testsuite/gas/score/presw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/presw.s b/gas/testsuite/gas/score/presw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/presw.s
rename to gas/testsuite/gas/score/presw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA.d b/gas/testsuite/gas/score/rD_rA.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA.d
rename to gas/testsuite/gas/score/rD_rA.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA.s b/gas/testsuite/gas/score/rD_rA.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA.s
rename to gas/testsuite/gas/score/rD_rA.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_BN.d b/gas/testsuite/gas/score/rD_rA_BN.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_BN.d
rename to gas/testsuite/gas/score/rD_rA_BN.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_BN.s b/gas/testsuite/gas/score/rD_rA_BN.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_BN.s
rename to gas/testsuite/gas/score/rD_rA_BN.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_rB.d b/gas/testsuite/gas/score/rD_rA_rB.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_rB.d
rename to gas/testsuite/gas/score/rD_rA_rB.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_rB.s b/gas/testsuite/gas/score/rD_rA_rB.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/rD_rA_rB.s
rename to gas/testsuite/gas/score/rD_rA_rB.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/relax.exp b/gas/testsuite/gas/score/relax.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/relax.exp
rename to gas/testsuite/gas/score/relax.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/relax_32.exp b/gas/testsuite/gas/score/relax_32.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/relax_32.exp
rename to gas/testsuite/gas/score/relax_32.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/relaxation_macro.h b/gas/testsuite/gas/score/relaxation_macro.h
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/relaxation_macro.h
rename to gas/testsuite/gas/score/relaxation_macro.h
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/shift_32-lt.d b/gas/testsuite/gas/score/shift_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/shift_32-lt.d
rename to gas/testsuite/gas/score/shift_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/shift_32.d b/gas/testsuite/gas/score/shift_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/shift_32.d
rename to gas/testsuite/gas/score/shift_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/shift_32.s b/gas/testsuite/gas/score/shift_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/shift_32.s
rename to gas/testsuite/gas/score/shift_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/syscontrol_32-lt.d b/gas/testsuite/gas/score/syscontrol_32-lt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/syscontrol_32-lt.d
rename to gas/testsuite/gas/score/syscontrol_32-lt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/syscontrol_32.d b/gas/testsuite/gas/score/syscontrol_32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/syscontrol_32.d
rename to gas/testsuite/gas/score/syscontrol_32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/syscontrol_32.s b/gas/testsuite/gas/score/syscontrol_32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/syscontrol_32.s
rename to gas/testsuite/gas/score/syscontrol_32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/tcond.d b/gas/testsuite/gas/score/tcond.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/tcond.d
rename to gas/testsuite/gas/score/tcond.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/score/tcond.s b/gas/testsuite/gas/score/tcond.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/score/tcond.s
rename to gas/testsuite/gas/score/tcond.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/arch.exp b/gas/testsuite/gas/sh/arch/arch.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/arch.exp
rename to gas/testsuite/gas/sh/arch/arch.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/arch_expected.txt b/gas/testsuite/gas/sh/arch/arch_expected.txt
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/arch_expected.txt
rename to gas/testsuite/gas/sh/arch/arch_expected.txt
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh-dsp.s b/gas/testsuite/gas/sh/arch/sh-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh-dsp.s
rename to gas/testsuite/gas/sh/arch/sh-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh.s b/gas/testsuite/gas/sh/arch/sh.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh.s
rename to gas/testsuite/gas/sh/arch/sh.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2.s b/gas/testsuite/gas/sh/arch/sh2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2.s
rename to gas/testsuite/gas/sh/arch/sh2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s b/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s
rename to gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s b/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
rename to gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-nofpu.s b/gas/testsuite/gas/sh/arch/sh2a-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-nofpu.s
rename to gas/testsuite/gas/sh/arch/sh2a-nofpu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-or-sh3e.s b/gas/testsuite/gas/sh/arch/sh2a-or-sh3e.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-or-sh3e.s
rename to gas/testsuite/gas/sh/arch/sh2a-or-sh3e.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-or-sh4.s b/gas/testsuite/gas/sh/arch/sh2a-or-sh4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a-or-sh4.s
rename to gas/testsuite/gas/sh/arch/sh2a-or-sh4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a.s b/gas/testsuite/gas/sh/arch/sh2a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2a.s
rename to gas/testsuite/gas/sh/arch/sh2a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2e.s b/gas/testsuite/gas/sh/arch/sh2e.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh2e.s
rename to gas/testsuite/gas/sh/arch/sh2e.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3-dsp.s b/gas/testsuite/gas/sh/arch/sh3-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3-dsp.s
rename to gas/testsuite/gas/sh/arch/sh3-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3-nommu.s b/gas/testsuite/gas/sh/arch/sh3-nommu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3-nommu.s
rename to gas/testsuite/gas/sh/arch/sh3-nommu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3.s b/gas/testsuite/gas/sh/arch/sh3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3.s
rename to gas/testsuite/gas/sh/arch/sh3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3e.s b/gas/testsuite/gas/sh/arch/sh3e.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh3e.s
rename to gas/testsuite/gas/sh/arch/sh3e.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4-nofpu.s b/gas/testsuite/gas/sh/arch/sh4-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4-nofpu.s
rename to gas/testsuite/gas/sh/arch/sh4-nofpu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4-nommu-nofpu.s b/gas/testsuite/gas/sh/arch/sh4-nommu-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4-nommu-nofpu.s
rename to gas/testsuite/gas/sh/arch/sh4-nommu-nofpu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4.s b/gas/testsuite/gas/sh/arch/sh4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4.s
rename to gas/testsuite/gas/sh/arch/sh4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4a-nofpu.s b/gas/testsuite/gas/sh/arch/sh4a-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4a-nofpu.s
rename to gas/testsuite/gas/sh/arch/sh4a-nofpu.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4a.s b/gas/testsuite/gas/sh/arch/sh4a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4a.s
rename to gas/testsuite/gas/sh/arch/sh4a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4al-dsp.s b/gas/testsuite/gas/sh/arch/sh4al-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/arch/sh4al-dsp.s
rename to gas/testsuite/gas/sh/arch/sh4al-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/basic.exp b/gas/testsuite/gas/sh/basic.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/basic.exp
rename to gas/testsuite/gas/sh/basic.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/dsp.d b/gas/testsuite/gas/sh/dsp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/dsp.d
rename to gas/testsuite/gas/sh/dsp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/dsp.s b/gas/testsuite/gas/sh/dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/dsp.s
rename to gas/testsuite/gas/sh/dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-1.s b/gas/testsuite/gas/sh/err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-1.s
rename to gas/testsuite/gas/sh/err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-at.s b/gas/testsuite/gas/sh/err-at.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-at.s
rename to gas/testsuite/gas/sh/err-at.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-be.s b/gas/testsuite/gas/sh/err-be.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-be.s
rename to gas/testsuite/gas/sh/err-be.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-le.s b/gas/testsuite/gas/sh/err-le.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-le.s
rename to gas/testsuite/gas/sh/err-le.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-mova.s b/gas/testsuite/gas/sh/err-mova.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-mova.s
rename to gas/testsuite/gas/sh/err-mova.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-sh4a-fp.s b/gas/testsuite/gas/sh/err-sh4a-fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-sh4a-fp.s
rename to gas/testsuite/gas/sh/err-sh4a-fp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-sh4a.s b/gas/testsuite/gas/sh/err-sh4a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-sh4a.s
rename to gas/testsuite/gas/sh/err-sh4a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err-sh4al-dsp.s b/gas/testsuite/gas/sh/err-sh4al-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err-sh4al-dsp.s
rename to gas/testsuite/gas/sh/err-sh4al-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/err.exp b/gas/testsuite/gas/sh/err.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/err.exp
rename to gas/testsuite/gas/sh/err.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/fdpic.d b/gas/testsuite/gas/sh/fdpic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/fdpic.d
rename to gas/testsuite/gas/sh/fdpic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/fdpic.s b/gas/testsuite/gas/sh/fdpic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/fdpic.s
rename to gas/testsuite/gas/sh/fdpic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/fp.s b/gas/testsuite/gas/sh/fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/fp.s
rename to gas/testsuite/gas/sh/fp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel-coff.d b/gas/testsuite/gas/sh/pcrel-coff.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel-coff.d
rename to gas/testsuite/gas/sh/pcrel-coff.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel-coff.s b/gas/testsuite/gas/sh/pcrel-coff.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel-coff.s
rename to gas/testsuite/gas/sh/pcrel-coff.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel-hms.d b/gas/testsuite/gas/sh/pcrel-hms.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel-hms.d
rename to gas/testsuite/gas/sh/pcrel-hms.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel.d b/gas/testsuite/gas/sh/pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel.d
rename to gas/testsuite/gas/sh/pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel.l b/gas/testsuite/gas/sh/pcrel.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel.l
rename to gas/testsuite/gas/sh/pcrel.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel.s b/gas/testsuite/gas/sh/pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel.s
rename to gas/testsuite/gas/sh/pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel2.d b/gas/testsuite/gas/sh/pcrel2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel2.d
rename to gas/testsuite/gas/sh/pcrel2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel2.s b/gas/testsuite/gas/sh/pcrel2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pcrel2.s
rename to gas/testsuite/gas/sh/pcrel2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pic.d b/gas/testsuite/gas/sh/pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pic.d
rename to gas/testsuite/gas/sh/pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/pic.s b/gas/testsuite/gas/sh/pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/pic.s
rename to gas/testsuite/gas/sh/pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/reg-prefix.d b/gas/testsuite/gas/sh/reg-prefix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/reg-prefix.d
rename to gas/testsuite/gas/sh/reg-prefix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/reg-prefix.s b/gas/testsuite/gas/sh/reg-prefix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/reg-prefix.s
rename to gas/testsuite/gas/sh/reg-prefix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/renesas-1.d b/gas/testsuite/gas/sh/renesas-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/renesas-1.d
rename to gas/testsuite/gas/sh/renesas-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/renesas-1.s b/gas/testsuite/gas/sh/renesas-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/renesas-1.s
rename to gas/testsuite/gas/sh/renesas-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a-pic.d b/gas/testsuite/gas/sh/sh2a-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a-pic.d
rename to gas/testsuite/gas/sh/sh2a-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a-pic.s b/gas/testsuite/gas/sh/sh2a-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a-pic.s
rename to gas/testsuite/gas/sh/sh2a-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a.d b/gas/testsuite/gas/sh/sh2a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a.d
rename to gas/testsuite/gas/sh/sh2a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a.s b/gas/testsuite/gas/sh/sh2a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh2a.s
rename to gas/testsuite/gas/sh/sh2a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-dsp.d b/gas/testsuite/gas/sh/sh4a-dsp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-dsp.d
rename to gas/testsuite/gas/sh/sh4a-dsp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-dsp.s b/gas/testsuite/gas/sh/sh4a-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-dsp.s
rename to gas/testsuite/gas/sh/sh4a-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-fp.d b/gas/testsuite/gas/sh/sh4a-fp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-fp.d
rename to gas/testsuite/gas/sh/sh4a-fp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-fp.s b/gas/testsuite/gas/sh/sh4a-fp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a-fp.s
rename to gas/testsuite/gas/sh/sh4a-fp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a.d b/gas/testsuite/gas/sh/sh4a.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a.d
rename to gas/testsuite/gas/sh/sh4a.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a.s b/gas/testsuite/gas/sh/sh4a.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4a.s
rename to gas/testsuite/gas/sh/sh4a.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4al-dsp.d b/gas/testsuite/gas/sh/sh4al-dsp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4al-dsp.d
rename to gas/testsuite/gas/sh/sh4al-dsp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh4al-dsp.s b/gas/testsuite/gas/sh/sh4al-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh4al-dsp.s
rename to gas/testsuite/gas/sh/sh4al-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-32.d b/gas/testsuite/gas/sh/sh64/abi-32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-32.d
rename to gas/testsuite/gas/sh/sh64/abi-32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-32.s b/gas/testsuite/gas/sh/sh64/abi-32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-32.s
rename to gas/testsuite/gas/sh/sh64/abi-32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-64.d b/gas/testsuite/gas/sh/sh64/abi-64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-64.d
rename to gas/testsuite/gas/sh/sh64/abi-64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-64.s b/gas/testsuite/gas/sh/sh64/abi-64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/abi-64.s
rename to gas/testsuite/gas/sh/sh64/abi-64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/basic-1.d b/gas/testsuite/gas/sh/sh64/basic-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/basic-1.d
rename to gas/testsuite/gas/sh/sh64/basic-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/basic-1.s b/gas/testsuite/gas/sh/sh64/basic-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/basic-1.s
rename to gas/testsuite/gas/sh/sh64/basic-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/case-1.d b/gas/testsuite/gas/sh/sh64/case-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/case-1.d
rename to gas/testsuite/gas/sh/sh64/case-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/case-1.s b/gas/testsuite/gas/sh/sh64/case-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/case-1.s
rename to gas/testsuite/gas/sh/sh64/case-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/case-noexp-1.d b/gas/testsuite/gas/sh/sh64/case-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/case-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/case-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange1-1.d b/gas/testsuite/gas/sh/sh64/crange1-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange1-1.d
rename to gas/testsuite/gas/sh/sh64/crange1-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange1-2.d b/gas/testsuite/gas/sh/sh64/crange1-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange1-2.d
rename to gas/testsuite/gas/sh/sh64/crange1-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange1.s b/gas/testsuite/gas/sh/sh64/crange1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange1.s
rename to gas/testsuite/gas/sh/sh64/crange1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2-1.d b/gas/testsuite/gas/sh/sh64/crange2-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2-1.d
rename to gas/testsuite/gas/sh/sh64/crange2-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2-2.d b/gas/testsuite/gas/sh/sh64/crange2-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2-2.d
rename to gas/testsuite/gas/sh/sh64/crange2-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2-noexp-1.d b/gas/testsuite/gas/sh/sh64/crange2-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/crange2-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2.s b/gas/testsuite/gas/sh/sh64/crange2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange2.s
rename to gas/testsuite/gas/sh/sh64/crange2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange3-1.d b/gas/testsuite/gas/sh/sh64/crange3-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange3-1.d
rename to gas/testsuite/gas/sh/sh64/crange3-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange3.s b/gas/testsuite/gas/sh/sh64/crange3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange3.s
rename to gas/testsuite/gas/sh/sh64/crange3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange4-1.d b/gas/testsuite/gas/sh/sh64/crange4-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange4-1.d
rename to gas/testsuite/gas/sh/sh64/crange4-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange4.s b/gas/testsuite/gas/sh/sh64/crange4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange4.s
rename to gas/testsuite/gas/sh/sh64/crange4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange5-1.d b/gas/testsuite/gas/sh/sh64/crange5-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange5-1.d
rename to gas/testsuite/gas/sh/sh64/crange5-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange5.s b/gas/testsuite/gas/sh/sh64/crange5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/crange5.s
rename to gas/testsuite/gas/sh/sh64/crange5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-1.d b/gas/testsuite/gas/sh/sh64/creg-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-1.d
rename to gas/testsuite/gas/sh/sh64/creg-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-1.s b/gas/testsuite/gas/sh/sh64/creg-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-1.s
rename to gas/testsuite/gas/sh/sh64/creg-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-2.d b/gas/testsuite/gas/sh/sh64/creg-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-2.d
rename to gas/testsuite/gas/sh/sh64/creg-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-2.s b/gas/testsuite/gas/sh/sh64/creg-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/creg-2.s
rename to gas/testsuite/gas/sh/sh64/creg-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-1.s b/gas/testsuite/gas/sh/sh64/datal-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-1.s
rename to gas/testsuite/gas/sh/sh64/datal-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-2.d b/gas/testsuite/gas/sh/sh64/datal-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-2.d
rename to gas/testsuite/gas/sh/sh64/datal-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-2.s b/gas/testsuite/gas/sh/sh64/datal-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-2.s
rename to gas/testsuite/gas/sh/sh64/datal-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-3.s b/gas/testsuite/gas/sh/sh64/datal-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal-3.s
rename to gas/testsuite/gas/sh/sh64/datal-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal32-1.d b/gas/testsuite/gas/sh/sh64/datal32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal32-1.d
rename to gas/testsuite/gas/sh/sh64/datal32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal32-3.d b/gas/testsuite/gas/sh/sh64/datal32-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal32-3.d
rename to gas/testsuite/gas/sh/sh64/datal32-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal64-1.d b/gas/testsuite/gas/sh/sh64/datal64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal64-1.d
rename to gas/testsuite/gas/sh/sh64/datal64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal64-3.d b/gas/testsuite/gas/sh/sh64/datal64-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/datal64-3.d
rename to gas/testsuite/gas/sh/sh64/datal64-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/eh-1.d b/gas/testsuite/gas/sh/sh64/eh-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/eh-1.d
rename to gas/testsuite/gas/sh/sh64/eh-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/eh-1.s b/gas/testsuite/gas/sh/sh64/eh-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/eh-1.s
rename to gas/testsuite/gas/sh/sh64/eh-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-1.d b/gas/testsuite/gas/sh/sh64/endian-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-1.d
rename to gas/testsuite/gas/sh/sh64/endian-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-1.s b/gas/testsuite/gas/sh/sh64/endian-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-1.s
rename to gas/testsuite/gas/sh/sh64/endian-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-2.d b/gas/testsuite/gas/sh/sh64/endian-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-2.d
rename to gas/testsuite/gas/sh/sh64/endian-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-2.s b/gas/testsuite/gas/sh/sh64/endian-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/endian-2.s
rename to gas/testsuite/gas/sh/sh64/endian-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-1.s b/gas/testsuite/gas/sh/sh64/err-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-1.s
rename to gas/testsuite/gas/sh/sh64/err-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-2.s b/gas/testsuite/gas/sh/sh64/err-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-2.s
rename to gas/testsuite/gas/sh/sh64/err-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-3.s b/gas/testsuite/gas/sh/sh64/err-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-3.s
rename to gas/testsuite/gas/sh/sh64/err-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-4.s b/gas/testsuite/gas/sh/sh64/err-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-4.s
rename to gas/testsuite/gas/sh/sh64/err-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-abi-32.s b/gas/testsuite/gas/sh/sh64/err-abi-32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-abi-32.s
rename to gas/testsuite/gas/sh/sh64/err-abi-32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-abi-64.s b/gas/testsuite/gas/sh/sh64/err-abi-64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-abi-64.s
rename to gas/testsuite/gas/sh/sh64/err-abi-64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-dsp.s b/gas/testsuite/gas/sh/sh64/err-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-dsp.s
rename to gas/testsuite/gas/sh/sh64/err-dsp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-movi-noexp-1.s b/gas/testsuite/gas/sh/sh64/err-movi-noexp-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-movi-noexp-1.s
rename to gas/testsuite/gas/sh/sh64/err-movi-noexp-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s b/gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s
rename to gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt-1.s b/gas/testsuite/gas/sh/sh64/err-pt-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt-1.s
rename to gas/testsuite/gas/sh/sh64/err-pt-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt32-cmd1.s b/gas/testsuite/gas/sh/sh64/err-pt32-cmd1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt32-cmd1.s
rename to gas/testsuite/gas/sh/sh64/err-pt32-cmd1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt32-cmd2.s b/gas/testsuite/gas/sh/sh64/err-pt32-cmd2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt32-cmd2.s
rename to gas/testsuite/gas/sh/sh64/err-pt32-cmd2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt32-cmd3.s b/gas/testsuite/gas/sh/sh64/err-pt32-cmd3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-pt32-cmd3.s
rename to gas/testsuite/gas/sh/sh64/err-pt32-cmd3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-ptb-1.s b/gas/testsuite/gas/sh/sh64/err-ptb-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-ptb-1.s
rename to gas/testsuite/gas/sh/sh64/err-ptb-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-ptb-2.s b/gas/testsuite/gas/sh/sh64/err-ptb-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err-ptb-2.s
rename to gas/testsuite/gas/sh/sh64/err-ptb-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err.exp b/gas/testsuite/gas/sh/sh64/err.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/err.exp
rename to gas/testsuite/gas/sh/sh64/err.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr1.s b/gas/testsuite/gas/sh/sh64/immexpr1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr1.s
rename to gas/testsuite/gas/sh/sh64/immexpr1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr2.s b/gas/testsuite/gas/sh/sh64/immexpr2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr2.s
rename to gas/testsuite/gas/sh/sh64/immexpr2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr32-1.d b/gas/testsuite/gas/sh/sh64/immexpr32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr32-1.d
rename to gas/testsuite/gas/sh/sh64/immexpr32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr32-2.d b/gas/testsuite/gas/sh/sh64/immexpr32-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr32-2.d
rename to gas/testsuite/gas/sh/sh64/immexpr32-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr64-1.d b/gas/testsuite/gas/sh/sh64/immexpr64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr64-1.d
rename to gas/testsuite/gas/sh/sh64/immexpr64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr64-2.d b/gas/testsuite/gas/sh/sh64/immexpr64-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/immexpr64-2.d
rename to gas/testsuite/gas/sh/sh64/immexpr64-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/lineno.d b/gas/testsuite/gas/sh/sh64/lineno.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/lineno.d
rename to gas/testsuite/gas/sh/sh64/lineno.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/lineno.s b/gas/testsuite/gas/sh/sh64/lineno.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/lineno.s
rename to gas/testsuite/gas/sh/sh64/lineno.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/localcom-1.d b/gas/testsuite/gas/sh/sh64/localcom-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/localcom-1.d
rename to gas/testsuite/gas/sh/sh64/localcom-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/localcom-1.s b/gas/testsuite/gas/sh/sh64/localcom-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/localcom-1.s
rename to gas/testsuite/gas/sh/sh64/localcom-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/mix-1.d b/gas/testsuite/gas/sh/sh64/mix-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/mix-1.d
rename to gas/testsuite/gas/sh/sh64/mix-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/mix-1.s b/gas/testsuite/gas/sh/sh64/mix-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/mix-1.s
rename to gas/testsuite/gas/sh/sh64/mix-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/mix-noexp-1.d b/gas/testsuite/gas/sh/sh64/mix-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/mix-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/mix-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-1.s b/gas/testsuite/gas/sh/sh64/movi-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-1.s
rename to gas/testsuite/gas/sh/sh64/movi-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-2.s b/gas/testsuite/gas/sh/sh64/movi-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-2.s
rename to gas/testsuite/gas/sh/sh64/movi-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-3.d b/gas/testsuite/gas/sh/sh64/movi-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-3.d
rename to gas/testsuite/gas/sh/sh64/movi-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-3.s b/gas/testsuite/gas/sh/sh64/movi-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi-3.s
rename to gas/testsuite/gas/sh/sh64/movi-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi32-1.d b/gas/testsuite/gas/sh/sh64/movi32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi32-1.d
rename to gas/testsuite/gas/sh/sh64/movi32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi32-2.d b/gas/testsuite/gas/sh/sh64/movi32-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi32-2.d
rename to gas/testsuite/gas/sh/sh64/movi32-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi32-noexp-2.d b/gas/testsuite/gas/sh/sh64/movi32-noexp-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi32-noexp-2.d
rename to gas/testsuite/gas/sh/sh64/movi32-noexp-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-1.d b/gas/testsuite/gas/sh/sh64/movi64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-1.d
rename to gas/testsuite/gas/sh/sh64/movi64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-2.d b/gas/testsuite/gas/sh/sh64/movi64-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-2.d
rename to gas/testsuite/gas/sh/sh64/movi64-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-2.s b/gas/testsuite/gas/sh/sh64/movi64-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-2.s
rename to gas/testsuite/gas/sh/sh64/movi64-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-3.d b/gas/testsuite/gas/sh/sh64/movi64-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-3.d
rename to gas/testsuite/gas/sh/sh64/movi64-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-noexp-2.d b/gas/testsuite/gas/sh/sh64/movi64-noexp-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/movi64-noexp-2.d
rename to gas/testsuite/gas/sh/sh64/movi64-noexp-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-1.d b/gas/testsuite/gas/sh/sh64/pt-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-1.d
rename to gas/testsuite/gas/sh/sh64/pt-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-1.s b/gas/testsuite/gas/sh/sh64/pt-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-1.s
rename to gas/testsuite/gas/sh/sh64/pt-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-2.s b/gas/testsuite/gas/sh/sh64/pt-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-2.s
rename to gas/testsuite/gas/sh/sh64/pt-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-noexp-1.d b/gas/testsuite/gas/sh/sh64/pt-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/pt-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt32-1.d b/gas/testsuite/gas/sh/sh64/pt32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt32-1.d
rename to gas/testsuite/gas/sh/sh64/pt32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d b/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d
rename to gas/testsuite/gas/sh/sh64/pt32-noexp-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-1.d b/gas/testsuite/gas/sh/sh64/pt64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-1.d
rename to gas/testsuite/gas/sh/sh64/pt64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-32-1.d b/gas/testsuite/gas/sh/sh64/pt64-32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-32-1.d
rename to gas/testsuite/gas/sh/sh64/pt64-32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-32-2.d b/gas/testsuite/gas/sh/sh64/pt64-32-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-32-2.d
rename to gas/testsuite/gas/sh/sh64/pt64-32-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d b/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d
rename to gas/testsuite/gas/sh/sh64/pt64-noexp-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc-1.s b/gas/testsuite/gas/sh/sh64/ptc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc-1.s
rename to gas/testsuite/gas/sh/sh64/ptc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc32-1.d b/gas/testsuite/gas/sh/sh64/ptc32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc32-1.d
rename to gas/testsuite/gas/sh/sh64/ptc32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc64-1.d b/gas/testsuite/gas/sh/sh64/ptc64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc64-1.d
rename to gas/testsuite/gas/sh/sh64/ptc64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc64-32-1.d b/gas/testsuite/gas/sh/sh64/ptc64-32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc64-32-1.d
rename to gas/testsuite/gas/sh/sh64/ptc64-32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext-1.s b/gas/testsuite/gas/sh/sh64/ptext-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext-1.s
rename to gas/testsuite/gas/sh/sh64/ptext-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext32-1.d b/gas/testsuite/gas/sh/sh64/ptext32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext32-1.d
rename to gas/testsuite/gas/sh/sh64/ptext32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext64-1.d b/gas/testsuite/gas/sh/sh64/ptext64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext64-1.d
rename to gas/testsuite/gas/sh/sh64/ptext64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext64-32-1.d b/gas/testsuite/gas/sh/sh64/ptext64-32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext64-32-1.d
rename to gas/testsuite/gas/sh/sh64/ptext64-32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d
rename to gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-1.s b/gas/testsuite/gas/sh/sh64/rel-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-1.s
rename to gas/testsuite/gas/sh/sh64/rel-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-2.s b/gas/testsuite/gas/sh/sh64/rel-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-2.s
rename to gas/testsuite/gas/sh/sh64/rel-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-3.s b/gas/testsuite/gas/sh/sh64/rel-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-3.s
rename to gas/testsuite/gas/sh/sh64/rel-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-4.s b/gas/testsuite/gas/sh/sh64/rel-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-4.s
rename to gas/testsuite/gas/sh/sh64/rel-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-5.s b/gas/testsuite/gas/sh/sh64/rel-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel-5.s
rename to gas/testsuite/gas/sh/sh64/rel-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-1.d b/gas/testsuite/gas/sh/sh64/rel32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-1.d
rename to gas/testsuite/gas/sh/sh64/rel32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-2.d b/gas/testsuite/gas/sh/sh64/rel32-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-2.d
rename to gas/testsuite/gas/sh/sh64/rel32-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-3.d b/gas/testsuite/gas/sh/sh64/rel32-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-3.d
rename to gas/testsuite/gas/sh/sh64/rel32-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-4.d b/gas/testsuite/gas/sh/sh64/rel32-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-4.d
rename to gas/testsuite/gas/sh/sh64/rel32-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-5.d b/gas/testsuite/gas/sh/sh64/rel32-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel32-5.d
rename to gas/testsuite/gas/sh/sh64/rel32-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-1.d b/gas/testsuite/gas/sh/sh64/rel64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-1.d
rename to gas/testsuite/gas/sh/sh64/rel64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-2.d b/gas/testsuite/gas/sh/sh64/rel64-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-2.d
rename to gas/testsuite/gas/sh/sh64/rel64-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-3.d b/gas/testsuite/gas/sh/sh64/rel64-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-3.d
rename to gas/testsuite/gas/sh/sh64/rel64-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-4.d b/gas/testsuite/gas/sh/sh64/rel64-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-4.d
rename to gas/testsuite/gas/sh/sh64/rel64-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-5.d b/gas/testsuite/gas/sh/sh64/rel64-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/rel64-5.d
rename to gas/testsuite/gas/sh/sh64/rel64-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-1.d b/gas/testsuite/gas/sh/sh64/relax-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-1.d
rename to gas/testsuite/gas/sh/sh64/relax-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-1.s b/gas/testsuite/gas/sh/sh64/relax-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-1.s
rename to gas/testsuite/gas/sh/sh64/relax-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-2.d b/gas/testsuite/gas/sh/sh64/relax-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-2.d
rename to gas/testsuite/gas/sh/sh64/relax-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-2.s b/gas/testsuite/gas/sh/sh64/relax-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-2.s
rename to gas/testsuite/gas/sh/sh64/relax-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-3.d b/gas/testsuite/gas/sh/sh64/relax-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-3.d
rename to gas/testsuite/gas/sh/sh64/relax-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-3.s b/gas/testsuite/gas/sh/sh64/relax-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/relax-3.s
rename to gas/testsuite/gas/sh/sh64/relax-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/sh64.exp b/gas/testsuite/gas/sh/sh64/sh64.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/sh64.exp
rename to gas/testsuite/gas/sh/sh64/sh64.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift-1.s b/gas/testsuite/gas/sh/sh64/shift-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift-1.s
rename to gas/testsuite/gas/sh/sh64/shift-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift-2.s b/gas/testsuite/gas/sh/sh64/shift-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift-2.s
rename to gas/testsuite/gas/sh/sh64/shift-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift-3.s b/gas/testsuite/gas/sh/sh64/shift-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift-3.s
rename to gas/testsuite/gas/sh/sh64/shift-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift32-1.d b/gas/testsuite/gas/sh/sh64/shift32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift32-1.d
rename to gas/testsuite/gas/sh/sh64/shift32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift32-3.d b/gas/testsuite/gas/sh/sh64/shift32-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift32-3.d
rename to gas/testsuite/gas/sh/sh64/shift32-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift32-noexp-3.d b/gas/testsuite/gas/sh/sh64/shift32-noexp-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift32-noexp-3.d
rename to gas/testsuite/gas/sh/sh64/shift32-noexp-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-1.d b/gas/testsuite/gas/sh/sh64/shift64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-1.d
rename to gas/testsuite/gas/sh/sh64/shift64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-2.d b/gas/testsuite/gas/sh/sh64/shift64-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-2.d
rename to gas/testsuite/gas/sh/sh64/shift64-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-3.d b/gas/testsuite/gas/sh/sh64/shift64-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-3.d
rename to gas/testsuite/gas/sh/sh64/shift64-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-noexp-3.d b/gas/testsuite/gas/sh/sh64/shift64-noexp-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/shift64-noexp-3.d
rename to gas/testsuite/gas/sh/sh64/shift64-noexp-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-1.d b/gas/testsuite/gas/sh/sh64/syntax-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-1.d
rename to gas/testsuite/gas/sh/sh64/syntax-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-1.s b/gas/testsuite/gas/sh/sh64/syntax-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-1.s
rename to gas/testsuite/gas/sh/sh64/syntax-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-2.d b/gas/testsuite/gas/sh/sh64/syntax-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-2.d
rename to gas/testsuite/gas/sh/sh64/syntax-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-2.s b/gas/testsuite/gas/sh/sh64/syntax-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/syntax-2.s
rename to gas/testsuite/gas/sh/sh64/syntax-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ua-1.s b/gas/testsuite/gas/sh/sh64/ua-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ua-1.s
rename to gas/testsuite/gas/sh/sh64/ua-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ua32-1.d b/gas/testsuite/gas/sh/sh64/ua32-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ua32-1.d
rename to gas/testsuite/gas/sh/sh64/ua32-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ua64-1.d b/gas/testsuite/gas/sh/sh64/ua64-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sh64/ua64-1.d
rename to gas/testsuite/gas/sh/sh64/ua64-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sign-extension.d b/gas/testsuite/gas/sh/sign-extension.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sign-extension.d
rename to gas/testsuite/gas/sh/sign-extension.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/sign-extension.s b/gas/testsuite/gas/sh/sign-extension.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/sign-extension.s
rename to gas/testsuite/gas/sh/sign-extension.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/tlsd.d b/gas/testsuite/gas/sh/tlsd.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/tlsd.d
rename to gas/testsuite/gas/sh/tlsd.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/tlsd.s b/gas/testsuite/gas/sh/tlsd.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/tlsd.s
rename to gas/testsuite/gas/sh/tlsd.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/tlsnopic.d b/gas/testsuite/gas/sh/tlsnopic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/tlsnopic.d
rename to gas/testsuite/gas/sh/tlsnopic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/tlsnopic.s b/gas/testsuite/gas/sh/tlsnopic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/tlsnopic.s
rename to gas/testsuite/gas/sh/tlsnopic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/tlspic.d b/gas/testsuite/gas/sh/tlspic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/tlspic.d
rename to gas/testsuite/gas/sh/tlspic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/tlspic.s b/gas/testsuite/gas/sh/tlspic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/tlspic.s
rename to gas/testsuite/gas/sh/tlspic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/too_large.d b/gas/testsuite/gas/sh/too_large.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/too_large.d
rename to gas/testsuite/gas/sh/too_large.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sh/too_large.s b/gas/testsuite/gas/sh/too_large.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sh/too_large.s
rename to gas/testsuite/gas/sh/too_large.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/addend.exp b/gas/testsuite/gas/sparc-solaris/addend.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/addend.exp
rename to gas/testsuite/gas/sparc-solaris/addend.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/addend.s b/gas/testsuite/gas/sparc-solaris/addend.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/addend.s
rename to gas/testsuite/gas/sparc-solaris/addend.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/gas.exp b/gas/testsuite/gas/sparc-solaris/gas.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/gas.exp
rename to gas/testsuite/gas/sparc-solaris/gas.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/sol-cc.s b/gas/testsuite/gas/sparc-solaris/sol-cc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/sol-cc.s
rename to gas/testsuite/gas/sparc-solaris/sol-cc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/sol-gcc.s b/gas/testsuite/gas/sparc-solaris/sol-gcc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc-solaris/sol-gcc.s
rename to gas/testsuite/gas/sparc-solaris/sol-gcc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/asi.d b/gas/testsuite/gas/sparc/asi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/asi.d
rename to gas/testsuite/gas/sparc/asi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/asi.s b/gas/testsuite/gas/sparc/asi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/asi.s
rename to gas/testsuite/gas/sparc/asi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop32.d b/gas/testsuite/gas/sparc/gotop32.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop32.d
rename to gas/testsuite/gas/sparc/gotop32.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop32.s b/gas/testsuite/gas/sparc/gotop32.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop32.s
rename to gas/testsuite/gas/sparc/gotop32.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop64.d b/gas/testsuite/gas/sparc/gotop64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop64.d
rename to gas/testsuite/gas/sparc/gotop64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop64.s b/gas/testsuite/gas/sparc/gotop64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/gotop64.s
rename to gas/testsuite/gas/sparc/gotop64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/membar.d b/gas/testsuite/gas/sparc/membar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/membar.d
rename to gas/testsuite/gas/sparc/membar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/membar.s b/gas/testsuite/gas/sparc/membar.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/membar.s
rename to gas/testsuite/gas/sparc/membar.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/mism-1.s b/gas/testsuite/gas/sparc/mism-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/mism-1.s
rename to gas/testsuite/gas/sparc/mism-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/mismatch.exp b/gas/testsuite/gas/sparc/mismatch.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/mismatch.exp
rename to gas/testsuite/gas/sparc/mismatch.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pc2210.d b/gas/testsuite/gas/sparc/pc2210.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pc2210.d
rename to gas/testsuite/gas/sparc/pc2210.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pc2210.s b/gas/testsuite/gas/sparc/pc2210.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pc2210.s
rename to gas/testsuite/gas/sparc/pc2210.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel.d b/gas/testsuite/gas/sparc/pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel.d
rename to gas/testsuite/gas/sparc/pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel.s b/gas/testsuite/gas/sparc/pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel.s
rename to gas/testsuite/gas/sparc/pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel64.d b/gas/testsuite/gas/sparc/pcrel64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel64.d
rename to gas/testsuite/gas/sparc/pcrel64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel64.s b/gas/testsuite/gas/sparc/pcrel64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pcrel64.s
rename to gas/testsuite/gas/sparc/pcrel64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/plt.d b/gas/testsuite/gas/sparc/plt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/plt.d
rename to gas/testsuite/gas/sparc/plt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/plt.s b/gas/testsuite/gas/sparc/plt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/plt.s
rename to gas/testsuite/gas/sparc/plt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/plt64.d b/gas/testsuite/gas/sparc/plt64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/plt64.d
rename to gas/testsuite/gas/sparc/plt64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/plt64.s b/gas/testsuite/gas/sparc/plt64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/plt64.s
rename to gas/testsuite/gas/sparc/plt64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pr4587.l b/gas/testsuite/gas/sparc/pr4587.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pr4587.l
rename to gas/testsuite/gas/sparc/pr4587.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/pr4587.s b/gas/testsuite/gas/sparc/pr4587.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/pr4587.s
rename to gas/testsuite/gas/sparc/pr4587.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/prefetch.d b/gas/testsuite/gas/sparc/prefetch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/prefetch.d
rename to gas/testsuite/gas/sparc/prefetch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/prefetch.s b/gas/testsuite/gas/sparc/prefetch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/prefetch.s
rename to gas/testsuite/gas/sparc/prefetch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/rdhpr.d b/gas/testsuite/gas/sparc/rdhpr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/rdhpr.d
rename to gas/testsuite/gas/sparc/rdhpr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/rdhpr.s b/gas/testsuite/gas/sparc/rdhpr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/rdhpr.s
rename to gas/testsuite/gas/sparc/rdhpr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/rdpr.d b/gas/testsuite/gas/sparc/rdpr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/rdpr.d
rename to gas/testsuite/gas/sparc/rdpr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/rdpr.s b/gas/testsuite/gas/sparc/rdpr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/rdpr.s
rename to gas/testsuite/gas/sparc/rdpr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/reloc64.d b/gas/testsuite/gas/sparc/reloc64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/reloc64.d
rename to gas/testsuite/gas/sparc/reloc64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/reloc64.s b/gas/testsuite/gas/sparc/reloc64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/reloc64.s
rename to gas/testsuite/gas/sparc/reloc64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/set64.d b/gas/testsuite/gas/sparc/set64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/set64.d
rename to gas/testsuite/gas/sparc/set64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/set64.s b/gas/testsuite/gas/sparc/set64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/set64.s
rename to gas/testsuite/gas/sparc/set64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/sparc.exp b/gas/testsuite/gas/sparc/sparc.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/sparc.exp
rename to gas/testsuite/gas/sparc/sparc.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/splet-2.d b/gas/testsuite/gas/sparc/splet-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/splet-2.d
rename to gas/testsuite/gas/sparc/splet-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/splet-2.s b/gas/testsuite/gas/sparc/splet-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/splet-2.s
rename to gas/testsuite/gas/sparc/splet-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/splet.d b/gas/testsuite/gas/sparc/splet.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/splet.d
rename to gas/testsuite/gas/sparc/splet.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/splet.s b/gas/testsuite/gas/sparc/splet.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/splet.s
rename to gas/testsuite/gas/sparc/splet.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/synth.d b/gas/testsuite/gas/sparc/synth.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/synth.d
rename to gas/testsuite/gas/sparc/synth.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/synth.s b/gas/testsuite/gas/sparc/synth.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/synth.s
rename to gas/testsuite/gas/sparc/synth.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/synth64.d b/gas/testsuite/gas/sparc/synth64.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/synth64.d
rename to gas/testsuite/gas/sparc/synth64.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/synth64.s b/gas/testsuite/gas/sparc/synth64.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/synth64.s
rename to gas/testsuite/gas/sparc/synth64.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/unalign.d b/gas/testsuite/gas/sparc/unalign.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/unalign.d
rename to gas/testsuite/gas/sparc/unalign.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/unalign.s b/gas/testsuite/gas/sparc/unalign.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/unalign.s
rename to gas/testsuite/gas/sparc/unalign.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch1.d b/gas/testsuite/gas/sparc/v9branch1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch1.d
rename to gas/testsuite/gas/sparc/v9branch1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch1.s b/gas/testsuite/gas/sparc/v9branch1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch1.s
rename to gas/testsuite/gas/sparc/v9branch1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch2.d b/gas/testsuite/gas/sparc/v9branch2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch2.d
rename to gas/testsuite/gas/sparc/v9branch2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch2.s b/gas/testsuite/gas/sparc/v9branch2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch2.s
rename to gas/testsuite/gas/sparc/v9branch2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch3.d b/gas/testsuite/gas/sparc/v9branch3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch3.d
rename to gas/testsuite/gas/sparc/v9branch3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch3.s b/gas/testsuite/gas/sparc/v9branch3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch3.s
rename to gas/testsuite/gas/sparc/v9branch3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch4.d b/gas/testsuite/gas/sparc/v9branch4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch4.d
rename to gas/testsuite/gas/sparc/v9branch4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch4.s b/gas/testsuite/gas/sparc/v9branch4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch4.s
rename to gas/testsuite/gas/sparc/v9branch4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch5.d b/gas/testsuite/gas/sparc/v9branch5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch5.d
rename to gas/testsuite/gas/sparc/v9branch5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch5.s b/gas/testsuite/gas/sparc/v9branch5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/v9branch5.s
rename to gas/testsuite/gas/sparc/v9branch5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/vxworks-pic.d b/gas/testsuite/gas/sparc/vxworks-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/vxworks-pic.d
rename to gas/testsuite/gas/sparc/vxworks-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/vxworks-pic.s b/gas/testsuite/gas/sparc/vxworks-pic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/vxworks-pic.s
rename to gas/testsuite/gas/sparc/vxworks-pic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/window.d b/gas/testsuite/gas/sparc/window.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/window.d
rename to gas/testsuite/gas/sparc/window.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/window.s b/gas/testsuite/gas/sparc/window.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/window.s
rename to gas/testsuite/gas/sparc/window.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/wrhpr.d b/gas/testsuite/gas/sparc/wrhpr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/wrhpr.d
rename to gas/testsuite/gas/sparc/wrhpr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/wrhpr.s b/gas/testsuite/gas/sparc/wrhpr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/wrhpr.s
rename to gas/testsuite/gas/sparc/wrhpr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/wrpr.d b/gas/testsuite/gas/sparc/wrpr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/wrpr.d
rename to gas/testsuite/gas/sparc/wrpr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sparc/wrpr.s b/gas/testsuite/gas/sparc/wrpr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sparc/wrpr.s
rename to gas/testsuite/gas/sparc/wrpr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sun4/addend.d b/gas/testsuite/gas/sun4/addend.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sun4/addend.d
rename to gas/testsuite/gas/sun4/addend.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sun4/addend.exp b/gas/testsuite/gas/sun4/addend.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sun4/addend.exp
rename to gas/testsuite/gas/sun4/addend.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/sun4/addend.s b/gas/testsuite/gas/sun4/addend.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/sun4/addend.s
rename to gas/testsuite/gas/sun4/addend.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver.exp b/gas/testsuite/gas/symver/symver.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver.exp
rename to gas/testsuite/gas/symver/symver.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver0.d b/gas/testsuite/gas/symver/symver0.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver0.d
rename to gas/testsuite/gas/symver/symver0.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver0.s b/gas/testsuite/gas/symver/symver0.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver0.s
rename to gas/testsuite/gas/symver/symver0.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver1.d b/gas/testsuite/gas/symver/symver1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver1.d
rename to gas/testsuite/gas/symver/symver1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver1.s b/gas/testsuite/gas/symver/symver1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver1.s
rename to gas/testsuite/gas/symver/symver1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver2.l b/gas/testsuite/gas/symver/symver2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver2.l
rename to gas/testsuite/gas/symver/symver2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver2.s b/gas/testsuite/gas/symver/symver2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver2.s
rename to gas/testsuite/gas/symver/symver2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver3.l b/gas/testsuite/gas/symver/symver3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver3.l
rename to gas/testsuite/gas/symver/symver3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver3.s b/gas/testsuite/gas/symver/symver3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver3.s
rename to gas/testsuite/gas/symver/symver3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver4.l b/gas/testsuite/gas/symver/symver4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver4.l
rename to gas/testsuite/gas/symver/symver4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver4.s b/gas/testsuite/gas/symver/symver4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver4.s
rename to gas/testsuite/gas/symver/symver4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver5.l b/gas/testsuite/gas/symver/symver5.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver5.l
rename to gas/testsuite/gas/symver/symver5.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver5.s b/gas/testsuite/gas/symver/symver5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver5.s
rename to gas/testsuite/gas/symver/symver5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver6.l b/gas/testsuite/gas/symver/symver6.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver6.l
rename to gas/testsuite/gas/symver/symver6.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/symver/symver6.s b/gas/testsuite/gas/symver/symver6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/symver/symver6.s
rename to gas/testsuite/gas/symver/symver6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/template b/gas/testsuite/gas/template
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/template
rename to gas/testsuite/gas/template
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/addressing.s b/gas/testsuite/gas/tic4x/addressing.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/addressing.s
rename to gas/testsuite/gas/tic4x/addressing.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/addressing_c3x.d b/gas/testsuite/gas/tic4x/addressing_c3x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/addressing_c3x.d
rename to gas/testsuite/gas/tic4x/addressing_c3x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/addressing_c4x.d b/gas/testsuite/gas/tic4x/addressing_c4x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/addressing_c4x.d
rename to gas/testsuite/gas/tic4x/addressing_c4x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/allopcodes.S b/gas/testsuite/gas/tic4x/allopcodes.S
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/allopcodes.S
rename to gas/testsuite/gas/tic4x/allopcodes.S
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/data.d b/gas/testsuite/gas/tic4x/data.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/data.d
rename to gas/testsuite/gas/tic4x/data.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/data.s b/gas/testsuite/gas/tic4x/data.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/data.s
rename to gas/testsuite/gas/tic4x/data.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/float.d b/gas/testsuite/gas/tic4x/float.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/float.d
rename to gas/testsuite/gas/tic4x/float.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/float.s b/gas/testsuite/gas/tic4x/float.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/float.s
rename to gas/testsuite/gas/tic4x/float.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/opclasses.h b/gas/testsuite/gas/tic4x/opclasses.h
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/opclasses.h
rename to gas/testsuite/gas/tic4x/opclasses.h
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes.s b/gas/testsuite/gas/tic4x/opcodes.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes.s
rename to gas/testsuite/gas/tic4x/opcodes.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes_c3x.d b/gas/testsuite/gas/tic4x/opcodes_c3x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes_c3x.d
rename to gas/testsuite/gas/tic4x/opcodes_c3x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes_c4x.d b/gas/testsuite/gas/tic4x/opcodes_c4x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes_c4x.d
rename to gas/testsuite/gas/tic4x/opcodes_c4x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes_new.d b/gas/testsuite/gas/tic4x/opcodes_new.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/opcodes_new.d
rename to gas/testsuite/gas/tic4x/opcodes_new.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/rebuild.sh b/gas/testsuite/gas/tic4x/rebuild.sh
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/rebuild.sh
rename to gas/testsuite/gas/tic4x/rebuild.sh
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/registers.s b/gas/testsuite/gas/tic4x/registers.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/registers.s
rename to gas/testsuite/gas/tic4x/registers.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/registers_c3x.d b/gas/testsuite/gas/tic4x/registers_c3x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/registers_c3x.d
rename to gas/testsuite/gas/tic4x/registers_c3x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/registers_c4x.d b/gas/testsuite/gas/tic4x/registers_c4x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/registers_c4x.d
rename to gas/testsuite/gas/tic4x/registers_c4x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/tic4x.exp b/gas/testsuite/gas/tic4x/tic4x.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/tic4x.exp
rename to gas/testsuite/gas/tic4x/tic4x.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/zeros.d b/gas/testsuite/gas/tic4x/zeros.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/zeros.d
rename to gas/testsuite/gas/tic4x/zeros.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic4x/zeros.s b/gas/testsuite/gas/tic4x/zeros.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic4x/zeros.s
rename to gas/testsuite/gas/tic4x/zeros.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/address.d b/gas/testsuite/gas/tic54x/address.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/address.d
rename to gas/testsuite/gas/tic54x/address.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/address.s b/gas/testsuite/gas/tic54x/address.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/address.s
rename to gas/testsuite/gas/tic54x/address.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/addrfar.d b/gas/testsuite/gas/tic54x/addrfar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/addrfar.d
rename to gas/testsuite/gas/tic54x/addrfar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/align.d b/gas/testsuite/gas/tic54x/align.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/align.d
rename to gas/testsuite/gas/tic54x/align.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/align.s b/gas/testsuite/gas/tic54x/align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/align.s
rename to gas/testsuite/gas/tic54x/align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/all-opcodes.d b/gas/testsuite/gas/tic54x/all-opcodes.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/all-opcodes.d
rename to gas/testsuite/gas/tic54x/all-opcodes.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/all-opcodes.s b/gas/testsuite/gas/tic54x/all-opcodes.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/all-opcodes.s
rename to gas/testsuite/gas/tic54x/all-opcodes.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/asg.d b/gas/testsuite/gas/tic54x/asg.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/asg.d
rename to gas/testsuite/gas/tic54x/asg.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/asg.s b/gas/testsuite/gas/tic54x/asg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/asg.s
rename to gas/testsuite/gas/tic54x/asg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/cons.d b/gas/testsuite/gas/tic54x/cons.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/cons.d
rename to gas/testsuite/gas/tic54x/cons.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/cons.s b/gas/testsuite/gas/tic54x/cons.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/cons.s
rename to gas/testsuite/gas/tic54x/cons.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/consfar.d b/gas/testsuite/gas/tic54x/consfar.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/consfar.d
rename to gas/testsuite/gas/tic54x/consfar.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/extaddr.d b/gas/testsuite/gas/tic54x/extaddr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/extaddr.d
rename to gas/testsuite/gas/tic54x/extaddr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/extaddr.s b/gas/testsuite/gas/tic54x/extaddr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/extaddr.s
rename to gas/testsuite/gas/tic54x/extaddr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/field.d b/gas/testsuite/gas/tic54x/field.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/field.d
rename to gas/testsuite/gas/tic54x/field.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/field.s b/gas/testsuite/gas/tic54x/field.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/field.s
rename to gas/testsuite/gas/tic54x/field.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/in_mlib.asm b/gas/testsuite/gas/tic54x/in_mlib.asm
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/in_mlib.asm
rename to gas/testsuite/gas/tic54x/in_mlib.asm
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/labels.d b/gas/testsuite/gas/tic54x/labels.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/labels.d
rename to gas/testsuite/gas/tic54x/labels.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/labels.inc b/gas/testsuite/gas/tic54x/labels.inc
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/labels.inc
rename to gas/testsuite/gas/tic54x/labels.inc
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/labels.s b/gas/testsuite/gas/tic54x/labels.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/labels.s
rename to gas/testsuite/gas/tic54x/labels.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/loop.d b/gas/testsuite/gas/tic54x/loop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/loop.d
rename to gas/testsuite/gas/tic54x/loop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/loop.s b/gas/testsuite/gas/tic54x/loop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/loop.s
rename to gas/testsuite/gas/tic54x/loop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/lp.d b/gas/testsuite/gas/tic54x/lp.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/lp.d
rename to gas/testsuite/gas/tic54x/lp.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/lp.s b/gas/testsuite/gas/tic54x/lp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/lp.s
rename to gas/testsuite/gas/tic54x/lp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/macro.d b/gas/testsuite/gas/tic54x/macro.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/macro.d
rename to gas/testsuite/gas/tic54x/macro.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/macro.s b/gas/testsuite/gas/tic54x/macro.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/macro.s
rename to gas/testsuite/gas/tic54x/macro.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/macro1.s b/gas/testsuite/gas/tic54x/macro1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/macro1.s
rename to gas/testsuite/gas/tic54x/macro1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/macros.lib b/gas/testsuite/gas/tic54x/macros.lib
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/macros.lib
rename to gas/testsuite/gas/tic54x/macros.lib
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/math.d b/gas/testsuite/gas/tic54x/math.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/math.d
rename to gas/testsuite/gas/tic54x/math.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/math.s b/gas/testsuite/gas/tic54x/math.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/math.s
rename to gas/testsuite/gas/tic54x/math.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/opcodes.d b/gas/testsuite/gas/tic54x/opcodes.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/opcodes.d
rename to gas/testsuite/gas/tic54x/opcodes.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/opcodes.s b/gas/testsuite/gas/tic54x/opcodes.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/opcodes.s
rename to gas/testsuite/gas/tic54x/opcodes.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/sections.d b/gas/testsuite/gas/tic54x/sections.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/sections.d
rename to gas/testsuite/gas/tic54x/sections.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/sections.s b/gas/testsuite/gas/tic54x/sections.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/sections.s
rename to gas/testsuite/gas/tic54x/sections.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/set.d b/gas/testsuite/gas/tic54x/set.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/set.d
rename to gas/testsuite/gas/tic54x/set.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/set.s b/gas/testsuite/gas/tic54x/set.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/set.s
rename to gas/testsuite/gas/tic54x/set.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/struct.d b/gas/testsuite/gas/tic54x/struct.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/struct.d
rename to gas/testsuite/gas/tic54x/struct.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/struct.s b/gas/testsuite/gas/tic54x/struct.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/struct.s
rename to gas/testsuite/gas/tic54x/struct.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/subsym.d b/gas/testsuite/gas/tic54x/subsym.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/subsym.d
rename to gas/testsuite/gas/tic54x/subsym.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/subsym.s b/gas/testsuite/gas/tic54x/subsym.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/subsym.s
rename to gas/testsuite/gas/tic54x/subsym.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/subsym1.s b/gas/testsuite/gas/tic54x/subsym1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/subsym1.s
rename to gas/testsuite/gas/tic54x/subsym1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic54x/tic54x.exp b/gas/testsuite/gas/tic54x/tic54x.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic54x/tic54x.exp
rename to gas/testsuite/gas/tic54x/tic54x.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-1-be.d b/gas/testsuite/gas/tic6x/align-1-be.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-1-be.d
rename to gas/testsuite/gas/tic6x/align-1-be.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-1.d b/gas/testsuite/gas/tic6x/align-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-1.d
rename to gas/testsuite/gas/tic6x/align-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-1.s b/gas/testsuite/gas/tic6x/align-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-1.s
rename to gas/testsuite/gas/tic6x/align-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-2.d b/gas/testsuite/gas/tic6x/align-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-2.d
rename to gas/testsuite/gas/tic6x/align-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-2.s b/gas/testsuite/gas/tic6x/align-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/align-2.s
rename to gas/testsuite/gas/tic6x/align-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-1.d b/gas/testsuite/gas/tic6x/arch-invalid-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-1.d
rename to gas/testsuite/gas/tic6x/arch-invalid-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-1.l b/gas/testsuite/gas/tic6x/arch-invalid-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-1.l
rename to gas/testsuite/gas/tic6x/arch-invalid-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-2.d b/gas/testsuite/gas/tic6x/arch-invalid-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-2.d
rename to gas/testsuite/gas/tic6x/arch-invalid-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-2.l b/gas/testsuite/gas/tic6x/arch-invalid-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-2.l
rename to gas/testsuite/gas/tic6x/arch-invalid-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-2.s b/gas/testsuite/gas/tic6x/arch-invalid-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/arch-invalid-2.s
rename to gas/testsuite/gas/tic6x/arch-invalid-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-1.d b/gas/testsuite/gas/tic6x/attr-arch-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-arch-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-1.s b/gas/testsuite/gas/tic6x/attr-arch-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-arch-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-2.d b/gas/testsuite/gas/tic6x/attr-arch-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-arch-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-2.s b/gas/testsuite/gas/tic6x/attr-arch-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-arch-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-3.d b/gas/testsuite/gas/tic6x/attr-arch-directive-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-3.d
rename to gas/testsuite/gas/tic6x/attr-arch-directive-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-3.s b/gas/testsuite/gas/tic6x/attr-arch-directive-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-3.s
rename to gas/testsuite/gas/tic6x/attr-arch-directive-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-4.d b/gas/testsuite/gas/tic6x/attr-arch-directive-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-4.d
rename to gas/testsuite/gas/tic6x/attr-arch-directive-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-4.s b/gas/testsuite/gas/tic6x/attr-arch-directive-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-4.s
rename to gas/testsuite/gas/tic6x/attr-arch-directive-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-5.d b/gas/testsuite/gas/tic6x/attr-arch-directive-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-5.d
rename to gas/testsuite/gas/tic6x/attr-arch-directive-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-5.s b/gas/testsuite/gas/tic6x/attr-arch-directive-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-directive-5.s
rename to gas/testsuite/gas/tic6x/attr-arch-directive-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d b/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d b/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d b/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d b/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d b/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d
rename to gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-1.d b/gas/testsuite/gas/tic6x/attr-array-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-array-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-1.s b/gas/testsuite/gas/tic6x/attr-array-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-array-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-2.d b/gas/testsuite/gas/tic6x/attr-array-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-array-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-2.s b/gas/testsuite/gas/tic6x/attr-array-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-array-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-3.d b/gas/testsuite/gas/tic6x/attr-array-directive-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-3.d
rename to gas/testsuite/gas/tic6x/attr-array-directive-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-3.s b/gas/testsuite/gas/tic6x/attr-array-directive-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-3.s
rename to gas/testsuite/gas/tic6x/attr-array-directive-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-4.d b/gas/testsuite/gas/tic6x/attr-array-directive-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-4.d
rename to gas/testsuite/gas/tic6x/attr-array-directive-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-4.s b/gas/testsuite/gas/tic6x/attr-array-directive-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-array-directive-4.s
rename to gas/testsuite/gas/tic6x/attr-array-directive-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d b/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s b/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d b/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s b/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-1.d b/gas/testsuite/gas/tic6x/attr-conformance-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-conformance-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-1.s b/gas/testsuite/gas/tic6x/attr-conformance-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-conformance-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-2.d b/gas/testsuite/gas/tic6x/attr-conformance-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-conformance-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-2.s b/gas/testsuite/gas/tic6x/attr-conformance-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-conformance-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-conformance-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-1.d b/gas/testsuite/gas/tic6x/attr-dsbt-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-dsbt-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-1.s b/gas/testsuite/gas/tic6x/attr-dsbt-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-dsbt-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-2.d b/gas/testsuite/gas/tic6x/attr-dsbt-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-dsbt-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-2.s b/gas/testsuite/gas/tic6x/attr-dsbt-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-dsbt-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-opts-mdsbt.d b/gas/testsuite/gas/tic6x/attr-dsbt-opts-mdsbt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-opts-mdsbt.d
rename to gas/testsuite/gas/tic6x/attr-dsbt-opts-mdsbt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-opts-mno-dsbt.d b/gas/testsuite/gas/tic6x/attr-dsbt-opts-mno-dsbt.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-dsbt-opts-mno-dsbt.d
rename to gas/testsuite/gas/tic6x/attr-dsbt-opts-mno-dsbt.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-1.d b/gas/testsuite/gas/tic6x/attr-pic-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-pic-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-1.s b/gas/testsuite/gas/tic6x/attr-pic-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-pic-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-2.d b/gas/testsuite/gas/tic6x/attr-pic-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-pic-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-2.s b/gas/testsuite/gas/tic6x/attr-pic-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-pic-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-opts-mno-pic.d b/gas/testsuite/gas/tic6x/attr-pic-opts-mno-pic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-opts-mno-pic.d
rename to gas/testsuite/gas/tic6x/attr-pic-opts-mno-pic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-opts-mpic.d b/gas/testsuite/gas/tic6x/attr-pic-opts-mpic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pic-opts-mpic.d
rename to gas/testsuite/gas/tic6x/attr-pic-opts-mpic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-1.d b/gas/testsuite/gas/tic6x/attr-pid-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-pid-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-1.s b/gas/testsuite/gas/tic6x/attr-pid-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-pid-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-2.d b/gas/testsuite/gas/tic6x/attr-pid-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-pid-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-2.s b/gas/testsuite/gas/tic6x/attr-pid-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-pid-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-far.d b/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-far.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-far.d
rename to gas/testsuite/gas/tic6x/attr-pid-opts-mpid-far.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-near.d b/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-near.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-near.d
rename to gas/testsuite/gas/tic6x/attr-pid-opts-mpid-near.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-no.d b/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-no.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-pid-opts-mpid-no.d
rename to gas/testsuite/gas/tic6x/attr-pid-opts-mpid-no.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-1.d b/gas/testsuite/gas/tic6x/attr-stack-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-stack-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-1.s b/gas/testsuite/gas/tic6x/attr-stack-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-stack-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-2.d b/gas/testsuite/gas/tic6x/attr-stack-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-stack-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-2.s b/gas/testsuite/gas/tic6x/attr-stack-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-stack-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-stack-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-1.d b/gas/testsuite/gas/tic6x/attr-wchar-directive-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-1.d
rename to gas/testsuite/gas/tic6x/attr-wchar-directive-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-1.s b/gas/testsuite/gas/tic6x/attr-wchar-directive-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-1.s
rename to gas/testsuite/gas/tic6x/attr-wchar-directive-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-2.d b/gas/testsuite/gas/tic6x/attr-wchar-directive-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-2.d
rename to gas/testsuite/gas/tic6x/attr-wchar-directive-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-2.s b/gas/testsuite/gas/tic6x/attr-wchar-directive-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/attr-wchar-directive-2.s
rename to gas/testsuite/gas/tic6x/attr-wchar-directive-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/data-reloc.d b/gas/testsuite/gas/tic6x/data-reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/data-reloc.d
rename to gas/testsuite/gas/tic6x/data-reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/data-reloc.s b/gas/testsuite/gas/tic6x/data-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/data-reloc.s
rename to gas/testsuite/gas/tic6x/data-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/dir-junk.d b/gas/testsuite/gas/tic6x/dir-junk.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/dir-junk.d
rename to gas/testsuite/gas/tic6x/dir-junk.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/dir-junk.l b/gas/testsuite/gas/tic6x/dir-junk.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/dir-junk.l
rename to gas/testsuite/gas/tic6x/dir-junk.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/dir-junk.s b/gas/testsuite/gas/tic6x/dir-junk.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/dir-junk.s
rename to gas/testsuite/gas/tic6x/dir-junk.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/dummy.s b/gas/testsuite/gas/tic6x/dummy.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/dummy.s
rename to gas/testsuite/gas/tic6x/dummy.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/empty.s b/gas/testsuite/gas/tic6x/empty.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/empty.s
rename to gas/testsuite/gas/tic6x/empty.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/endian-1.d b/gas/testsuite/gas/tic6x/endian-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/endian-1.d
rename to gas/testsuite/gas/tic6x/endian-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/endian-2.d b/gas/testsuite/gas/tic6x/endian-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/endian-2.d
rename to gas/testsuite/gas/tic6x/endian-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/endian-3.d b/gas/testsuite/gas/tic6x/endian-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/endian-3.d
rename to gas/testsuite/gas/tic6x/endian-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/got-reloc.d b/gas/testsuite/gas/tic6x/got-reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/got-reloc.d
rename to gas/testsuite/gas/tic6x/got-reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/got-reloc.s b/gas/testsuite/gas/tic6x/got-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/got-reloc.s
rename to gas/testsuite/gas/tic6x/got-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-atomic.d b/gas/testsuite/gas/tic6x/insns-atomic.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-atomic.d
rename to gas/testsuite/gas/tic6x/insns-atomic.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-atomic.s b/gas/testsuite/gas/tic6x/insns-atomic.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-atomic.s
rename to gas/testsuite/gas/tic6x/insns-atomic.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-1.d b/gas/testsuite/gas/tic6x/insns-bad-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-1.d
rename to gas/testsuite/gas/tic6x/insns-bad-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-1.l b/gas/testsuite/gas/tic6x/insns-bad-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-1.l
rename to gas/testsuite/gas/tic6x/insns-bad-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-1.s b/gas/testsuite/gas/tic6x/insns-bad-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-1.s
rename to gas/testsuite/gas/tic6x/insns-bad-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-2.d b/gas/testsuite/gas/tic6x/insns-bad-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-2.d
rename to gas/testsuite/gas/tic6x/insns-bad-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-2.l b/gas/testsuite/gas/tic6x/insns-bad-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-2.l
rename to gas/testsuite/gas/tic6x/insns-bad-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-2.s b/gas/testsuite/gas/tic6x/insns-bad-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-bad-2.s
rename to gas/testsuite/gas/tic6x/insns-bad-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-bad.d b/gas/testsuite/gas/tic6x/insns-c674x-bad.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-bad.d
rename to gas/testsuite/gas/tic6x/insns-c674x-bad.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-bad.l b/gas/testsuite/gas/tic6x/insns-c674x-bad.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-bad.l
rename to gas/testsuite/gas/tic6x/insns-c674x-bad.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-bad.s b/gas/testsuite/gas/tic6x/insns-c674x-bad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-bad.s
rename to gas/testsuite/gas/tic6x/insns-c674x-bad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-pcrel.d b/gas/testsuite/gas/tic6x/insns-c674x-pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-pcrel.d
rename to gas/testsuite/gas/tic6x/insns-c674x-pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-pcrel.s b/gas/testsuite/gas/tic6x/insns-c674x-pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-pcrel.s
rename to gas/testsuite/gas/tic6x/insns-c674x-pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-reloc.d b/gas/testsuite/gas/tic6x/insns-c674x-reloc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-reloc.d
rename to gas/testsuite/gas/tic6x/insns-c674x-reloc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-reloc.s b/gas/testsuite/gas/tic6x/insns-c674x-reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-reloc.s
rename to gas/testsuite/gas/tic6x/insns-c674x-reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-sploop.d b/gas/testsuite/gas/tic6x/insns-c674x-sploop.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-sploop.d
rename to gas/testsuite/gas/tic6x/insns-c674x-sploop.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-sploop.s b/gas/testsuite/gas/tic6x/insns-c674x-sploop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x-sploop.s
rename to gas/testsuite/gas/tic6x/insns-c674x-sploop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x.d b/gas/testsuite/gas/tic6x/insns-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x.d
rename to gas/testsuite/gas/tic6x/insns-c674x.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x.s b/gas/testsuite/gas/tic6x/insns-c674x.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-c674x.s
rename to gas/testsuite/gas/tic6x/insns-c674x.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-be.d b/gas/testsuite/gas/tic6x/insns-parallel-be.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-be.d
rename to gas/testsuite/gas/tic6x/insns-parallel-be.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-le.d b/gas/testsuite/gas/tic6x/insns-parallel-le.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-le.d
rename to gas/testsuite/gas/tic6x/insns-parallel-le.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-multi.d b/gas/testsuite/gas/tic6x/insns-parallel-multi.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-multi.d
rename to gas/testsuite/gas/tic6x/insns-parallel-multi.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-multi.s b/gas/testsuite/gas/tic6x/insns-parallel-multi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel-multi.s
rename to gas/testsuite/gas/tic6x/insns-parallel-multi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel.s b/gas/testsuite/gas/tic6x/insns-parallel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-parallel.s
rename to gas/testsuite/gas/tic6x/insns-parallel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-predicate.d b/gas/testsuite/gas/tic6x/insns-predicate.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-predicate.d
rename to gas/testsuite/gas/tic6x/insns-predicate.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-predicate.s b/gas/testsuite/gas/tic6x/insns-predicate.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/insns-predicate.s
rename to gas/testsuite/gas/tic6x/insns-predicate.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-1.d b/gas/testsuite/gas/tic6x/parallel-bad-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-1.d
rename to gas/testsuite/gas/tic6x/parallel-bad-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-1.l b/gas/testsuite/gas/tic6x/parallel-bad-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-1.l
rename to gas/testsuite/gas/tic6x/parallel-bad-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-1.s b/gas/testsuite/gas/tic6x/parallel-bad-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-1.s
rename to gas/testsuite/gas/tic6x/parallel-bad-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-2.d b/gas/testsuite/gas/tic6x/parallel-bad-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-2.d
rename to gas/testsuite/gas/tic6x/parallel-bad-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-2.l b/gas/testsuite/gas/tic6x/parallel-bad-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-2.l
rename to gas/testsuite/gas/tic6x/parallel-bad-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-2.s b/gas/testsuite/gas/tic6x/parallel-bad-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-2.s
rename to gas/testsuite/gas/tic6x/parallel-bad-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-3.d b/gas/testsuite/gas/tic6x/parallel-bad-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-3.d
rename to gas/testsuite/gas/tic6x/parallel-bad-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-3.l b/gas/testsuite/gas/tic6x/parallel-bad-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-3.l
rename to gas/testsuite/gas/tic6x/parallel-bad-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-3.s b/gas/testsuite/gas/tic6x/parallel-bad-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-3.s
rename to gas/testsuite/gas/tic6x/parallel-bad-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-4.d b/gas/testsuite/gas/tic6x/parallel-bad-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-4.d
rename to gas/testsuite/gas/tic6x/parallel-bad-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-4.l b/gas/testsuite/gas/tic6x/parallel-bad-4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-4.l
rename to gas/testsuite/gas/tic6x/parallel-bad-4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-4.s b/gas/testsuite/gas/tic6x/parallel-bad-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/parallel-bad-4.s
rename to gas/testsuite/gas/tic6x/parallel-bad-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-1.d b/gas/testsuite/gas/tic6x/predicate-bad-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-1.d
rename to gas/testsuite/gas/tic6x/predicate-bad-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-1.l b/gas/testsuite/gas/tic6x/predicate-bad-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-1.l
rename to gas/testsuite/gas/tic6x/predicate-bad-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-1.s b/gas/testsuite/gas/tic6x/predicate-bad-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-1.s
rename to gas/testsuite/gas/tic6x/predicate-bad-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-2.d b/gas/testsuite/gas/tic6x/predicate-bad-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-2.d
rename to gas/testsuite/gas/tic6x/predicate-bad-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-2.l b/gas/testsuite/gas/tic6x/predicate-bad-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-2.l
rename to gas/testsuite/gas/tic6x/predicate-bad-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-2.s b/gas/testsuite/gas/tic6x/predicate-bad-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-2.s
rename to gas/testsuite/gas/tic6x/predicate-bad-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-3.d b/gas/testsuite/gas/tic6x/predicate-bad-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-3.d
rename to gas/testsuite/gas/tic6x/predicate-bad-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-3.l b/gas/testsuite/gas/tic6x/predicate-bad-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-3.l
rename to gas/testsuite/gas/tic6x/predicate-bad-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-3.s b/gas/testsuite/gas/tic6x/predicate-bad-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/predicate-bad-3.s
rename to gas/testsuite/gas/tic6x/predicate-bad-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-1.d b/gas/testsuite/gas/tic6x/reloc-bad-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-1.d
rename to gas/testsuite/gas/tic6x/reloc-bad-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-1.l b/gas/testsuite/gas/tic6x/reloc-bad-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-1.l
rename to gas/testsuite/gas/tic6x/reloc-bad-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-1.s b/gas/testsuite/gas/tic6x/reloc-bad-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-1.s
rename to gas/testsuite/gas/tic6x/reloc-bad-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-2.d b/gas/testsuite/gas/tic6x/reloc-bad-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-2.d
rename to gas/testsuite/gas/tic6x/reloc-bad-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-2.l b/gas/testsuite/gas/tic6x/reloc-bad-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-2.l
rename to gas/testsuite/gas/tic6x/reloc-bad-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-2.s b/gas/testsuite/gas/tic6x/reloc-bad-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-2.s
rename to gas/testsuite/gas/tic6x/reloc-bad-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-3.d b/gas/testsuite/gas/tic6x/reloc-bad-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-3.d
rename to gas/testsuite/gas/tic6x/reloc-bad-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-3.l b/gas/testsuite/gas/tic6x/reloc-bad-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-3.l
rename to gas/testsuite/gas/tic6x/reloc-bad-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-3.s b/gas/testsuite/gas/tic6x/reloc-bad-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-3.s
rename to gas/testsuite/gas/tic6x/reloc-bad-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-4.d b/gas/testsuite/gas/tic6x/reloc-bad-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-4.d
rename to gas/testsuite/gas/tic6x/reloc-bad-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-4.l b/gas/testsuite/gas/tic6x/reloc-bad-4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-4.l
rename to gas/testsuite/gas/tic6x/reloc-bad-4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-4.s b/gas/testsuite/gas/tic6x/reloc-bad-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-4.s
rename to gas/testsuite/gas/tic6x/reloc-bad-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-5.d b/gas/testsuite/gas/tic6x/reloc-bad-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-5.d
rename to gas/testsuite/gas/tic6x/reloc-bad-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-5.l b/gas/testsuite/gas/tic6x/reloc-bad-5.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-5.l
rename to gas/testsuite/gas/tic6x/reloc-bad-5.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-5.s b/gas/testsuite/gas/tic6x/reloc-bad-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-5.s
rename to gas/testsuite/gas/tic6x/reloc-bad-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-6.d b/gas/testsuite/gas/tic6x/reloc-bad-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-6.d
rename to gas/testsuite/gas/tic6x/reloc-bad-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-6.l b/gas/testsuite/gas/tic6x/reloc-bad-6.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-6.l
rename to gas/testsuite/gas/tic6x/reloc-bad-6.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-6.s b/gas/testsuite/gas/tic6x/reloc-bad-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/reloc-bad-6.s
rename to gas/testsuite/gas/tic6x/reloc-bad-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-1.d b/gas/testsuite/gas/tic6x/resource-func-unit-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-1.d
rename to gas/testsuite/gas/tic6x/resource-func-unit-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-1.l b/gas/testsuite/gas/tic6x/resource-func-unit-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-1.l
rename to gas/testsuite/gas/tic6x/resource-func-unit-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-1.s b/gas/testsuite/gas/tic6x/resource-func-unit-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-1.s
rename to gas/testsuite/gas/tic6x/resource-func-unit-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-2.d b/gas/testsuite/gas/tic6x/resource-func-unit-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-2.d
rename to gas/testsuite/gas/tic6x/resource-func-unit-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-2.l b/gas/testsuite/gas/tic6x/resource-func-unit-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-2.l
rename to gas/testsuite/gas/tic6x/resource-func-unit-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-2.s b/gas/testsuite/gas/tic6x/resource-func-unit-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/resource-func-unit-2.s
rename to gas/testsuite/gas/tic6x/resource-func-unit-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-1.d b/gas/testsuite/gas/tic6x/sploop-bad-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-1.d
rename to gas/testsuite/gas/tic6x/sploop-bad-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-1.l b/gas/testsuite/gas/tic6x/sploop-bad-1.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-1.l
rename to gas/testsuite/gas/tic6x/sploop-bad-1.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-1.s b/gas/testsuite/gas/tic6x/sploop-bad-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-1.s
rename to gas/testsuite/gas/tic6x/sploop-bad-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-2.d b/gas/testsuite/gas/tic6x/sploop-bad-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-2.d
rename to gas/testsuite/gas/tic6x/sploop-bad-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-2.l b/gas/testsuite/gas/tic6x/sploop-bad-2.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-2.l
rename to gas/testsuite/gas/tic6x/sploop-bad-2.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-2.s b/gas/testsuite/gas/tic6x/sploop-bad-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-2.s
rename to gas/testsuite/gas/tic6x/sploop-bad-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-3.d b/gas/testsuite/gas/tic6x/sploop-bad-3.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-3.d
rename to gas/testsuite/gas/tic6x/sploop-bad-3.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-3.l b/gas/testsuite/gas/tic6x/sploop-bad-3.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-3.l
rename to gas/testsuite/gas/tic6x/sploop-bad-3.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-3.s b/gas/testsuite/gas/tic6x/sploop-bad-3.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-3.s
rename to gas/testsuite/gas/tic6x/sploop-bad-3.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-4.d b/gas/testsuite/gas/tic6x/sploop-bad-4.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-4.d
rename to gas/testsuite/gas/tic6x/sploop-bad-4.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-4.l b/gas/testsuite/gas/tic6x/sploop-bad-4.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-4.l
rename to gas/testsuite/gas/tic6x/sploop-bad-4.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-4.s b/gas/testsuite/gas/tic6x/sploop-bad-4.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-4.s
rename to gas/testsuite/gas/tic6x/sploop-bad-4.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-5.d b/gas/testsuite/gas/tic6x/sploop-bad-5.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-5.d
rename to gas/testsuite/gas/tic6x/sploop-bad-5.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-5.l b/gas/testsuite/gas/tic6x/sploop-bad-5.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-5.l
rename to gas/testsuite/gas/tic6x/sploop-bad-5.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-5.s b/gas/testsuite/gas/tic6x/sploop-bad-5.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-5.s
rename to gas/testsuite/gas/tic6x/sploop-bad-5.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-6.d b/gas/testsuite/gas/tic6x/sploop-bad-6.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-6.d
rename to gas/testsuite/gas/tic6x/sploop-bad-6.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-6.l b/gas/testsuite/gas/tic6x/sploop-bad-6.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-6.l
rename to gas/testsuite/gas/tic6x/sploop-bad-6.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-6.s b/gas/testsuite/gas/tic6x/sploop-bad-6.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-6.s
rename to gas/testsuite/gas/tic6x/sploop-bad-6.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-7.d b/gas/testsuite/gas/tic6x/sploop-bad-7.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-7.d
rename to gas/testsuite/gas/tic6x/sploop-bad-7.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-7.l b/gas/testsuite/gas/tic6x/sploop-bad-7.l
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-7.l
rename to gas/testsuite/gas/tic6x/sploop-bad-7.l
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-7.s b/gas/testsuite/gas/tic6x/sploop-bad-7.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/sploop-bad-7.s
rename to gas/testsuite/gas/tic6x/sploop-bad-7.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/syntax.d b/gas/testsuite/gas/tic6x/syntax.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/syntax.d
rename to gas/testsuite/gas/tic6x/syntax.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/syntax.s b/gas/testsuite/gas/tic6x/syntax.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/syntax.s
rename to gas/testsuite/gas/tic6x/syntax.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/tic6x/tic6x.exp b/gas/testsuite/gas/tic6x/tic6x.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/tic6x/tic6x.exp
rename to gas/testsuite/gas/tic6x/tic6x.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/arith.s b/gas/testsuite/gas/v850/arith.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/arith.s
rename to gas/testsuite/gas/v850/arith.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/basic.exp b/gas/testsuite/gas/v850/basic.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/basic.exp
rename to gas/testsuite/gas/v850/basic.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/bit.s b/gas/testsuite/gas/v850/bit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/bit.s
rename to gas/testsuite/gas/v850/bit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/branch.s b/gas/testsuite/gas/v850/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/branch.s
rename to gas/testsuite/gas/v850/branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/compare.s b/gas/testsuite/gas/v850/compare.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/compare.s
rename to gas/testsuite/gas/v850/compare.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/fepsw.s b/gas/testsuite/gas/v850/fepsw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/fepsw.s
rename to gas/testsuite/gas/v850/fepsw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/hilo.s b/gas/testsuite/gas/v850/hilo.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/hilo.s
rename to gas/testsuite/gas/v850/hilo.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/hilo2.s b/gas/testsuite/gas/v850/hilo2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/hilo2.s
rename to gas/testsuite/gas/v850/hilo2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/jumps.s b/gas/testsuite/gas/v850/jumps.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/jumps.s
rename to gas/testsuite/gas/v850/jumps.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/logical.s b/gas/testsuite/gas/v850/logical.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/logical.s
rename to gas/testsuite/gas/v850/logical.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/mem.s b/gas/testsuite/gas/v850/mem.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/mem.s
rename to gas/testsuite/gas/v850/mem.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/misc.s b/gas/testsuite/gas/v850/misc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/misc.s
rename to gas/testsuite/gas/v850/misc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/move.s b/gas/testsuite/gas/v850/move.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/move.s
rename to gas/testsuite/gas/v850/move.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/range.s b/gas/testsuite/gas/v850/range.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/range.s
rename to gas/testsuite/gas/v850/range.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/reloc.s b/gas/testsuite/gas/v850/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/reloc.s
rename to gas/testsuite/gas/v850/reloc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/split-lo16.d b/gas/testsuite/gas/v850/split-lo16.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/split-lo16.d
rename to gas/testsuite/gas/v850/split-lo16.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/split-lo16.s b/gas/testsuite/gas/v850/split-lo16.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/split-lo16.s
rename to gas/testsuite/gas/v850/split-lo16.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/v850e1.d b/gas/testsuite/gas/v850/v850e1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/v850e1.d
rename to gas/testsuite/gas/v850/v850e1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/v850/v850e1.s b/gas/testsuite/gas/v850/v850e1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/v850/v850e1.s
rename to gas/testsuite/gas/v850/v850e1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/vax/elf-rel.d b/gas/testsuite/gas/vax/elf-rel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/vax/elf-rel.d
rename to gas/testsuite/gas/vax/elf-rel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/vax/elf-rel.s b/gas/testsuite/gas/vax/elf-rel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/vax/elf-rel.s
rename to gas/testsuite/gas/vax/elf-rel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/vax/flonum.d b/gas/testsuite/gas/vax/flonum.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/vax/flonum.d
rename to gas/testsuite/gas/vax/flonum.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/vax/flonum.s b/gas/testsuite/gas/vax/flonum.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/vax/flonum.s
rename to gas/testsuite/gas/vax/flonum.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/vax/quad.s b/gas/testsuite/gas/vax/quad.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/vax/quad.s
rename to gas/testsuite/gas/vax/quad.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/vax/quad_elf.s b/gas/testsuite/gas/vax/quad_elf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/vax/quad_elf.s
rename to gas/testsuite/gas/vax/quad_elf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/vax/vax.exp b/gas/testsuite/gas/vax/vax.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/vax/vax.exp
rename to gas/testsuite/gas/vax/vax.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/add.s b/gas/testsuite/gas/xc16x/add.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/add.s
rename to gas/testsuite/gas/xc16x/add.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/add_test.s b/gas/testsuite/gas/xc16x/add_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/add_test.s
rename to gas/testsuite/gas/xc16x/add_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/addb.s b/gas/testsuite/gas/xc16x/addb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/addb.s
rename to gas/testsuite/gas/xc16x/addb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/addc.s b/gas/testsuite/gas/xc16x/addc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/addc.s
rename to gas/testsuite/gas/xc16x/addc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/addcb.s b/gas/testsuite/gas/xc16x/addcb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/addcb.s
rename to gas/testsuite/gas/xc16x/addcb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/and.s b/gas/testsuite/gas/xc16x/and.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/and.s
rename to gas/testsuite/gas/xc16x/and.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/andb.s b/gas/testsuite/gas/xc16x/andb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/andb.s
rename to gas/testsuite/gas/xc16x/andb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/bfldl.s b/gas/testsuite/gas/xc16x/bfldl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/bfldl.s
rename to gas/testsuite/gas/xc16x/bfldl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/bit.s b/gas/testsuite/gas/xc16x/bit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/bit.s
rename to gas/testsuite/gas/xc16x/bit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/calla.s b/gas/testsuite/gas/xc16x/calla.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/calla.s
rename to gas/testsuite/gas/xc16x/calla.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/calli.s b/gas/testsuite/gas/xc16x/calli.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/calli.s
rename to gas/testsuite/gas/xc16x/calli.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmp.s b/gas/testsuite/gas/xc16x/cmp.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmp.s
rename to gas/testsuite/gas/xc16x/cmp.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmp_test.s b/gas/testsuite/gas/xc16x/cmp_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmp_test.s
rename to gas/testsuite/gas/xc16x/cmp_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmpb.s b/gas/testsuite/gas/xc16x/cmpb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmpb.s
rename to gas/testsuite/gas/xc16x/cmpb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmpi.s b/gas/testsuite/gas/xc16x/cmpi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/cmpi.s
rename to gas/testsuite/gas/xc16x/cmpi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/cpl.s b/gas/testsuite/gas/xc16x/cpl.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/cpl.s
rename to gas/testsuite/gas/xc16x/cpl.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/div.s b/gas/testsuite/gas/xc16x/div.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/div.s
rename to gas/testsuite/gas/xc16x/div.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/jmpa.s b/gas/testsuite/gas/xc16x/jmpa.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/jmpa.s
rename to gas/testsuite/gas/xc16x/jmpa.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/jmpi.s b/gas/testsuite/gas/xc16x/jmpi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/jmpi.s
rename to gas/testsuite/gas/xc16x/jmpi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/jmpr.s b/gas/testsuite/gas/xc16x/jmpr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/jmpr.s
rename to gas/testsuite/gas/xc16x/jmpr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/mov.s b/gas/testsuite/gas/xc16x/mov.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/mov.s
rename to gas/testsuite/gas/xc16x/mov.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/mov_test.s b/gas/testsuite/gas/xc16x/mov_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/mov_test.s
rename to gas/testsuite/gas/xc16x/mov_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/movb.s b/gas/testsuite/gas/xc16x/movb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/movb.s
rename to gas/testsuite/gas/xc16x/movb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/movbs.s b/gas/testsuite/gas/xc16x/movbs.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/movbs.s
rename to gas/testsuite/gas/xc16x/movbs.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/movbz.s b/gas/testsuite/gas/xc16x/movbz.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/movbz.s
rename to gas/testsuite/gas/xc16x/movbz.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/mul.s b/gas/testsuite/gas/xc16x/mul.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/mul.s
rename to gas/testsuite/gas/xc16x/mul.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/neg.s b/gas/testsuite/gas/xc16x/neg.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/neg.s
rename to gas/testsuite/gas/xc16x/neg.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/nop.s b/gas/testsuite/gas/xc16x/nop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/nop.s
rename to gas/testsuite/gas/xc16x/nop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/or.s b/gas/testsuite/gas/xc16x/or.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/or.s
rename to gas/testsuite/gas/xc16x/or.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/orb.s b/gas/testsuite/gas/xc16x/orb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/orb.s
rename to gas/testsuite/gas/xc16x/orb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/prior.s b/gas/testsuite/gas/xc16x/prior.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/prior.s
rename to gas/testsuite/gas/xc16x/prior.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/pushpop.s b/gas/testsuite/gas/xc16x/pushpop.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/pushpop.s
rename to gas/testsuite/gas/xc16x/pushpop.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/ret.s b/gas/testsuite/gas/xc16x/ret.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/ret.s
rename to gas/testsuite/gas/xc16x/ret.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/scxt.s b/gas/testsuite/gas/xc16x/scxt.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/scxt.s
rename to gas/testsuite/gas/xc16x/scxt.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/shlrol.s b/gas/testsuite/gas/xc16x/shlrol.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/shlrol.s
rename to gas/testsuite/gas/xc16x/shlrol.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/sub.s b/gas/testsuite/gas/xc16x/sub.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/sub.s
rename to gas/testsuite/gas/xc16x/sub.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/sub_test.s b/gas/testsuite/gas/xc16x/sub_test.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/sub_test.s
rename to gas/testsuite/gas/xc16x/sub_test.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/subb.s b/gas/testsuite/gas/xc16x/subb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/subb.s
rename to gas/testsuite/gas/xc16x/subb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/subc.s b/gas/testsuite/gas/xc16x/subc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/subc.s
rename to gas/testsuite/gas/xc16x/subc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/subcb.s b/gas/testsuite/gas/xc16x/subcb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/subcb.s
rename to gas/testsuite/gas/xc16x/subcb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/syscontrol1.s b/gas/testsuite/gas/xc16x/syscontrol1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/syscontrol1.s
rename to gas/testsuite/gas/xc16x/syscontrol1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/syscontrol2.s b/gas/testsuite/gas/xc16x/syscontrol2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/syscontrol2.s
rename to gas/testsuite/gas/xc16x/syscontrol2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/trap.s b/gas/testsuite/gas/xc16x/trap.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/trap.s
rename to gas/testsuite/gas/xc16x/trap.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/xc16x.exp b/gas/testsuite/gas/xc16x/xc16x.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/xc16x.exp
rename to gas/testsuite/gas/xc16x/xc16x.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/xor.s b/gas/testsuite/gas/xc16x/xor.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/xor.s
rename to gas/testsuite/gas/xc16x/xor.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xc16x/xorb.s b/gas/testsuite/gas/xc16x/xorb.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xc16x/xorb.s
rename to gas/testsuite/gas/xc16x/xorb.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.d b/gas/testsuite/gas/xstormy16/allinsn.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.d
rename to gas/testsuite/gas/xstormy16/allinsn.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.exp b/gas/testsuite/gas/xstormy16/allinsn.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.exp
rename to gas/testsuite/gas/xstormy16/allinsn.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.s b/gas/testsuite/gas/xstormy16/allinsn.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.s
rename to gas/testsuite/gas/xstormy16/allinsn.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.sh b/gas/testsuite/gas/xstormy16/allinsn.sh
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/allinsn.sh
rename to gas/testsuite/gas/xstormy16/allinsn.sh
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/gcc.d b/gas/testsuite/gas/xstormy16/gcc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/gcc.d
rename to gas/testsuite/gas/xstormy16/gcc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/gcc.s b/gas/testsuite/gas/xstormy16/gcc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/gcc.s
rename to gas/testsuite/gas/xstormy16/gcc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/gcc.sh b/gas/testsuite/gas/xstormy16/gcc.sh
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/gcc.sh
rename to gas/testsuite/gas/xstormy16/gcc.sh
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-1.d b/gas/testsuite/gas/xstormy16/reloc-1.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-1.d
rename to gas/testsuite/gas/xstormy16/reloc-1.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-1.s b/gas/testsuite/gas/xstormy16/reloc-1.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-1.s
rename to gas/testsuite/gas/xstormy16/reloc-1.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-2.d b/gas/testsuite/gas/xstormy16/reloc-2.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-2.d
rename to gas/testsuite/gas/xstormy16/reloc-2.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-2.s b/gas/testsuite/gas/xstormy16/reloc-2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xstormy16/reloc-2.s
rename to gas/testsuite/gas/xstormy16/reloc-2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/all.exp
rename to gas/testsuite/gas/xtensa/all.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/entry_align.s b/gas/testsuite/gas/xtensa/entry_align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/entry_align.s
rename to gas/testsuite/gas/xtensa/entry_align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/entry_misalign.s b/gas/testsuite/gas/xtensa/entry_misalign.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/entry_misalign.s
rename to gas/testsuite/gas/xtensa/entry_misalign.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/entry_misalign2.s b/gas/testsuite/gas/xtensa/entry_misalign2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/entry_misalign2.s
rename to gas/testsuite/gas/xtensa/entry_misalign2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/err-pcrel.s b/gas/testsuite/gas/xtensa/err-pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/err-pcrel.s
rename to gas/testsuite/gas/xtensa/err-pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/j_too_far.s b/gas/testsuite/gas/xtensa/j_too_far.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/j_too_far.s
rename to gas/testsuite/gas/xtensa/j_too_far.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/jlong.d b/gas/testsuite/gas/xtensa/jlong.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/jlong.d
rename to gas/testsuite/gas/xtensa/jlong.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/jlong.s b/gas/testsuite/gas/xtensa/jlong.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/jlong.s
rename to gas/testsuite/gas/xtensa/jlong.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/loop_align.s b/gas/testsuite/gas/xtensa/loop_align.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/loop_align.s
rename to gas/testsuite/gas/xtensa/loop_align.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/loop_misalign.s b/gas/testsuite/gas/xtensa/loop_misalign.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/loop_misalign.s
rename to gas/testsuite/gas/xtensa/loop_misalign.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/pcrel.d b/gas/testsuite/gas/xtensa/pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/pcrel.d
rename to gas/testsuite/gas/xtensa/pcrel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/pcrel.s b/gas/testsuite/gas/xtensa/pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/pcrel.s
rename to gas/testsuite/gas/xtensa/pcrel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/short_branch_offset.d b/gas/testsuite/gas/xtensa/short_branch_offset.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/short_branch_offset.d
rename to gas/testsuite/gas/xtensa/short_branch_offset.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/short_branch_offset.s b/gas/testsuite/gas/xtensa/short_branch_offset.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/short_branch_offset.s
rename to gas/testsuite/gas/xtensa/short_branch_offset.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/weak-call.d b/gas/testsuite/gas/xtensa/weak-call.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/weak-call.d
rename to gas/testsuite/gas/xtensa/weak-call.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/weak-call.s b/gas/testsuite/gas/xtensa/weak-call.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/weak-call.s
rename to gas/testsuite/gas/xtensa/weak-call.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/xtensa/xtensa-err.exp b/gas/testsuite/gas/xtensa/xtensa-err.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/xtensa/xtensa-err.exp
rename to gas/testsuite/gas/xtensa/xtensa-err.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/arith.d b/gas/testsuite/gas/z80/arith.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/arith.d
rename to gas/testsuite/gas/z80/arith.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/arith.s b/gas/testsuite/gas/z80/arith.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/arith.s
rename to gas/testsuite/gas/z80/arith.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/atend.d b/gas/testsuite/gas/z80/atend.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/atend.d
rename to gas/testsuite/gas/z80/atend.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/atend.s b/gas/testsuite/gas/z80/atend.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/atend.s
rename to gas/testsuite/gas/z80/atend.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/bit.d b/gas/testsuite/gas/z80/bit.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/bit.d
rename to gas/testsuite/gas/z80/bit.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/bit.s b/gas/testsuite/gas/z80/bit.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/bit.s
rename to gas/testsuite/gas/z80/bit.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/block.d b/gas/testsuite/gas/z80/block.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/block.d
rename to gas/testsuite/gas/z80/block.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/block.s b/gas/testsuite/gas/z80/block.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/block.s
rename to gas/testsuite/gas/z80/block.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/branch.d b/gas/testsuite/gas/z80/branch.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/branch.d
rename to gas/testsuite/gas/z80/branch.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/branch.s b/gas/testsuite/gas/z80/branch.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/branch.s
rename to gas/testsuite/gas/z80/branch.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/equ.d b/gas/testsuite/gas/z80/equ.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/equ.d
rename to gas/testsuite/gas/z80/equ.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/equ.s b/gas/testsuite/gas/z80/equ.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/equ.s
rename to gas/testsuite/gas/z80/equ.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/inout.d b/gas/testsuite/gas/z80/inout.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/inout.d
rename to gas/testsuite/gas/z80/inout.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/inout.s b/gas/testsuite/gas/z80/inout.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/inout.s
rename to gas/testsuite/gas/z80/inout.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/ld-group.d b/gas/testsuite/gas/z80/ld-group.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/ld-group.d
rename to gas/testsuite/gas/z80/ld-group.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/ld-group.s b/gas/testsuite/gas/z80/ld-group.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/ld-group.s
rename to gas/testsuite/gas/z80/ld-group.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/misc.d b/gas/testsuite/gas/z80/misc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/misc.d
rename to gas/testsuite/gas/z80/misc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/misc.s b/gas/testsuite/gas/z80/misc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/misc.s
rename to gas/testsuite/gas/z80/misc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/offset.d b/gas/testsuite/gas/z80/offset.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/offset.d
rename to gas/testsuite/gas/z80/offset.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/offset.s b/gas/testsuite/gas/z80/offset.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/offset.s
rename to gas/testsuite/gas/z80/offset.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/quotes.d b/gas/testsuite/gas/z80/quotes.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/quotes.d
rename to gas/testsuite/gas/z80/quotes.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/quotes.s b/gas/testsuite/gas/z80/quotes.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/quotes.s
rename to gas/testsuite/gas/z80/quotes.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/redef.d b/gas/testsuite/gas/z80/redef.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/redef.d
rename to gas/testsuite/gas/z80/redef.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/redef.s b/gas/testsuite/gas/z80/redef.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/redef.s
rename to gas/testsuite/gas/z80/redef.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/rotate.d b/gas/testsuite/gas/z80/rotate.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/rotate.d
rename to gas/testsuite/gas/z80/rotate.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/rotate.s b/gas/testsuite/gas/z80/rotate.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/rotate.s
rename to gas/testsuite/gas/z80/rotate.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/suffix.d b/gas/testsuite/gas/z80/suffix.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/suffix.d
rename to gas/testsuite/gas/z80/suffix.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/suffix.s b/gas/testsuite/gas/z80/suffix.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/suffix.s
rename to gas/testsuite/gas/z80/suffix.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z80/z80.exp b/gas/testsuite/gas/z80/z80.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z80/z80.exp
rename to gas/testsuite/gas/z80/z80.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/calr-backf.s b/gas/testsuite/gas/z8k/calr-backf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/calr-backf.s
rename to gas/testsuite/gas/z8k/calr-backf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/calr-forwf.s b/gas/testsuite/gas/z8k/calr-forwf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/calr-forwf.s
rename to gas/testsuite/gas/z8k/calr-forwf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/calr.d b/gas/testsuite/gas/z8k/calr.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/calr.d
rename to gas/testsuite/gas/z8k/calr.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/calr.s b/gas/testsuite/gas/z8k/calr.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/calr.s
rename to gas/testsuite/gas/z8k/calr.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/ctrl-names.d b/gas/testsuite/gas/z8k/ctrl-names.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/ctrl-names.d
rename to gas/testsuite/gas/z8k/ctrl-names.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/ctrl-names.s b/gas/testsuite/gas/z8k/ctrl-names.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/ctrl-names.s
rename to gas/testsuite/gas/z8k/ctrl-names.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/dec.s b/gas/testsuite/gas/z8k/dec.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/dec.s
rename to gas/testsuite/gas/z8k/dec.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/decbf.s b/gas/testsuite/gas/z8k/decbf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/decbf.s
rename to gas/testsuite/gas/z8k/decbf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/decf.s b/gas/testsuite/gas/z8k/decf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/decf.s
rename to gas/testsuite/gas/z8k/decf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz-backf.s b/gas/testsuite/gas/z8k/djnz-backf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz-backf.s
rename to gas/testsuite/gas/z8k/djnz-backf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz-backf2.s b/gas/testsuite/gas/z8k/djnz-backf2.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz-backf2.s
rename to gas/testsuite/gas/z8k/djnz-backf2.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz.d b/gas/testsuite/gas/z8k/djnz.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz.d
rename to gas/testsuite/gas/z8k/djnz.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz.s b/gas/testsuite/gas/z8k/djnz.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/djnz.s
rename to gas/testsuite/gas/z8k/djnz.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/eidi.s b/gas/testsuite/gas/z8k/eidi.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/eidi.s
rename to gas/testsuite/gas/z8k/eidi.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/eidif.s b/gas/testsuite/gas/z8k/eidif.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/eidif.s
rename to gas/testsuite/gas/z8k/eidif.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/inc.s b/gas/testsuite/gas/z8k/inc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/inc.s
rename to gas/testsuite/gas/z8k/inc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/incbf.s b/gas/testsuite/gas/z8k/incbf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/incbf.s
rename to gas/testsuite/gas/z8k/incbf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/incf.s b/gas/testsuite/gas/z8k/incf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/incf.s
rename to gas/testsuite/gas/z8k/incf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/inout.d b/gas/testsuite/gas/z8k/inout.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/inout.d
rename to gas/testsuite/gas/z8k/inout.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/inout.s b/gas/testsuite/gas/z8k/inout.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/inout.s
rename to gas/testsuite/gas/z8k/inout.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jmp-cc.d b/gas/testsuite/gas/z8k/jmp-cc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jmp-cc.d
rename to gas/testsuite/gas/z8k/jmp-cc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jmp-cc.s b/gas/testsuite/gas/z8k/jmp-cc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jmp-cc.s
rename to gas/testsuite/gas/z8k/jmp-cc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-back.d b/gas/testsuite/gas/z8k/jr-back.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-back.d
rename to gas/testsuite/gas/z8k/jr-back.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-back.s b/gas/testsuite/gas/z8k/jr-back.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-back.s
rename to gas/testsuite/gas/z8k/jr-back.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-backf.s b/gas/testsuite/gas/z8k/jr-backf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-backf.s
rename to gas/testsuite/gas/z8k/jr-backf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-forw.d b/gas/testsuite/gas/z8k/jr-forw.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-forw.d
rename to gas/testsuite/gas/z8k/jr-forw.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-forw.s b/gas/testsuite/gas/z8k/jr-forw.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-forw.s
rename to gas/testsuite/gas/z8k/jr-forw.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-forwf.s b/gas/testsuite/gas/z8k/jr-forwf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/jr-forwf.s
rename to gas/testsuite/gas/z8k/jr-forwf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/ldk.s b/gas/testsuite/gas/z8k/ldk.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/ldk.s
rename to gas/testsuite/gas/z8k/ldk.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/ldkf.s b/gas/testsuite/gas/z8k/ldkf.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/ldkf.s
rename to gas/testsuite/gas/z8k/ldkf.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/reglabel.d b/gas/testsuite/gas/z8k/reglabel.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/reglabel.d
rename to gas/testsuite/gas/z8k/reglabel.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/reglabel.s b/gas/testsuite/gas/z8k/reglabel.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/reglabel.s
rename to gas/testsuite/gas/z8k/reglabel.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/ret-cc.d b/gas/testsuite/gas/z8k/ret-cc.d
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/ret-cc.d
rename to gas/testsuite/gas/z8k/ret-cc.d
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/ret-cc.s b/gas/testsuite/gas/z8k/ret-cc.s
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/ret-cc.s
rename to gas/testsuite/gas/z8k/ret-cc.s
diff --git a/binutils/binutils-2.21/gas/testsuite/gas/z8k/z8k.exp b/gas/testsuite/gas/z8k/z8k.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/gas/z8k/z8k.exp
rename to gas/testsuite/gas/z8k/z8k.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/doboth b/gas/testsuite/lib/doboth
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/doboth
rename to gas/testsuite/lib/doboth
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/doobjcmp b/gas/testsuite/lib/doobjcmp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/doobjcmp
rename to gas/testsuite/lib/doobjcmp
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/dostriptest b/gas/testsuite/lib/dostriptest
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/dostriptest
rename to gas/testsuite/lib/dostriptest
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/dotest b/gas/testsuite/lib/dotest
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/dotest
rename to gas/testsuite/lib/dotest
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/dounsreloc b/gas/testsuite/lib/dounsreloc
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/dounsreloc
rename to gas/testsuite/lib/dounsreloc
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/dounssym b/gas/testsuite/lib/dounssym
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/dounssym
rename to gas/testsuite/lib/dounssym
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/gas-defs.exp
rename to gas/testsuite/lib/gas-defs.exp
diff --git a/binutils/binutils-2.21/gas/testsuite/lib/gas-dg.exp b/gas/testsuite/lib/gas-dg.exp
similarity index 100%
rename from binutils/binutils-2.21/gas/testsuite/lib/gas-dg.exp
rename to gas/testsuite/lib/gas-dg.exp
diff --git a/binutils/binutils-2.21/gas/write.c b/gas/write.c
similarity index 100%
rename from binutils/binutils-2.21/gas/write.c
rename to gas/write.c
diff --git a/binutils/binutils-2.21/gas/write.h b/gas/write.h
similarity index 100%
rename from binutils/binutils-2.21/gas/write.h
rename to gas/write.h
diff --git a/binutils/binutils-2.21/gold/ChangeLog b/gold/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/gold/ChangeLog
rename to gold/ChangeLog
diff --git a/binutils/binutils-2.21/gold/Makefile.am b/gold/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/gold/Makefile.am
rename to gold/Makefile.am
diff --git a/binutils/binutils-2.21/gold/Makefile.in b/gold/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/gold/Makefile.in
rename to gold/Makefile.in
diff --git a/binutils/binutils-2.21/gold/NEWS b/gold/NEWS
similarity index 100%
rename from binutils/binutils-2.21/gold/NEWS
rename to gold/NEWS
diff --git a/binutils/binutils-2.21/gold/README b/gold/README
similarity index 100%
rename from binutils/binutils-2.21/gold/README
rename to gold/README
diff --git a/binutils/binutils-2.21/gold/TODO b/gold/TODO
similarity index 100%
rename from binutils/binutils-2.21/gold/TODO
rename to gold/TODO
diff --git a/binutils/binutils-2.21/gold/aclocal.m4 b/gold/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/gold/aclocal.m4
rename to gold/aclocal.m4
diff --git a/binutils/binutils-2.21/gold/archive.cc b/gold/archive.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/archive.cc
rename to gold/archive.cc
diff --git a/binutils/binutils-2.21/gold/archive.h b/gold/archive.h
similarity index 100%
rename from binutils/binutils-2.21/gold/archive.h
rename to gold/archive.h
diff --git a/binutils/binutils-2.21/gold/arm-reloc-property.cc b/gold/arm-reloc-property.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/arm-reloc-property.cc
rename to gold/arm-reloc-property.cc
diff --git a/binutils/binutils-2.21/gold/arm-reloc-property.h b/gold/arm-reloc-property.h
similarity index 100%
rename from binutils/binutils-2.21/gold/arm-reloc-property.h
rename to gold/arm-reloc-property.h
diff --git a/binutils/binutils-2.21/gold/arm-reloc.def b/gold/arm-reloc.def
similarity index 100%
rename from binutils/binutils-2.21/gold/arm-reloc.def
rename to gold/arm-reloc.def
diff --git a/binutils/binutils-2.21/gold/arm.cc b/gold/arm.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/arm.cc
rename to gold/arm.cc
diff --git a/binutils/binutils-2.21/gold/attributes.cc b/gold/attributes.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/attributes.cc
rename to gold/attributes.cc
diff --git a/binutils/binutils-2.21/gold/attributes.h b/gold/attributes.h
similarity index 100%
rename from binutils/binutils-2.21/gold/attributes.h
rename to gold/attributes.h
diff --git a/binutils/binutils-2.21/gold/binary.cc b/gold/binary.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/binary.cc
rename to gold/binary.cc
diff --git a/binutils/binutils-2.21/gold/binary.h b/gold/binary.h
similarity index 100%
rename from binutils/binutils-2.21/gold/binary.h
rename to gold/binary.h
diff --git a/binutils/binutils-2.21/gold/common.cc b/gold/common.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/common.cc
rename to gold/common.cc
diff --git a/binutils/binutils-2.21/gold/common.h b/gold/common.h
similarity index 100%
rename from binutils/binutils-2.21/gold/common.h
rename to gold/common.h
diff --git a/binutils/binutils-2.21/gold/compressed_output.cc b/gold/compressed_output.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/compressed_output.cc
rename to gold/compressed_output.cc
diff --git a/binutils/binutils-2.21/gold/compressed_output.h b/gold/compressed_output.h
similarity index 100%
rename from binutils/binutils-2.21/gold/compressed_output.h
rename to gold/compressed_output.h
diff --git a/binutils/binutils-2.21/gold/config.in b/gold/config.in
similarity index 100%
rename from binutils/binutils-2.21/gold/config.in
rename to gold/config.in
diff --git a/binutils/binutils-2.21/gold/configure b/gold/configure
similarity index 100%
rename from binutils/binutils-2.21/gold/configure
rename to gold/configure
diff --git a/binutils/binutils-2.21/gold/configure.ac b/gold/configure.ac
similarity index 100%
rename from binutils/binutils-2.21/gold/configure.ac
rename to gold/configure.ac
diff --git a/binutils/binutils-2.21/gold/configure.tgt b/gold/configure.tgt
similarity index 100%
rename from binutils/binutils-2.21/gold/configure.tgt
rename to gold/configure.tgt
diff --git a/binutils/binutils-2.21/gold/copy-relocs.cc b/gold/copy-relocs.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/copy-relocs.cc
rename to gold/copy-relocs.cc
diff --git a/binutils/binutils-2.21/gold/copy-relocs.h b/gold/copy-relocs.h
similarity index 100%
rename from binutils/binutils-2.21/gold/copy-relocs.h
rename to gold/copy-relocs.h
diff --git a/binutils/binutils-2.21/gold/cref.cc b/gold/cref.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/cref.cc
rename to gold/cref.cc
diff --git a/binutils/binutils-2.21/gold/cref.h b/gold/cref.h
similarity index 100%
rename from binutils/binutils-2.21/gold/cref.h
rename to gold/cref.h
diff --git a/binutils/binutils-2.21/gold/debug.h b/gold/debug.h
similarity index 100%
rename from binutils/binutils-2.21/gold/debug.h
rename to gold/debug.h
diff --git a/binutils/binutils-2.21/gold/defstd.cc b/gold/defstd.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/defstd.cc
rename to gold/defstd.cc
diff --git a/binutils/binutils-2.21/gold/defstd.h b/gold/defstd.h
similarity index 100%
rename from binutils/binutils-2.21/gold/defstd.h
rename to gold/defstd.h
diff --git a/binutils/binutils-2.21/gold/descriptors.cc b/gold/descriptors.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/descriptors.cc
rename to gold/descriptors.cc
diff --git a/binutils/binutils-2.21/gold/descriptors.h b/gold/descriptors.h
similarity index 100%
rename from binutils/binutils-2.21/gold/descriptors.h
rename to gold/descriptors.h
diff --git a/binutils/binutils-2.21/gold/dirsearch.cc b/gold/dirsearch.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/dirsearch.cc
rename to gold/dirsearch.cc
diff --git a/binutils/binutils-2.21/gold/dirsearch.h b/gold/dirsearch.h
similarity index 100%
rename from binutils/binutils-2.21/gold/dirsearch.h
rename to gold/dirsearch.h
diff --git a/binutils/binutils-2.21/gold/dwarf_reader.cc b/gold/dwarf_reader.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/dwarf_reader.cc
rename to gold/dwarf_reader.cc
diff --git a/binutils/binutils-2.21/gold/dwarf_reader.h b/gold/dwarf_reader.h
similarity index 100%
rename from binutils/binutils-2.21/gold/dwarf_reader.h
rename to gold/dwarf_reader.h
diff --git a/binutils/binutils-2.21/gold/dynobj.cc b/gold/dynobj.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/dynobj.cc
rename to gold/dynobj.cc
diff --git a/binutils/binutils-2.21/gold/dynobj.h b/gold/dynobj.h
similarity index 100%
rename from binutils/binutils-2.21/gold/dynobj.h
rename to gold/dynobj.h
diff --git a/binutils/binutils-2.21/gold/ehframe.cc b/gold/ehframe.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/ehframe.cc
rename to gold/ehframe.cc
diff --git a/binutils/binutils-2.21/gold/ehframe.h b/gold/ehframe.h
similarity index 100%
rename from binutils/binutils-2.21/gold/ehframe.h
rename to gold/ehframe.h
diff --git a/binutils/binutils-2.21/gold/errors.cc b/gold/errors.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/errors.cc
rename to gold/errors.cc
diff --git a/binutils/binutils-2.21/gold/errors.h b/gold/errors.h
similarity index 100%
rename from binutils/binutils-2.21/gold/errors.h
rename to gold/errors.h
diff --git a/binutils/binutils-2.21/gold/expression.cc b/gold/expression.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/expression.cc
rename to gold/expression.cc
diff --git a/binutils/binutils-2.21/gold/ffsll.c b/gold/ffsll.c
similarity index 100%
rename from binutils/binutils-2.21/gold/ffsll.c
rename to gold/ffsll.c
diff --git a/binutils/binutils-2.21/gold/fileread.cc b/gold/fileread.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/fileread.cc
rename to gold/fileread.cc
diff --git a/binutils/binutils-2.21/gold/fileread.h b/gold/fileread.h
similarity index 100%
rename from binutils/binutils-2.21/gold/fileread.h
rename to gold/fileread.h
diff --git a/binutils/binutils-2.21/gold/freebsd.h b/gold/freebsd.h
similarity index 100%
rename from binutils/binutils-2.21/gold/freebsd.h
rename to gold/freebsd.h
diff --git a/binutils/binutils-2.21/gold/ftruncate.c b/gold/ftruncate.c
similarity index 100%
rename from binutils/binutils-2.21/gold/ftruncate.c
rename to gold/ftruncate.c
diff --git a/binutils/binutils-2.21/gold/gc.cc b/gold/gc.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/gc.cc
rename to gold/gc.cc
diff --git a/binutils/binutils-2.21/gold/gc.h b/gold/gc.h
similarity index 100%
rename from binutils/binutils-2.21/gold/gc.h
rename to gold/gc.h
diff --git a/binutils/binutils-2.21/gold/gold-threads.cc b/gold/gold-threads.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/gold-threads.cc
rename to gold/gold-threads.cc
diff --git a/binutils/binutils-2.21/gold/gold-threads.h b/gold/gold-threads.h
similarity index 100%
rename from binutils/binutils-2.21/gold/gold-threads.h
rename to gold/gold-threads.h
diff --git a/binutils/binutils-2.21/gold/gold.cc b/gold/gold.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/gold.cc
rename to gold/gold.cc
diff --git a/binutils/binutils-2.21/gold/gold.h b/gold/gold.h
similarity index 100%
rename from binutils/binutils-2.21/gold/gold.h
rename to gold/gold.h
diff --git a/binutils/binutils-2.21/gold/i386.cc b/gold/i386.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/i386.cc
rename to gold/i386.cc
diff --git a/binutils/binutils-2.21/gold/icf.cc b/gold/icf.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/icf.cc
rename to gold/icf.cc
diff --git a/binutils/binutils-2.21/gold/icf.h b/gold/icf.h
similarity index 100%
rename from binutils/binutils-2.21/gold/icf.h
rename to gold/icf.h
diff --git a/binutils/binutils-2.21/gold/incremental-dump.cc b/gold/incremental-dump.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/incremental-dump.cc
rename to gold/incremental-dump.cc
diff --git a/binutils/binutils-2.21/gold/incremental.cc b/gold/incremental.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/incremental.cc
rename to gold/incremental.cc
diff --git a/binutils/binutils-2.21/gold/incremental.h b/gold/incremental.h
similarity index 100%
rename from binutils/binutils-2.21/gold/incremental.h
rename to gold/incremental.h
diff --git a/binutils/binutils-2.21/gold/int_encoding.cc b/gold/int_encoding.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/int_encoding.cc
rename to gold/int_encoding.cc
diff --git a/binutils/binutils-2.21/gold/int_encoding.h b/gold/int_encoding.h
similarity index 100%
rename from binutils/binutils-2.21/gold/int_encoding.h
rename to gold/int_encoding.h
diff --git a/binutils/binutils-2.21/gold/layout.cc b/gold/layout.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/layout.cc
rename to gold/layout.cc
diff --git a/binutils/binutils-2.21/gold/layout.h b/gold/layout.h
similarity index 100%
rename from binutils/binutils-2.21/gold/layout.h
rename to gold/layout.h
diff --git a/binutils/binutils-2.21/gold/main.cc b/gold/main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/main.cc
rename to gold/main.cc
diff --git a/binutils/binutils-2.21/gold/mapfile.cc b/gold/mapfile.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/mapfile.cc
rename to gold/mapfile.cc
diff --git a/binutils/binutils-2.21/gold/mapfile.h b/gold/mapfile.h
similarity index 100%
rename from binutils/binutils-2.21/gold/mapfile.h
rename to gold/mapfile.h
diff --git a/binutils/binutils-2.21/gold/merge.cc b/gold/merge.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/merge.cc
rename to gold/merge.cc
diff --git a/binutils/binutils-2.21/gold/merge.h b/gold/merge.h
similarity index 100%
rename from binutils/binutils-2.21/gold/merge.h
rename to gold/merge.h
diff --git a/binutils/binutils-2.21/gold/mremap.c b/gold/mremap.c
similarity index 100%
rename from binutils/binutils-2.21/gold/mremap.c
rename to gold/mremap.c
diff --git a/binutils/binutils-2.21/gold/object.cc b/gold/object.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/object.cc
rename to gold/object.cc
diff --git a/binutils/binutils-2.21/gold/object.h b/gold/object.h
similarity index 100%
rename from binutils/binutils-2.21/gold/object.h
rename to gold/object.h
diff --git a/binutils/binutils-2.21/gold/options.cc b/gold/options.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/options.cc
rename to gold/options.cc
diff --git a/binutils/binutils-2.21/gold/options.h b/gold/options.h
similarity index 100%
rename from binutils/binutils-2.21/gold/options.h
rename to gold/options.h
diff --git a/binutils/binutils-2.21/gold/output.cc b/gold/output.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/output.cc
rename to gold/output.cc
diff --git a/binutils/binutils-2.21/gold/output.h b/gold/output.h
similarity index 100%
rename from binutils/binutils-2.21/gold/output.h
rename to gold/output.h
diff --git a/binutils/binutils-2.21/gold/parameters.cc b/gold/parameters.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/parameters.cc
rename to gold/parameters.cc
diff --git a/binutils/binutils-2.21/gold/parameters.h b/gold/parameters.h
similarity index 100%
rename from binutils/binutils-2.21/gold/parameters.h
rename to gold/parameters.h
diff --git a/binutils/binutils-2.21/gold/plugin.cc b/gold/plugin.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/plugin.cc
rename to gold/plugin.cc
diff --git a/binutils/binutils-2.21/gold/plugin.h b/gold/plugin.h
similarity index 100%
rename from binutils/binutils-2.21/gold/plugin.h
rename to gold/plugin.h
diff --git a/binutils/binutils-2.21/gold/po/Make-in b/gold/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/gold/po/Make-in
rename to gold/po/Make-in
diff --git a/binutils/binutils-2.21/gold/po/POTFILES.in b/gold/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/gold/po/POTFILES.in
rename to gold/po/POTFILES.in
diff --git a/binutils/binutils-2.21/gold/po/es.gmo b/gold/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/gold/po/es.gmo
rename to gold/po/es.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gold/po/es.po b/gold/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/gold/po/es.po
rename to gold/po/es.po
diff --git a/binutils/binutils-2.21/gold/po/fi.gmo b/gold/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/gold/po/fi.gmo
rename to gold/po/fi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gold/po/fi.po b/gold/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/gold/po/fi.po
rename to gold/po/fi.po
diff --git a/binutils/binutils-2.21/gold/po/gold.pot b/gold/po/gold.pot
similarity index 100%
rename from binutils/binutils-2.21/gold/po/gold.pot
rename to gold/po/gold.pot
diff --git a/binutils/binutils-2.21/gold/po/id.gmo b/gold/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/gold/po/id.gmo
rename to gold/po/id.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gold/po/id.po b/gold/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/gold/po/id.po
rename to gold/po/id.po
diff --git a/binutils/binutils-2.21/gold/po/vi.gmo b/gold/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/gold/po/vi.gmo
rename to gold/po/vi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gold/po/vi.po b/gold/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/gold/po/vi.po
rename to gold/po/vi.po
diff --git a/binutils/binutils-2.21/gold/powerpc.cc b/gold/powerpc.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/powerpc.cc
rename to gold/powerpc.cc
diff --git a/binutils/binutils-2.21/gold/pread.c b/gold/pread.c
similarity index 100%
rename from binutils/binutils-2.21/gold/pread.c
rename to gold/pread.c
diff --git a/binutils/binutils-2.21/gold/readsyms.cc b/gold/readsyms.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/readsyms.cc
rename to gold/readsyms.cc
diff --git a/binutils/binutils-2.21/gold/readsyms.h b/gold/readsyms.h
similarity index 100%
rename from binutils/binutils-2.21/gold/readsyms.h
rename to gold/readsyms.h
diff --git a/binutils/binutils-2.21/gold/reduced_debug_output.cc b/gold/reduced_debug_output.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/reduced_debug_output.cc
rename to gold/reduced_debug_output.cc
diff --git a/binutils/binutils-2.21/gold/reduced_debug_output.h b/gold/reduced_debug_output.h
similarity index 100%
rename from binutils/binutils-2.21/gold/reduced_debug_output.h
rename to gold/reduced_debug_output.h
diff --git a/binutils/binutils-2.21/gold/reloc-types.h b/gold/reloc-types.h
similarity index 100%
rename from binutils/binutils-2.21/gold/reloc-types.h
rename to gold/reloc-types.h
diff --git a/binutils/binutils-2.21/gold/reloc.cc b/gold/reloc.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/reloc.cc
rename to gold/reloc.cc
diff --git a/binutils/binutils-2.21/gold/reloc.h b/gold/reloc.h
similarity index 100%
rename from binutils/binutils-2.21/gold/reloc.h
rename to gold/reloc.h
diff --git a/binutils/binutils-2.21/gold/resolve.cc b/gold/resolve.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/resolve.cc
rename to gold/resolve.cc
diff --git a/binutils/binutils-2.21/gold/script-c.h b/gold/script-c.h
similarity index 100%
rename from binutils/binutils-2.21/gold/script-c.h
rename to gold/script-c.h
diff --git a/binutils/binutils-2.21/gold/script-sections.cc b/gold/script-sections.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/script-sections.cc
rename to gold/script-sections.cc
diff --git a/binutils/binutils-2.21/gold/script-sections.h b/gold/script-sections.h
similarity index 100%
rename from binutils/binutils-2.21/gold/script-sections.h
rename to gold/script-sections.h
diff --git a/binutils/binutils-2.21/gold/script.cc b/gold/script.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/script.cc
rename to gold/script.cc
diff --git a/binutils/binutils-2.21/gold/script.h b/gold/script.h
similarity index 100%
rename from binutils/binutils-2.21/gold/script.h
rename to gold/script.h
diff --git a/binutils/binutils-2.21/gold/sparc.cc b/gold/sparc.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/sparc.cc
rename to gold/sparc.cc
diff --git a/binutils/binutils-2.21/gold/stringpool.cc b/gold/stringpool.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/stringpool.cc
rename to gold/stringpool.cc
diff --git a/binutils/binutils-2.21/gold/stringpool.h b/gold/stringpool.h
similarity index 100%
rename from binutils/binutils-2.21/gold/stringpool.h
rename to gold/stringpool.h
diff --git a/binutils/binutils-2.21/gold/symtab.cc b/gold/symtab.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/symtab.cc
rename to gold/symtab.cc
diff --git a/binutils/binutils-2.21/gold/symtab.h b/gold/symtab.h
similarity index 100%
rename from binutils/binutils-2.21/gold/symtab.h
rename to gold/symtab.h
diff --git a/binutils/binutils-2.21/gold/target-reloc.h b/gold/target-reloc.h
similarity index 100%
rename from binutils/binutils-2.21/gold/target-reloc.h
rename to gold/target-reloc.h
diff --git a/binutils/binutils-2.21/gold/target-select.cc b/gold/target-select.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/target-select.cc
rename to gold/target-select.cc
diff --git a/binutils/binutils-2.21/gold/target-select.h b/gold/target-select.h
similarity index 100%
rename from binutils/binutils-2.21/gold/target-select.h
rename to gold/target-select.h
diff --git a/binutils/binutils-2.21/gold/target.cc b/gold/target.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/target.cc
rename to gold/target.cc
diff --git a/binutils/binutils-2.21/gold/target.h b/gold/target.h
similarity index 100%
rename from binutils/binutils-2.21/gold/target.h
rename to gold/target.h
diff --git a/binutils/binutils-2.21/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/Makefile.am
rename to gold/testsuite/Makefile.am
diff --git a/binutils/binutils-2.21/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/Makefile.in
rename to gold/testsuite/Makefile.in
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_abs_global.s b/gold/testsuite/arm_abs_global.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_abs_global.s
rename to gold/testsuite/arm_abs_global.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_abs_global.sh b/gold/testsuite/arm_abs_global.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_abs_global.sh
rename to gold/testsuite/arm_abs_global.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_abs_lib.s b/gold/testsuite/arm_abs_lib.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_abs_lib.s
rename to gold/testsuite/arm_abs_lib.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_attr_merge.sh b/gold/testsuite/arm_attr_merge.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_attr_merge.sh
rename to gold/testsuite/arm_attr_merge.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_attr_merge_6a.s b/gold/testsuite/arm_attr_merge_6a.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_attr_merge_6a.s
rename to gold/testsuite/arm_attr_merge_6a.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_attr_merge_6b.s b/gold/testsuite/arm_attr_merge_6b.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_attr_merge_6b.s
rename to gold/testsuite/arm_attr_merge_6b.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_attr_merge_7a.s b/gold/testsuite/arm_attr_merge_7a.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_attr_merge_7a.s
rename to gold/testsuite/arm_attr_merge_7a.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_attr_merge_7b.s b/gold/testsuite/arm_attr_merge_7b.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_attr_merge_7b.s
rename to gold/testsuite/arm_attr_merge_7b.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_bl_in_range.s b/gold/testsuite/arm_bl_in_range.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_bl_in_range.s
rename to gold/testsuite/arm_bl_in_range.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_bl_out_of_range.s b/gold/testsuite/arm_bl_out_of_range.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_bl_out_of_range.s
rename to gold/testsuite/arm_bl_out_of_range.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_branch_in_range.sh b/gold/testsuite/arm_branch_in_range.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_branch_in_range.sh
rename to gold/testsuite/arm_branch_in_range.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_branch_out_of_range.sh b/gold/testsuite/arm_branch_out_of_range.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_branch_out_of_range.sh
rename to gold/testsuite/arm_branch_out_of_range.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_branch_range.t b/gold/testsuite/arm_branch_range.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_branch_range.t
rename to gold/testsuite/arm_branch_range.t
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8.sh b/gold/testsuite/arm_cortex_a8.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8.sh
rename to gold/testsuite/arm_cortex_a8.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_b.s b/gold/testsuite/arm_cortex_a8_b.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_b.s
rename to gold/testsuite/arm_cortex_a8_b.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_b_cond.s b/gold/testsuite/arm_cortex_a8_b_cond.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_b_cond.s
rename to gold/testsuite/arm_cortex_a8_b_cond.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_b_local.s b/gold/testsuite/arm_cortex_a8_b_local.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_b_local.s
rename to gold/testsuite/arm_cortex_a8_b_local.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_bl.s b/gold/testsuite/arm_cortex_a8_bl.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_bl.s
rename to gold/testsuite/arm_cortex_a8_bl.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_blx.s b/gold/testsuite/arm_cortex_a8_blx.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_blx.s
rename to gold/testsuite/arm_cortex_a8_blx.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_local.s b/gold/testsuite/arm_cortex_a8_local.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_local.s
rename to gold/testsuite/arm_cortex_a8_local.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_local_reloc.s b/gold/testsuite/arm_cortex_a8_local_reloc.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_cortex_a8_local_reloc.s
rename to gold/testsuite/arm_cortex_a8_local_reloc.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_exidx_test.s b/gold/testsuite/arm_exidx_test.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_exidx_test.s
rename to gold/testsuite/arm_exidx_test.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_exidx_test.sh b/gold/testsuite/arm_exidx_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_exidx_test.sh
rename to gold/testsuite/arm_exidx_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_fix_v4bx.s b/gold/testsuite/arm_fix_v4bx.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_fix_v4bx.s
rename to gold/testsuite/arm_fix_v4bx.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_fix_v4bx.sh b/gold/testsuite/arm_fix_v4bx.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_fix_v4bx.sh
rename to gold/testsuite/arm_fix_v4bx.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_thm_jump11.s b/gold/testsuite/arm_thm_jump11.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_thm_jump11.s
rename to gold/testsuite/arm_thm_jump11.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_thm_jump11.t b/gold/testsuite/arm_thm_jump11.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_thm_jump11.t
rename to gold/testsuite/arm_thm_jump11.t
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_thm_jump8.s b/gold/testsuite/arm_thm_jump8.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_thm_jump8.s
rename to gold/testsuite/arm_thm_jump8.s
diff --git a/binutils/binutils-2.21/gold/testsuite/arm_thm_jump8.t b/gold/testsuite/arm_thm_jump8.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/arm_thm_jump8.t
rename to gold/testsuite/arm_thm_jump8.t
diff --git a/binutils/binutils-2.21/gold/testsuite/basic_test.cc b/gold/testsuite/basic_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/basic_test.cc
rename to gold/testsuite/basic_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/binary.in b/gold/testsuite/binary.in
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/binary.in
rename to gold/testsuite/binary.in
diff --git a/binutils/binutils-2.21/gold/testsuite/binary_test.cc b/gold/testsuite/binary_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/binary_test.cc
rename to gold/testsuite/binary_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/binary_unittest.cc b/gold/testsuite/binary_unittest.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/binary_unittest.cc
rename to gold/testsuite/binary_unittest.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/common_test_1.c b/gold/testsuite/common_test_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/common_test_1.c
rename to gold/testsuite/common_test_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/common_test_1_v1.c b/gold/testsuite/common_test_1_v1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/common_test_1_v1.c
rename to gold/testsuite/common_test_1_v1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/common_test_1_v2.c b/gold/testsuite/common_test_1_v2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/common_test_1_v2.c
rename to gold/testsuite/common_test_1_v2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/common_test_2.c b/gold/testsuite/common_test_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/common_test_2.c
rename to gold/testsuite/common_test_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/common_test_3.c b/gold/testsuite/common_test_3.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/common_test_3.c
rename to gold/testsuite/common_test_3.c
diff --git a/binutils/binutils-2.21/gold/testsuite/constructor_test.cc b/gold/testsuite/constructor_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/constructor_test.cc
rename to gold/testsuite/constructor_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/copy_test.cc b/gold/testsuite/copy_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/copy_test.cc
rename to gold/testsuite/copy_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/copy_test_1.cc b/gold/testsuite/copy_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/copy_test_1.cc
rename to gold/testsuite/copy_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/copy_test_2.cc b/gold/testsuite/copy_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/copy_test_2.cc
rename to gold/testsuite/copy_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/copy_test_v1.cc b/gold/testsuite/copy_test_v1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/copy_test_v1.cc
rename to gold/testsuite/copy_test_v1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/debug_msg.cc b/gold/testsuite/debug_msg.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/debug_msg.cc
rename to gold/testsuite/debug_msg.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/debug_msg.sh b/gold/testsuite/debug_msg.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/debug_msg.sh
rename to gold/testsuite/debug_msg.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/discard_locals_relocatable_test.c b/gold/testsuite/discard_locals_relocatable_test.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/discard_locals_relocatable_test.c
rename to gold/testsuite/discard_locals_relocatable_test.c
diff --git a/binutils/binutils-2.21/gold/testsuite/discard_locals_test.c b/gold/testsuite/discard_locals_test.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/discard_locals_test.c
rename to gold/testsuite/discard_locals_test.c
diff --git a/binutils/binutils-2.21/gold/testsuite/discard_locals_test.sh b/gold/testsuite/discard_locals_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/discard_locals_test.sh
rename to gold/testsuite/discard_locals_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/dyn_weak_ref.sh b/gold/testsuite/dyn_weak_ref.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/dyn_weak_ref.sh
rename to gold/testsuite/dyn_weak_ref.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/dyn_weak_ref_1.c b/gold/testsuite/dyn_weak_ref_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/dyn_weak_ref_1.c
rename to gold/testsuite/dyn_weak_ref_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/dyn_weak_ref_2.c b/gold/testsuite/dyn_weak_ref_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/dyn_weak_ref_2.c
rename to gold/testsuite/dyn_weak_ref_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/dynamic_list.sh b/gold/testsuite/dynamic_list.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/dynamic_list.sh
rename to gold/testsuite/dynamic_list.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/dynamic_list.t b/gold/testsuite/dynamic_list.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/dynamic_list.t
rename to gold/testsuite/dynamic_list.t
diff --git a/binutils/binutils-2.21/gold/testsuite/exception_test.h b/gold/testsuite/exception_test.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exception_test.h
rename to gold/testsuite/exception_test.h
diff --git a/binutils/binutils-2.21/gold/testsuite/exception_test_1.cc b/gold/testsuite/exception_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exception_test_1.cc
rename to gold/testsuite/exception_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/exception_test_2.cc b/gold/testsuite/exception_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exception_test_2.cc
rename to gold/testsuite/exception_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/exception_test_main.cc b/gold/testsuite/exception_test_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exception_test_main.cc
rename to gold/testsuite/exception_test_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/exclude_libs_test.c b/gold/testsuite/exclude_libs_test.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exclude_libs_test.c
rename to gold/testsuite/exclude_libs_test.c
diff --git a/binutils/binutils-2.21/gold/testsuite/exclude_libs_test.sh b/gold/testsuite/exclude_libs_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exclude_libs_test.sh
rename to gold/testsuite/exclude_libs_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/exclude_libs_test_1.c b/gold/testsuite/exclude_libs_test_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exclude_libs_test_1.c
rename to gold/testsuite/exclude_libs_test_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/exclude_libs_test_2.c b/gold/testsuite/exclude_libs_test_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exclude_libs_test_2.c
rename to gold/testsuite/exclude_libs_test_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/exclude_libs_test_3.c b/gold/testsuite/exclude_libs_test_3.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/exclude_libs_test_3.c
rename to gold/testsuite/exclude_libs_test_3.c
diff --git a/binutils/binutils-2.21/gold/testsuite/final_layout.cc b/gold/testsuite/final_layout.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/final_layout.cc
rename to gold/testsuite/final_layout.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/final_layout.sh b/gold/testsuite/final_layout.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/final_layout.sh
rename to gold/testsuite/final_layout.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/gc_comdat_test.sh b/gold/testsuite/gc_comdat_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/gc_comdat_test.sh
rename to gold/testsuite/gc_comdat_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/gc_comdat_test_1.cc b/gold/testsuite/gc_comdat_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/gc_comdat_test_1.cc
rename to gold/testsuite/gc_comdat_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/gc_comdat_test_2.cc b/gold/testsuite/gc_comdat_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/gc_comdat_test_2.cc
rename to gold/testsuite/gc_comdat_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/gc_orphan_section_test.cc b/gold/testsuite/gc_orphan_section_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/gc_orphan_section_test.cc
rename to gold/testsuite/gc_orphan_section_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/gc_orphan_section_test.sh b/gold/testsuite/gc_orphan_section_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/gc_orphan_section_test.sh
rename to gold/testsuite/gc_orphan_section_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/gc_tls_test.cc b/gold/testsuite/gc_tls_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/gc_tls_test.cc
rename to gold/testsuite/gc_tls_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/gc_tls_test.sh b/gold/testsuite/gc_tls_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/gc_tls_test.sh
rename to gold/testsuite/gc_tls_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/hidden_test.sh b/gold/testsuite/hidden_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/hidden_test.sh
rename to gold/testsuite/hidden_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/hidden_test_1.c b/gold/testsuite/hidden_test_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/hidden_test_1.c
rename to gold/testsuite/hidden_test_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/hidden_test_main.c b/gold/testsuite/hidden_test_main.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/hidden_test_main.c
rename to gold/testsuite/hidden_test_main.c
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_keep_unique_test.cc b/gold/testsuite/icf_keep_unique_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_keep_unique_test.cc
rename to gold/testsuite/icf_keep_unique_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_keep_unique_test.sh b/gold/testsuite/icf_keep_unique_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_keep_unique_test.sh
rename to gold/testsuite/icf_keep_unique_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_preemptible_functions_test.cc b/gold/testsuite/icf_preemptible_functions_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_preemptible_functions_test.cc
rename to gold/testsuite/icf_preemptible_functions_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_preemptible_functions_test.sh b/gold/testsuite/icf_preemptible_functions_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_preemptible_functions_test.sh
rename to gold/testsuite/icf_preemptible_functions_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_safe_so_test.cc b/gold/testsuite/icf_safe_so_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_safe_so_test.cc
rename to gold/testsuite/icf_safe_so_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_safe_so_test.sh b/gold/testsuite/icf_safe_so_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_safe_so_test.sh
rename to gold/testsuite/icf_safe_so_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_safe_test.cc b/gold/testsuite/icf_safe_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_safe_test.cc
rename to gold/testsuite/icf_safe_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_safe_test.sh b/gold/testsuite/icf_safe_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_safe_test.sh
rename to gold/testsuite/icf_safe_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_sht_rel_addend_test.sh b/gold/testsuite/icf_sht_rel_addend_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_sht_rel_addend_test.sh
rename to gold/testsuite/icf_sht_rel_addend_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_sht_rel_addend_test_1.cc b/gold/testsuite/icf_sht_rel_addend_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_sht_rel_addend_test_1.cc
rename to gold/testsuite/icf_sht_rel_addend_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_sht_rel_addend_test_2.cc b/gold/testsuite/icf_sht_rel_addend_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_sht_rel_addend_test_2.cc
rename to gold/testsuite/icf_sht_rel_addend_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_string_merge_test.cc b/gold/testsuite/icf_string_merge_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_string_merge_test.cc
rename to gold/testsuite/icf_string_merge_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_string_merge_test.sh b/gold/testsuite/icf_string_merge_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_string_merge_test.sh
rename to gold/testsuite/icf_string_merge_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_test.cc b/gold/testsuite/icf_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_test.cc
rename to gold/testsuite/icf_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_test.sh b/gold/testsuite/icf_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_test.sh
rename to gold/testsuite/icf_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/icf_virtual_function_folding_test.cc b/gold/testsuite/icf_virtual_function_folding_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/icf_virtual_function_folding_test.cc
rename to gold/testsuite/icf_virtual_function_folding_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ifunc-sel.h b/gold/testsuite/ifunc-sel.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifunc-sel.h
rename to gold/testsuite/ifunc-sel.h
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncdep2.c b/gold/testsuite/ifuncdep2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncdep2.c
rename to gold/testsuite/ifuncdep2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain1.c b/gold/testsuite/ifuncmain1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain1.c
rename to gold/testsuite/ifuncmain1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain1vis.c b/gold/testsuite/ifuncmain1vis.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain1vis.c
rename to gold/testsuite/ifuncmain1vis.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain2.c b/gold/testsuite/ifuncmain2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain2.c
rename to gold/testsuite/ifuncmain2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain3.c b/gold/testsuite/ifuncmain3.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain3.c
rename to gold/testsuite/ifuncmain3.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain4.c b/gold/testsuite/ifuncmain4.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain4.c
rename to gold/testsuite/ifuncmain4.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain5.c b/gold/testsuite/ifuncmain5.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain5.c
rename to gold/testsuite/ifuncmain5.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain6pie.c b/gold/testsuite/ifuncmain6pie.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain6pie.c
rename to gold/testsuite/ifuncmain6pie.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmain7.c b/gold/testsuite/ifuncmain7.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmain7.c
rename to gold/testsuite/ifuncmain7.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmod1.c b/gold/testsuite/ifuncmod1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmod1.c
rename to gold/testsuite/ifuncmod1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmod3.c b/gold/testsuite/ifuncmod3.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmod3.c
rename to gold/testsuite/ifuncmod3.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmod5.c b/gold/testsuite/ifuncmod5.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmod5.c
rename to gold/testsuite/ifuncmod5.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ifuncmod6.c b/gold/testsuite/ifuncmod6.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ifuncmod6.c
rename to gold/testsuite/ifuncmod6.c
diff --git a/binutils/binutils-2.21/gold/testsuite/incremental_test.sh b/gold/testsuite/incremental_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/incremental_test.sh
rename to gold/testsuite/incremental_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/incremental_test_1.c b/gold/testsuite/incremental_test_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/incremental_test_1.c
rename to gold/testsuite/incremental_test_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/incremental_test_2.c b/gold/testsuite/incremental_test_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/incremental_test_2.c
rename to gold/testsuite/incremental_test_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/initpri1.c b/gold/testsuite/initpri1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/initpri1.c
rename to gold/testsuite/initpri1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/justsyms.t b/gold/testsuite/justsyms.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/justsyms.t
rename to gold/testsuite/justsyms.t
diff --git a/binutils/binutils-2.21/gold/testsuite/justsyms_1.cc b/gold/testsuite/justsyms_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/justsyms_1.cc
rename to gold/testsuite/justsyms_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/justsyms_2.cc b/gold/testsuite/justsyms_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/justsyms_2.cc
rename to gold/testsuite/justsyms_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/justsyms_exec.c b/gold/testsuite/justsyms_exec.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/justsyms_exec.c
rename to gold/testsuite/justsyms_exec.c
diff --git a/binutils/binutils-2.21/gold/testsuite/justsyms_lib.c b/gold/testsuite/justsyms_lib.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/justsyms_lib.c
rename to gold/testsuite/justsyms_lib.c
diff --git a/binutils/binutils-2.21/gold/testsuite/large.c b/gold/testsuite/large.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/large.c
rename to gold/testsuite/large.c
diff --git a/binutils/binutils-2.21/gold/testsuite/many_sections_test.cc b/gold/testsuite/many_sections_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/many_sections_test.cc
rename to gold/testsuite/many_sections_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/memory_test.s b/gold/testsuite/memory_test.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/memory_test.s
rename to gold/testsuite/memory_test.s
diff --git a/binutils/binutils-2.21/gold/testsuite/memory_test.sh b/gold/testsuite/memory_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/memory_test.sh
rename to gold/testsuite/memory_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/memory_test.t b/gold/testsuite/memory_test.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/memory_test.t
rename to gold/testsuite/memory_test.t
diff --git a/binutils/binutils-2.21/gold/testsuite/no_version_test.c b/gold/testsuite/no_version_test.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/no_version_test.c
rename to gold/testsuite/no_version_test.c
diff --git a/binutils/binutils-2.21/gold/testsuite/no_version_test.sh b/gold/testsuite/no_version_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/no_version_test.sh
rename to gold/testsuite/no_version_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/object_unittest.cc b/gold/testsuite/object_unittest.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/object_unittest.cc
rename to gold/testsuite/object_unittest.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/odr_header1.h b/gold/testsuite/odr_header1.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/odr_header1.h
rename to gold/testsuite/odr_header1.h
diff --git a/binutils/binutils-2.21/gold/testsuite/odr_header2.h b/gold/testsuite/odr_header2.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/odr_header2.h
rename to gold/testsuite/odr_header2.h
diff --git a/binutils/binutils-2.21/gold/testsuite/odr_violation1.cc b/gold/testsuite/odr_violation1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/odr_violation1.cc
rename to gold/testsuite/odr_violation1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/odr_violation2.cc b/gold/testsuite/odr_violation2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/odr_violation2.cc
rename to gold/testsuite/odr_violation2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_common_test_1.c b/gold/testsuite/plugin_common_test_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_common_test_1.c
rename to gold/testsuite/plugin_common_test_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_common_test_2.c b/gold/testsuite/plugin_common_test_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_common_test_2.c
rename to gold/testsuite/plugin_common_test_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test.c b/gold/testsuite/plugin_test.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test.c
rename to gold/testsuite/plugin_test.c
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_1.sh b/gold/testsuite/plugin_test_1.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_1.sh
rename to gold/testsuite/plugin_test_1.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_2.sh b/gold/testsuite/plugin_test_2.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_2.sh
rename to gold/testsuite/plugin_test_2.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_3.sh b/gold/testsuite/plugin_test_3.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_3.sh
rename to gold/testsuite/plugin_test_3.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_4.sh b/gold/testsuite/plugin_test_4.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_4.sh
rename to gold/testsuite/plugin_test_4.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_6.sh b/gold/testsuite/plugin_test_6.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_6.sh
rename to gold/testsuite/plugin_test_6.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_7.sh b/gold/testsuite/plugin_test_7.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_7.sh
rename to gold/testsuite/plugin_test_7.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_7_1.c b/gold/testsuite/plugin_test_7_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_7_1.c
rename to gold/testsuite/plugin_test_7_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/plugin_test_7_2.c b/gold/testsuite/plugin_test_7_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/plugin_test_7_2.c
rename to gold/testsuite/plugin_test_7_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/protected_1.cc b/gold/testsuite/protected_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/protected_1.cc
rename to gold/testsuite/protected_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/protected_2.cc b/gold/testsuite/protected_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/protected_2.cc
rename to gold/testsuite/protected_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/protected_3.cc b/gold/testsuite/protected_3.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/protected_3.cc
rename to gold/testsuite/protected_3.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/protected_4.cc b/gold/testsuite/protected_4.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/protected_4.cc
rename to gold/testsuite/protected_4.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/protected_main_1.cc b/gold/testsuite/protected_main_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/protected_main_1.cc
rename to gold/testsuite/protected_main_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/protected_main_2.cc b/gold/testsuite/protected_main_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/protected_main_2.cc
rename to gold/testsuite/protected_main_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/protected_main_3.cc b/gold/testsuite/protected_main_3.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/protected_main_3.cc
rename to gold/testsuite/protected_main_3.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/relro_script_test.t b/gold/testsuite/relro_script_test.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/relro_script_test.t
rename to gold/testsuite/relro_script_test.t
diff --git a/binutils/binutils-2.21/gold/testsuite/relro_test.cc b/gold/testsuite/relro_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/relro_test.cc
rename to gold/testsuite/relro_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/relro_test.sh b/gold/testsuite/relro_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/relro_test.sh
rename to gold/testsuite/relro_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/relro_test_main.cc b/gold/testsuite/relro_test_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/relro_test_main.cc
rename to gold/testsuite/relro_test_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/retain_symbols_file_test.sh b/gold/testsuite/retain_symbols_file_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/retain_symbols_file_test.sh
rename to gold/testsuite/retain_symbols_file_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_1.cc b/gold/testsuite/script_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_1.cc
rename to gold/testsuite/script_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_1.t b/gold/testsuite/script_test_1.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_1.t
rename to gold/testsuite/script_test_1.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_10.s b/gold/testsuite/script_test_10.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_10.s
rename to gold/testsuite/script_test_10.s
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_10.sh b/gold/testsuite/script_test_10.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_10.sh
rename to gold/testsuite/script_test_10.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_10.t b/gold/testsuite/script_test_10.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_10.t
rename to gold/testsuite/script_test_10.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_2.cc b/gold/testsuite/script_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_2.cc
rename to gold/testsuite/script_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_2.t b/gold/testsuite/script_test_2.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_2.t
rename to gold/testsuite/script_test_2.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_2a.cc b/gold/testsuite/script_test_2a.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_2a.cc
rename to gold/testsuite/script_test_2a.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_2b.cc b/gold/testsuite/script_test_2b.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_2b.cc
rename to gold/testsuite/script_test_2b.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_3.sh b/gold/testsuite/script_test_3.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_3.sh
rename to gold/testsuite/script_test_3.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_3.t b/gold/testsuite/script_test_3.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_3.t
rename to gold/testsuite/script_test_3.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_4.sh b/gold/testsuite/script_test_4.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_4.sh
rename to gold/testsuite/script_test_4.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_4.t b/gold/testsuite/script_test_4.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_4.t
rename to gold/testsuite/script_test_4.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_5.cc b/gold/testsuite/script_test_5.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_5.cc
rename to gold/testsuite/script_test_5.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_5.sh b/gold/testsuite/script_test_5.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_5.sh
rename to gold/testsuite/script_test_5.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_5.t b/gold/testsuite/script_test_5.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_5.t
rename to gold/testsuite/script_test_5.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_6.sh b/gold/testsuite/script_test_6.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_6.sh
rename to gold/testsuite/script_test_6.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_6.t b/gold/testsuite/script_test_6.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_6.t
rename to gold/testsuite/script_test_6.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_7.sh b/gold/testsuite/script_test_7.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_7.sh
rename to gold/testsuite/script_test_7.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_7.t b/gold/testsuite/script_test_7.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_7.t
rename to gold/testsuite/script_test_7.t
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_8.sh b/gold/testsuite/script_test_8.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_8.sh
rename to gold/testsuite/script_test_8.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_9.cc b/gold/testsuite/script_test_9.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_9.cc
rename to gold/testsuite/script_test_9.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_9.sh b/gold/testsuite/script_test_9.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_9.sh
rename to gold/testsuite/script_test_9.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/script_test_9.t b/gold/testsuite/script_test_9.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/script_test_9.t
rename to gold/testsuite/script_test_9.t
diff --git a/binutils/binutils-2.21/gold/testsuite/searched_file_test.cc b/gold/testsuite/searched_file_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/searched_file_test.cc
rename to gold/testsuite/searched_file_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/searched_file_test_lib.cc b/gold/testsuite/searched_file_test_lib.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/searched_file_test_lib.cc
rename to gold/testsuite/searched_file_test_lib.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/split_i386.sh b/gold/testsuite/split_i386.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_i386.sh
rename to gold/testsuite/split_i386.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/split_i386_1.s b/gold/testsuite/split_i386_1.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_i386_1.s
rename to gold/testsuite/split_i386_1.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_i386_2.s b/gold/testsuite/split_i386_2.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_i386_2.s
rename to gold/testsuite/split_i386_2.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_i386_3.s b/gold/testsuite/split_i386_3.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_i386_3.s
rename to gold/testsuite/split_i386_3.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_i386_4.s b/gold/testsuite/split_i386_4.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_i386_4.s
rename to gold/testsuite/split_i386_4.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_i386_n.s b/gold/testsuite/split_i386_n.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_i386_n.s
rename to gold/testsuite/split_i386_n.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_x86_64.sh b/gold/testsuite/split_x86_64.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_x86_64.sh
rename to gold/testsuite/split_x86_64.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/split_x86_64_1.s b/gold/testsuite/split_x86_64_1.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_x86_64_1.s
rename to gold/testsuite/split_x86_64_1.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_x86_64_2.s b/gold/testsuite/split_x86_64_2.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_x86_64_2.s
rename to gold/testsuite/split_x86_64_2.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_x86_64_3.s b/gold/testsuite/split_x86_64_3.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_x86_64_3.s
rename to gold/testsuite/split_x86_64_3.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_x86_64_4.s b/gold/testsuite/split_x86_64_4.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_x86_64_4.s
rename to gold/testsuite/split_x86_64_4.s
diff --git a/binutils/binutils-2.21/gold/testsuite/split_x86_64_n.s b/gold/testsuite/split_x86_64_n.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/split_x86_64_n.s
rename to gold/testsuite/split_x86_64_n.s
diff --git a/binutils/binutils-2.21/gold/testsuite/start_lib_test_1.c b/gold/testsuite/start_lib_test_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/start_lib_test_1.c
rename to gold/testsuite/start_lib_test_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/start_lib_test_2.c b/gold/testsuite/start_lib_test_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/start_lib_test_2.c
rename to gold/testsuite/start_lib_test_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/start_lib_test_3.c b/gold/testsuite/start_lib_test_3.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/start_lib_test_3.c
rename to gold/testsuite/start_lib_test_3.c
diff --git a/binutils/binutils-2.21/gold/testsuite/start_lib_test_main.c b/gold/testsuite/start_lib_test_main.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/start_lib_test_main.c
rename to gold/testsuite/start_lib_test_main.c
diff --git a/binutils/binutils-2.21/gold/testsuite/strong_ref_weak_def.sh b/gold/testsuite/strong_ref_weak_def.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/strong_ref_weak_def.sh
rename to gold/testsuite/strong_ref_weak_def.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/strong_ref_weak_def_1.c b/gold/testsuite/strong_ref_weak_def_1.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/strong_ref_weak_def_1.c
rename to gold/testsuite/strong_ref_weak_def_1.c
diff --git a/binutils/binutils-2.21/gold/testsuite/strong_ref_weak_def_2.c b/gold/testsuite/strong_ref_weak_def_2.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/strong_ref_weak_def_2.c
rename to gold/testsuite/strong_ref_weak_def_2.c
diff --git a/binutils/binutils-2.21/gold/testsuite/test.cc b/gold/testsuite/test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/test.cc
rename to gold/testsuite/test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/test.h b/gold/testsuite/test.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/test.h
rename to gold/testsuite/test.h
diff --git a/binutils/binutils-2.21/gold/testsuite/testfile.cc b/gold/testsuite/testfile.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/testfile.cc
rename to gold/testsuite/testfile.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/testfile.h b/gold/testsuite/testfile.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/testfile.h
rename to gold/testsuite/testfile.h
diff --git a/binutils/binutils-2.21/gold/testsuite/testmain.cc b/gold/testsuite/testmain.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/testmain.cc
rename to gold/testsuite/testmain.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/thin_archive_main.cc b/gold/testsuite/thin_archive_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thin_archive_main.cc
rename to gold/testsuite/thin_archive_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/thin_archive_test_1.cc b/gold/testsuite/thin_archive_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thin_archive_test_1.cc
rename to gold/testsuite/thin_archive_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/thin_archive_test_2.cc b/gold/testsuite/thin_archive_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thin_archive_test_2.cc
rename to gold/testsuite/thin_archive_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/thin_archive_test_3.cc b/gold/testsuite/thin_archive_test_3.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thin_archive_test_3.cc
rename to gold/testsuite/thin_archive_test_3.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/thin_archive_test_4.cc b/gold/testsuite/thin_archive_test_4.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thin_archive_test_4.cc
rename to gold/testsuite/thin_archive_test_4.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/thumb2_branch_range.t b/gold/testsuite/thumb2_branch_range.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thumb2_branch_range.t
rename to gold/testsuite/thumb2_branch_range.t
diff --git a/binutils/binutils-2.21/gold/testsuite/thumb_bl_in_range.s b/gold/testsuite/thumb_bl_in_range.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thumb_bl_in_range.s
rename to gold/testsuite/thumb_bl_in_range.s
diff --git a/binutils/binutils-2.21/gold/testsuite/thumb_bl_out_of_range.s b/gold/testsuite/thumb_bl_out_of_range.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thumb_bl_out_of_range.s
rename to gold/testsuite/thumb_bl_out_of_range.s
diff --git a/binutils/binutils-2.21/gold/testsuite/thumb_bl_out_of_range_local.s b/gold/testsuite/thumb_bl_out_of_range_local.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thumb_bl_out_of_range_local.s
rename to gold/testsuite/thumb_bl_out_of_range_local.s
diff --git a/binutils/binutils-2.21/gold/testsuite/thumb_blx_in_range.s b/gold/testsuite/thumb_blx_in_range.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thumb_blx_in_range.s
rename to gold/testsuite/thumb_blx_in_range.s
diff --git a/binutils/binutils-2.21/gold/testsuite/thumb_blx_out_of_range.s b/gold/testsuite/thumb_blx_out_of_range.s
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thumb_blx_out_of_range.s
rename to gold/testsuite/thumb_blx_out_of_range.s
diff --git a/binutils/binutils-2.21/gold/testsuite/thumb_branch_range.t b/gold/testsuite/thumb_branch_range.t
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/thumb_branch_range.t
rename to gold/testsuite/thumb_branch_range.t
diff --git a/binutils/binutils-2.21/gold/testsuite/tls_test.cc b/gold/testsuite/tls_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/tls_test.cc
rename to gold/testsuite/tls_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/tls_test.h b/gold/testsuite/tls_test.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/tls_test.h
rename to gold/testsuite/tls_test.h
diff --git a/binutils/binutils-2.21/gold/testsuite/tls_test_c.c b/gold/testsuite/tls_test_c.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/tls_test_c.c
rename to gold/testsuite/tls_test_c.c
diff --git a/binutils/binutils-2.21/gold/testsuite/tls_test_file2.cc b/gold/testsuite/tls_test_file2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/tls_test_file2.cc
rename to gold/testsuite/tls_test_file2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/tls_test_main.cc b/gold/testsuite/tls_test_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/tls_test_main.cc
rename to gold/testsuite/tls_test_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_shared.sh b/gold/testsuite/two_file_shared.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_shared.sh
rename to gold/testsuite/two_file_shared.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test.h b/gold/testsuite/two_file_test.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test.h
rename to gold/testsuite/two_file_test.h
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test_1.cc b/gold/testsuite/two_file_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test_1.cc
rename to gold/testsuite/two_file_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test_1_v1.cc b/gold/testsuite/two_file_test_1_v1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test_1_v1.cc
rename to gold/testsuite/two_file_test_1_v1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test_1b.cc b/gold/testsuite/two_file_test_1b.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test_1b.cc
rename to gold/testsuite/two_file_test_1b.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test_1b_v1.cc b/gold/testsuite/two_file_test_1b_v1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test_1b_v1.cc
rename to gold/testsuite/two_file_test_1b_v1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test_2.cc b/gold/testsuite/two_file_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test_2.cc
rename to gold/testsuite/two_file_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test_2_v1.cc b/gold/testsuite/two_file_test_2_v1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test_2_v1.cc
rename to gold/testsuite/two_file_test_2_v1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/two_file_test_main.cc b/gold/testsuite/two_file_test_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/two_file_test_main.cc
rename to gold/testsuite/two_file_test_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/undef_symbol.cc b/gold/testsuite/undef_symbol.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/undef_symbol.cc
rename to gold/testsuite/undef_symbol.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/undef_symbol.sh b/gold/testsuite/undef_symbol.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/undef_symbol.sh
rename to gold/testsuite/undef_symbol.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/undef_symbol_main.cc b/gold/testsuite/undef_symbol_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/undef_symbol_main.cc
rename to gold/testsuite/undef_symbol_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_matching_def.cc b/gold/testsuite/ver_matching_def.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_matching_def.cc
rename to gold/testsuite/ver_matching_def.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_matching_test.sh b/gold/testsuite/ver_matching_test.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_matching_test.sh
rename to gold/testsuite/ver_matching_test.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test.h b/gold/testsuite/ver_test.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test.h
rename to gold/testsuite/ver_test.h
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_1.cc b/gold/testsuite/ver_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_1.cc
rename to gold/testsuite/ver_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_1.sh b/gold/testsuite/ver_test_1.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_1.sh
rename to gold/testsuite/ver_test_1.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_10.script b/gold/testsuite/ver_test_10.script
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_10.script
rename to gold/testsuite/ver_test_10.script
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_10.sh b/gold/testsuite/ver_test_10.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_10.sh
rename to gold/testsuite/ver_test_10.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_2.cc b/gold/testsuite/ver_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_2.cc
rename to gold/testsuite/ver_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_2.script b/gold/testsuite/ver_test_2.script
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_2.script
rename to gold/testsuite/ver_test_2.script
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_2.sh b/gold/testsuite/ver_test_2.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_2.sh
rename to gold/testsuite/ver_test_2.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_3.cc b/gold/testsuite/ver_test_3.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_3.cc
rename to gold/testsuite/ver_test_3.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_4.cc b/gold/testsuite/ver_test_4.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_4.cc
rename to gold/testsuite/ver_test_4.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_4.script b/gold/testsuite/ver_test_4.script
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_4.script
rename to gold/testsuite/ver_test_4.script
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_4.sh b/gold/testsuite/ver_test_4.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_4.sh
rename to gold/testsuite/ver_test_4.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_5.cc b/gold/testsuite/ver_test_5.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_5.cc
rename to gold/testsuite/ver_test_5.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_5.script b/gold/testsuite/ver_test_5.script
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_5.script
rename to gold/testsuite/ver_test_5.script
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_5.sh b/gold/testsuite/ver_test_5.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_5.sh
rename to gold/testsuite/ver_test_5.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_6.c b/gold/testsuite/ver_test_6.c
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_6.c
rename to gold/testsuite/ver_test_6.c
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_7.cc b/gold/testsuite/ver_test_7.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_7.cc
rename to gold/testsuite/ver_test_7.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_7.sh b/gold/testsuite/ver_test_7.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_7.sh
rename to gold/testsuite/ver_test_7.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_8.script b/gold/testsuite/ver_test_8.script
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_8.script
rename to gold/testsuite/ver_test_8.script
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_9.cc b/gold/testsuite/ver_test_9.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_9.cc
rename to gold/testsuite/ver_test_9.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_main.cc b/gold/testsuite/ver_test_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_main.cc
rename to gold/testsuite/ver_test_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/ver_test_main_2.cc b/gold/testsuite/ver_test_main_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/ver_test_main_2.cc
rename to gold/testsuite/ver_test_main_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/version_script.map b/gold/testsuite/version_script.map
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/version_script.map
rename to gold/testsuite/version_script.map
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_alias_test_1.cc b/gold/testsuite/weak_alias_test_1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_alias_test_1.cc
rename to gold/testsuite/weak_alias_test_1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_alias_test_2.cc b/gold/testsuite/weak_alias_test_2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_alias_test_2.cc
rename to gold/testsuite/weak_alias_test_2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_alias_test_3.cc b/gold/testsuite/weak_alias_test_3.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_alias_test_3.cc
rename to gold/testsuite/weak_alias_test_3.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_alias_test_4.cc b/gold/testsuite/weak_alias_test_4.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_alias_test_4.cc
rename to gold/testsuite/weak_alias_test_4.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_alias_test_main.cc b/gold/testsuite/weak_alias_test_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_alias_test_main.cc
rename to gold/testsuite/weak_alias_test_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_plt.sh b/gold/testsuite/weak_plt.sh
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_plt.sh
rename to gold/testsuite/weak_plt.sh
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_plt_main.cc b/gold/testsuite/weak_plt_main.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_plt_main.cc
rename to gold/testsuite/weak_plt_main.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_plt_shared.cc b/gold/testsuite/weak_plt_shared.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_plt_shared.cc
rename to gold/testsuite/weak_plt_shared.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_test.cc b/gold/testsuite/weak_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_test.cc
rename to gold/testsuite/weak_test.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_undef.h b/gold/testsuite/weak_undef.h
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_undef.h
rename to gold/testsuite/weak_undef.h
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_undef_file1.cc b/gold/testsuite/weak_undef_file1.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_undef_file1.cc
rename to gold/testsuite/weak_undef_file1.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_undef_file2.cc b/gold/testsuite/weak_undef_file2.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_undef_file2.cc
rename to gold/testsuite/weak_undef_file2.cc
diff --git a/binutils/binutils-2.21/gold/testsuite/weak_undef_test.cc b/gold/testsuite/weak_undef_test.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/testsuite/weak_undef_test.cc
rename to gold/testsuite/weak_undef_test.cc
diff --git a/binutils/binutils-2.21/gold/timer.cc b/gold/timer.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/timer.cc
rename to gold/timer.cc
diff --git a/binutils/binutils-2.21/gold/timer.h b/gold/timer.h
similarity index 100%
rename from binutils/binutils-2.21/gold/timer.h
rename to gold/timer.h
diff --git a/binutils/binutils-2.21/gold/tls.h b/gold/tls.h
similarity index 100%
rename from binutils/binutils-2.21/gold/tls.h
rename to gold/tls.h
diff --git a/binutils/binutils-2.21/gold/token.h b/gold/token.h
similarity index 100%
rename from binutils/binutils-2.21/gold/token.h
rename to gold/token.h
diff --git a/binutils/binutils-2.21/gold/version.cc b/gold/version.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/version.cc
rename to gold/version.cc
diff --git a/binutils/binutils-2.21/gold/workqueue-internal.h b/gold/workqueue-internal.h
similarity index 100%
rename from binutils/binutils-2.21/gold/workqueue-internal.h
rename to gold/workqueue-internal.h
diff --git a/binutils/binutils-2.21/gold/workqueue-threads.cc b/gold/workqueue-threads.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/workqueue-threads.cc
rename to gold/workqueue-threads.cc
diff --git a/binutils/binutils-2.21/gold/workqueue.cc b/gold/workqueue.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/workqueue.cc
rename to gold/workqueue.cc
diff --git a/binutils/binutils-2.21/gold/workqueue.h b/gold/workqueue.h
similarity index 100%
rename from binutils/binutils-2.21/gold/workqueue.h
rename to gold/workqueue.h
diff --git a/binutils/binutils-2.21/gold/x86_64.cc b/gold/x86_64.cc
similarity index 100%
rename from binutils/binutils-2.21/gold/x86_64.cc
rename to gold/x86_64.cc
diff --git a/binutils/binutils-2.21/gold/yyscript.y b/gold/yyscript.y
similarity index 100%
rename from binutils/binutils-2.21/gold/yyscript.y
rename to gold/yyscript.y
diff --git a/binutils/binutils-2.21/gprof/.gdbinit b/gprof/.gdbinit
similarity index 100%
rename from binutils/binutils-2.21/gprof/.gdbinit
rename to gprof/.gdbinit
diff --git a/binutils/binutils-2.21/gprof/ChangeLog b/gprof/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog
rename to gprof/ChangeLog
diff --git a/binutils/binutils-2.21/gprof/ChangeLog-2004 b/gprof/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog-2004
rename to gprof/ChangeLog-2004
diff --git a/binutils/binutils-2.21/gprof/ChangeLog-2005 b/gprof/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog-2005
rename to gprof/ChangeLog-2005
diff --git a/binutils/binutils-2.21/gprof/ChangeLog-2006 b/gprof/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog-2006
rename to gprof/ChangeLog-2006
diff --git a/binutils/binutils-2.21/gprof/ChangeLog-2007 b/gprof/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog-2007
rename to gprof/ChangeLog-2007
diff --git a/binutils/binutils-2.21/gprof/ChangeLog-2008 b/gprof/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog-2008
rename to gprof/ChangeLog-2008
diff --git a/binutils/binutils-2.21/gprof/ChangeLog-2009 b/gprof/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog-2009
rename to gprof/ChangeLog-2009
diff --git a/binutils/binutils-2.21/gprof/ChangeLog-9203 b/gprof/ChangeLog-9203
similarity index 100%
rename from binutils/binutils-2.21/gprof/ChangeLog-9203
rename to gprof/ChangeLog-9203
diff --git a/binutils/binutils-2.21/gprof/MAINTAINERS b/gprof/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/gprof/MAINTAINERS
rename to gprof/MAINTAINERS
diff --git a/binutils/binutils-2.21/gprof/Makefile.am b/gprof/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/gprof/Makefile.am
rename to gprof/Makefile.am
diff --git a/binutils/binutils-2.21/gprof/Makefile.in b/gprof/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/gprof/Makefile.in
rename to gprof/Makefile.in
diff --git a/binutils/binutils-2.21/gprof/README b/gprof/README
similarity index 100%
rename from binutils/binutils-2.21/gprof/README
rename to gprof/README
diff --git a/binutils/binutils-2.21/gprof/TEST b/gprof/TEST
similarity index 100%
rename from binutils/binutils-2.21/gprof/TEST
rename to gprof/TEST
diff --git a/binutils/binutils-2.21/gprof/TODO b/gprof/TODO
similarity index 100%
rename from binutils/binutils-2.21/gprof/TODO
rename to gprof/TODO
diff --git a/binutils/binutils-2.21/gprof/aclocal.m4 b/gprof/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/gprof/aclocal.m4
rename to gprof/aclocal.m4
diff --git a/binutils/binutils-2.21/gprof/alpha.c b/gprof/alpha.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/alpha.c
rename to gprof/alpha.c
diff --git a/binutils/binutils-2.21/gprof/basic_blocks.c b/gprof/basic_blocks.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/basic_blocks.c
rename to gprof/basic_blocks.c
diff --git a/binutils/binutils-2.21/gprof/basic_blocks.h b/gprof/basic_blocks.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/basic_blocks.h
rename to gprof/basic_blocks.h
diff --git a/binutils/binutils-2.21/gprof/bb_exit_func.c b/gprof/bb_exit_func.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/bb_exit_func.c
rename to gprof/bb_exit_func.c
diff --git a/binutils/binutils-2.21/gprof/bbconv.pl b/gprof/bbconv.pl
similarity index 100%
rename from binutils/binutils-2.21/gprof/bbconv.pl
rename to gprof/bbconv.pl
diff --git a/binutils/binutils-2.21/gprof/bsd_callg_bl.c b/gprof/bsd_callg_bl.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/bsd_callg_bl.c
rename to gprof/bsd_callg_bl.c
diff --git a/binutils/binutils-2.21/gprof/bsd_callg_bl.m b/gprof/bsd_callg_bl.m
similarity index 100%
rename from binutils/binutils-2.21/gprof/bsd_callg_bl.m
rename to gprof/bsd_callg_bl.m
diff --git a/binutils/binutils-2.21/gprof/call_graph.c b/gprof/call_graph.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/call_graph.c
rename to gprof/call_graph.c
diff --git a/binutils/binutils-2.21/gprof/call_graph.h b/gprof/call_graph.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/call_graph.h
rename to gprof/call_graph.h
diff --git a/binutils/binutils-2.21/gprof/cg_arcs.c b/gprof/cg_arcs.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/cg_arcs.c
rename to gprof/cg_arcs.c
diff --git a/binutils/binutils-2.21/gprof/cg_arcs.h b/gprof/cg_arcs.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/cg_arcs.h
rename to gprof/cg_arcs.h
diff --git a/binutils/binutils-2.21/gprof/cg_dfn.c b/gprof/cg_dfn.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/cg_dfn.c
rename to gprof/cg_dfn.c
diff --git a/binutils/binutils-2.21/gprof/cg_dfn.h b/gprof/cg_dfn.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/cg_dfn.h
rename to gprof/cg_dfn.h
diff --git a/binutils/binutils-2.21/gprof/cg_print.c b/gprof/cg_print.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/cg_print.c
rename to gprof/cg_print.c
diff --git a/binutils/binutils-2.21/gprof/cg_print.h b/gprof/cg_print.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/cg_print.h
rename to gprof/cg_print.h
diff --git a/binutils/binutils-2.21/gprof/config.texi b/gprof/config.texi
similarity index 100%
rename from binutils/binutils-2.21/gprof/config.texi
rename to gprof/config.texi
diff --git a/binutils/binutils-2.21/gprof/configure b/gprof/configure
similarity index 100%
rename from binutils/binutils-2.21/gprof/configure
rename to gprof/configure
diff --git a/binutils/binutils-2.21/gprof/configure.in b/gprof/configure.in
similarity index 100%
rename from binutils/binutils-2.21/gprof/configure.in
rename to gprof/configure.in
diff --git a/binutils/binutils-2.21/gprof/corefile.c b/gprof/corefile.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/corefile.c
rename to gprof/corefile.c
diff --git a/binutils/binutils-2.21/gprof/corefile.h b/gprof/corefile.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/corefile.h
rename to gprof/corefile.h
diff --git a/binutils/binutils-2.21/gprof/dep-in.sed b/gprof/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/gprof/dep-in.sed
rename to gprof/dep-in.sed
diff --git a/binutils/binutils-2.21/gprof/fdl.texi b/gprof/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/gprof/fdl.texi
rename to gprof/fdl.texi
diff --git a/binutils/binutils-2.21/gprof/flat_bl.c b/gprof/flat_bl.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/flat_bl.c
rename to gprof/flat_bl.c
diff --git a/binutils/binutils-2.21/gprof/flat_bl.m b/gprof/flat_bl.m
similarity index 100%
rename from binutils/binutils-2.21/gprof/flat_bl.m
rename to gprof/flat_bl.m
diff --git a/binutils/binutils-2.21/gprof/fsf_callg_bl.c b/gprof/fsf_callg_bl.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/fsf_callg_bl.c
rename to gprof/fsf_callg_bl.c
diff --git a/binutils/binutils-2.21/gprof/fsf_callg_bl.m b/gprof/fsf_callg_bl.m
similarity index 100%
rename from binutils/binutils-2.21/gprof/fsf_callg_bl.m
rename to gprof/fsf_callg_bl.m
diff --git a/binutils/binutils-2.21/gprof/gconfig.in b/gprof/gconfig.in
similarity index 100%
rename from binutils/binutils-2.21/gprof/gconfig.in
rename to gprof/gconfig.in
diff --git a/binutils/binutils-2.21/gprof/gen-c-prog.awk b/gprof/gen-c-prog.awk
similarity index 100%
rename from binutils/binutils-2.21/gprof/gen-c-prog.awk
rename to gprof/gen-c-prog.awk
diff --git a/binutils/binutils-2.21/gprof/gmon.h b/gprof/gmon.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/gmon.h
rename to gprof/gmon.h
diff --git a/binutils/binutils-2.21/gprof/gmon_io.c b/gprof/gmon_io.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/gmon_io.c
rename to gprof/gmon_io.c
diff --git a/binutils/binutils-2.21/gprof/gmon_io.h b/gprof/gmon_io.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/gmon_io.h
rename to gprof/gmon_io.h
diff --git a/binutils/binutils-2.21/gprof/gmon_out.h b/gprof/gmon_out.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/gmon_out.h
rename to gprof/gmon_out.h
diff --git a/binutils/binutils-2.21/gprof/gprof.c b/gprof/gprof.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/gprof.c
rename to gprof/gprof.c
diff --git a/binutils/binutils-2.21/gprof/gprof.h b/gprof/gprof.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/gprof.h
rename to gprof/gprof.h
diff --git a/binutils/binutils-2.21/gprof/gprof.texi b/gprof/gprof.texi
similarity index 100%
rename from binutils/binutils-2.21/gprof/gprof.texi
rename to gprof/gprof.texi
diff --git a/binutils/binutils-2.21/gprof/hertz.c b/gprof/hertz.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/hertz.c
rename to gprof/hertz.c
diff --git a/binutils/binutils-2.21/gprof/hertz.h b/gprof/hertz.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/hertz.h
rename to gprof/hertz.h
diff --git a/binutils/binutils-2.21/gprof/hist.c b/gprof/hist.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/hist.c
rename to gprof/hist.c
diff --git a/binutils/binutils-2.21/gprof/hist.h b/gprof/hist.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/hist.h
rename to gprof/hist.h
diff --git a/binutils/binutils-2.21/gprof/i386.c b/gprof/i386.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/i386.c
rename to gprof/i386.c
diff --git a/binutils/binutils-2.21/gprof/mips.c b/gprof/mips.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/mips.c
rename to gprof/mips.c
diff --git a/binutils/binutils-2.21/gprof/po/Make-in b/gprof/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/Make-in
rename to gprof/po/Make-in
diff --git a/binutils/binutils-2.21/gprof/po/POTFILES.in b/gprof/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/POTFILES.in
rename to gprof/po/POTFILES.in
diff --git a/binutils/binutils-2.21/gprof/po/bg.gmo b/gprof/po/bg.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/bg.gmo
rename to gprof/po/bg.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/bg.po b/gprof/po/bg.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/bg.po
rename to gprof/po/bg.po
diff --git a/binutils/binutils-2.21/gprof/po/da.gmo b/gprof/po/da.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/da.gmo
rename to gprof/po/da.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/da.po b/gprof/po/da.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/da.po
rename to gprof/po/da.po
diff --git a/binutils/binutils-2.21/gprof/po/de.gmo b/gprof/po/de.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/de.gmo
rename to gprof/po/de.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/de.po b/gprof/po/de.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/de.po
rename to gprof/po/de.po
diff --git a/binutils/binutils-2.21/gprof/po/es.gmo b/gprof/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/es.gmo
rename to gprof/po/es.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/es.po b/gprof/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/es.po
rename to gprof/po/es.po
diff --git a/binutils/binutils-2.21/gprof/po/fi.gmo b/gprof/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/fi.gmo
rename to gprof/po/fi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/fi.po b/gprof/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/fi.po
rename to gprof/po/fi.po
diff --git a/binutils/binutils-2.21/gprof/po/fr.gmo b/gprof/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/fr.gmo
rename to gprof/po/fr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/fr.po b/gprof/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/fr.po
rename to gprof/po/fr.po
diff --git a/binutils/binutils-2.21/gprof/po/ga.gmo b/gprof/po/ga.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ga.gmo
rename to gprof/po/ga.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/ga.po b/gprof/po/ga.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ga.po
rename to gprof/po/ga.po
diff --git a/binutils/binutils-2.21/gprof/po/gprof.pot b/gprof/po/gprof.pot
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/gprof.pot
rename to gprof/po/gprof.pot
diff --git a/binutils/binutils-2.21/gprof/po/id.gmo b/gprof/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/id.gmo
rename to gprof/po/id.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/id.po b/gprof/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/id.po
rename to gprof/po/id.po
diff --git a/binutils/binutils-2.21/gprof/po/ms.gmo b/gprof/po/ms.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ms.gmo
rename to gprof/po/ms.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/ms.po b/gprof/po/ms.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ms.po
rename to gprof/po/ms.po
diff --git a/binutils/binutils-2.21/gprof/po/nl.gmo b/gprof/po/nl.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/nl.gmo
rename to gprof/po/nl.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/nl.po b/gprof/po/nl.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/nl.po
rename to gprof/po/nl.po
diff --git a/binutils/binutils-2.21/gprof/po/pt_BR.gmo b/gprof/po/pt_BR.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/pt_BR.gmo
rename to gprof/po/pt_BR.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/pt_BR.po b/gprof/po/pt_BR.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/pt_BR.po
rename to gprof/po/pt_BR.po
diff --git a/binutils/binutils-2.21/gprof/po/ro.gmo b/gprof/po/ro.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ro.gmo
rename to gprof/po/ro.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/ro.po b/gprof/po/ro.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ro.po
rename to gprof/po/ro.po
diff --git a/binutils/binutils-2.21/gprof/po/ru.gmo b/gprof/po/ru.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ru.gmo
rename to gprof/po/ru.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/ru.po b/gprof/po/ru.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/ru.po
rename to gprof/po/ru.po
diff --git a/binutils/binutils-2.21/gprof/po/rw.gmo b/gprof/po/rw.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/rw.gmo
rename to gprof/po/rw.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/rw.po b/gprof/po/rw.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/rw.po
rename to gprof/po/rw.po
diff --git a/binutils/binutils-2.21/gprof/po/sv.gmo b/gprof/po/sv.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/sv.gmo
rename to gprof/po/sv.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/sv.po b/gprof/po/sv.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/sv.po
rename to gprof/po/sv.po
diff --git a/binutils/binutils-2.21/gprof/po/tr.gmo b/gprof/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/tr.gmo
rename to gprof/po/tr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/tr.po b/gprof/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/tr.po
rename to gprof/po/tr.po
diff --git a/binutils/binutils-2.21/gprof/po/vi.gmo b/gprof/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/vi.gmo
rename to gprof/po/vi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/gprof/po/vi.po b/gprof/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/gprof/po/vi.po
rename to gprof/po/vi.po
diff --git a/binutils/binutils-2.21/gprof/search_list.c b/gprof/search_list.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/search_list.c
rename to gprof/search_list.c
diff --git a/binutils/binutils-2.21/gprof/search_list.h b/gprof/search_list.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/search_list.h
rename to gprof/search_list.h
diff --git a/binutils/binutils-2.21/gprof/source.c b/gprof/source.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/source.c
rename to gprof/source.c
diff --git a/binutils/binutils-2.21/gprof/source.h b/gprof/source.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/source.h
rename to gprof/source.h
diff --git a/binutils/binutils-2.21/gprof/sparc.c b/gprof/sparc.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/sparc.c
rename to gprof/sparc.c
diff --git a/binutils/binutils-2.21/gprof/stamp-h.in b/gprof/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/gprof/stamp-h.in
rename to gprof/stamp-h.in
diff --git a/binutils/binutils-2.21/gprof/sym_ids.c b/gprof/sym_ids.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/sym_ids.c
rename to gprof/sym_ids.c
diff --git a/binutils/binutils-2.21/gprof/sym_ids.h b/gprof/sym_ids.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/sym_ids.h
rename to gprof/sym_ids.h
diff --git a/binutils/binutils-2.21/gprof/symtab.c b/gprof/symtab.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/symtab.c
rename to gprof/symtab.c
diff --git a/binutils/binutils-2.21/gprof/symtab.h b/gprof/symtab.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/symtab.h
rename to gprof/symtab.h
diff --git a/binutils/binutils-2.21/gprof/tahoe.c b/gprof/tahoe.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/tahoe.c
rename to gprof/tahoe.c
diff --git a/binutils/binutils-2.21/gprof/utils.c b/gprof/utils.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/utils.c
rename to gprof/utils.c
diff --git a/binutils/binutils-2.21/gprof/utils.h b/gprof/utils.h
similarity index 100%
rename from binutils/binutils-2.21/gprof/utils.h
rename to gprof/utils.h
diff --git a/binutils/binutils-2.21/gprof/vax.c b/gprof/vax.c
similarity index 100%
rename from binutils/binutils-2.21/gprof/vax.c
rename to gprof/vax.c
diff --git a/binutils/binutils-2.21/include/COPYING b/include/COPYING
similarity index 100%
rename from binutils/binutils-2.21/include/COPYING
rename to include/COPYING
diff --git a/binutils/binutils-2.21/include/COPYING3 b/include/COPYING3
similarity index 100%
rename from binutils/binutils-2.21/include/COPYING3
rename to include/COPYING3
diff --git a/binutils/binutils-2.21/include/ChangeLog b/include/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/ChangeLog
rename to include/ChangeLog
diff --git a/binutils/binutils-2.21/include/ChangeLog-9103 b/include/ChangeLog-9103
similarity index 100%
rename from binutils/binutils-2.21/include/ChangeLog-9103
rename to include/ChangeLog-9103
diff --git a/binutils/binutils-2.21/include/MAINTAINERS b/include/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/include/MAINTAINERS
rename to include/MAINTAINERS
diff --git a/binutils/binutils-2.21/include/alloca-conf.h b/include/alloca-conf.h
similarity index 100%
rename from binutils/binutils-2.21/include/alloca-conf.h
rename to include/alloca-conf.h
diff --git a/binutils/binutils-2.21/include/ansidecl.h b/include/ansidecl.h
similarity index 100%
rename from binutils/binutils-2.21/include/ansidecl.h
rename to include/ansidecl.h
diff --git a/binutils/binutils-2.21/include/aout/ChangeLog b/include/aout/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/aout/ChangeLog
rename to include/aout/ChangeLog
diff --git a/binutils/binutils-2.21/include/aout/adobe.h b/include/aout/adobe.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/adobe.h
rename to include/aout/adobe.h
diff --git a/binutils/binutils-2.21/include/aout/aout64.h b/include/aout/aout64.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/aout64.h
rename to include/aout/aout64.h
diff --git a/binutils/binutils-2.21/include/aout/ar.h b/include/aout/ar.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/ar.h
rename to include/aout/ar.h
diff --git a/binutils/binutils-2.21/include/aout/dynix3.h b/include/aout/dynix3.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/dynix3.h
rename to include/aout/dynix3.h
diff --git a/binutils/binutils-2.21/include/aout/encap.h b/include/aout/encap.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/encap.h
rename to include/aout/encap.h
diff --git a/binutils/binutils-2.21/include/aout/host.h b/include/aout/host.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/host.h
rename to include/aout/host.h
diff --git a/binutils/binutils-2.21/include/aout/hp.h b/include/aout/hp.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/hp.h
rename to include/aout/hp.h
diff --git a/binutils/binutils-2.21/include/aout/hp300hpux.h b/include/aout/hp300hpux.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/hp300hpux.h
rename to include/aout/hp300hpux.h
diff --git a/binutils/binutils-2.21/include/aout/hppa.h b/include/aout/hppa.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/hppa.h
rename to include/aout/hppa.h
diff --git a/binutils/binutils-2.21/include/aout/ranlib.h b/include/aout/ranlib.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/ranlib.h
rename to include/aout/ranlib.h
diff --git a/binutils/binutils-2.21/include/aout/reloc.h b/include/aout/reloc.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/reloc.h
rename to include/aout/reloc.h
diff --git a/binutils/binutils-2.21/include/aout/stab.def b/include/aout/stab.def
similarity index 100%
rename from binutils/binutils-2.21/include/aout/stab.def
rename to include/aout/stab.def
diff --git a/binutils/binutils-2.21/include/aout/stab_gnu.h b/include/aout/stab_gnu.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/stab_gnu.h
rename to include/aout/stab_gnu.h
diff --git a/binutils/binutils-2.21/include/aout/sun4.h b/include/aout/sun4.h
similarity index 100%
rename from binutils/binutils-2.21/include/aout/sun4.h
rename to include/aout/sun4.h
diff --git a/binutils/binutils-2.21/include/bfdlink.h b/include/bfdlink.h
similarity index 100%
rename from binutils/binutils-2.21/include/bfdlink.h
rename to include/bfdlink.h
diff --git a/binutils/binutils-2.21/include/binary-io.h b/include/binary-io.h
similarity index 100%
rename from binutils/binutils-2.21/include/binary-io.h
rename to include/binary-io.h
diff --git a/binutils/binutils-2.21/include/bout.h b/include/bout.h
similarity index 100%
rename from binutils/binutils-2.21/include/bout.h
rename to include/bout.h
diff --git a/binutils/binutils-2.21/include/cgen/ChangeLog b/include/cgen/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/cgen/ChangeLog
rename to include/cgen/ChangeLog
diff --git a/binutils/binutils-2.21/include/cgen/basic-modes.h b/include/cgen/basic-modes.h
similarity index 100%
rename from binutils/binutils-2.21/include/cgen/basic-modes.h
rename to include/cgen/basic-modes.h
diff --git a/binutils/binutils-2.21/include/cgen/basic-ops.h b/include/cgen/basic-ops.h
similarity index 100%
rename from binutils/binutils-2.21/include/cgen/basic-ops.h
rename to include/cgen/basic-ops.h
diff --git a/binutils/binutils-2.21/include/cgen/bitset.h b/include/cgen/bitset.h
similarity index 100%
rename from binutils/binutils-2.21/include/cgen/bitset.h
rename to include/cgen/bitset.h
diff --git a/binutils/binutils-2.21/include/coff/ChangeLog b/include/coff/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/coff/ChangeLog
rename to include/coff/ChangeLog
diff --git a/binutils/binutils-2.21/include/coff/ChangeLog-9103 b/include/coff/ChangeLog-9103
similarity index 100%
rename from binutils/binutils-2.21/include/coff/ChangeLog-9103
rename to include/coff/ChangeLog-9103
diff --git a/binutils/binutils-2.21/include/coff/alpha.h b/include/coff/alpha.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/alpha.h
rename to include/coff/alpha.h
diff --git a/binutils/binutils-2.21/include/coff/apollo.h b/include/coff/apollo.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/apollo.h
rename to include/coff/apollo.h
diff --git a/binutils/binutils-2.21/include/coff/arm.h b/include/coff/arm.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/arm.h
rename to include/coff/arm.h
diff --git a/binutils/binutils-2.21/include/coff/aux-coff.h b/include/coff/aux-coff.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/aux-coff.h
rename to include/coff/aux-coff.h
diff --git a/binutils/binutils-2.21/include/coff/ecoff.h b/include/coff/ecoff.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/ecoff.h
rename to include/coff/ecoff.h
diff --git a/binutils/binutils-2.21/include/coff/external.h b/include/coff/external.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/external.h
rename to include/coff/external.h
diff --git a/binutils/binutils-2.21/include/coff/go32exe.h b/include/coff/go32exe.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/go32exe.h
rename to include/coff/go32exe.h
diff --git a/binutils/binutils-2.21/include/coff/h8300.h b/include/coff/h8300.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/h8300.h
rename to include/coff/h8300.h
diff --git a/binutils/binutils-2.21/include/coff/h8500.h b/include/coff/h8500.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/h8500.h
rename to include/coff/h8500.h
diff --git a/binutils/binutils-2.21/include/coff/i386.h b/include/coff/i386.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/i386.h
rename to include/coff/i386.h
diff --git a/binutils/binutils-2.21/include/coff/i860.h b/include/coff/i860.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/i860.h
rename to include/coff/i860.h
diff --git a/binutils/binutils-2.21/include/coff/i960.h b/include/coff/i960.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/i960.h
rename to include/coff/i960.h
diff --git a/binutils/binutils-2.21/include/coff/ia64.h b/include/coff/ia64.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/ia64.h
rename to include/coff/ia64.h
diff --git a/binutils/binutils-2.21/include/coff/internal.h b/include/coff/internal.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/internal.h
rename to include/coff/internal.h
diff --git a/binutils/binutils-2.21/include/coff/m68k.h b/include/coff/m68k.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/m68k.h
rename to include/coff/m68k.h
diff --git a/binutils/binutils-2.21/include/coff/m88k.h b/include/coff/m88k.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/m88k.h
rename to include/coff/m88k.h
diff --git a/binutils/binutils-2.21/include/coff/mcore.h b/include/coff/mcore.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/mcore.h
rename to include/coff/mcore.h
diff --git a/binutils/binutils-2.21/include/coff/mips.h b/include/coff/mips.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/mips.h
rename to include/coff/mips.h
diff --git a/binutils/binutils-2.21/include/coff/mipspe.h b/include/coff/mipspe.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/mipspe.h
rename to include/coff/mipspe.h
diff --git a/binutils/binutils-2.21/include/coff/or32.h b/include/coff/or32.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/or32.h
rename to include/coff/or32.h
diff --git a/binutils/binutils-2.21/include/coff/pe.h b/include/coff/pe.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/pe.h
rename to include/coff/pe.h
diff --git a/binutils/binutils-2.21/include/coff/powerpc.h b/include/coff/powerpc.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/powerpc.h
rename to include/coff/powerpc.h
diff --git a/binutils/binutils-2.21/include/coff/rs6000.h b/include/coff/rs6000.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/rs6000.h
rename to include/coff/rs6000.h
diff --git a/binutils/binutils-2.21/include/coff/rs6k64.h b/include/coff/rs6k64.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/rs6k64.h
rename to include/coff/rs6k64.h
diff --git a/binutils/binutils-2.21/include/coff/sh.h b/include/coff/sh.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/sh.h
rename to include/coff/sh.h
diff --git a/binutils/binutils-2.21/include/coff/sparc.h b/include/coff/sparc.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/sparc.h
rename to include/coff/sparc.h
diff --git a/binutils/binutils-2.21/include/coff/sym.h b/include/coff/sym.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/sym.h
rename to include/coff/sym.h
diff --git a/binutils/binutils-2.21/include/coff/symconst.h b/include/coff/symconst.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/symconst.h
rename to include/coff/symconst.h
diff --git a/binutils/binutils-2.21/include/coff/ti.h b/include/coff/ti.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/ti.h
rename to include/coff/ti.h
diff --git a/binutils/binutils-2.21/include/coff/tic30.h b/include/coff/tic30.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/tic30.h
rename to include/coff/tic30.h
diff --git a/binutils/binutils-2.21/include/coff/tic4x.h b/include/coff/tic4x.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/tic4x.h
rename to include/coff/tic4x.h
diff --git a/binutils/binutils-2.21/include/coff/tic54x.h b/include/coff/tic54x.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/tic54x.h
rename to include/coff/tic54x.h
diff --git a/binutils/binutils-2.21/include/coff/tic80.h b/include/coff/tic80.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/tic80.h
rename to include/coff/tic80.h
diff --git a/binutils/binutils-2.21/include/coff/w65.h b/include/coff/w65.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/w65.h
rename to include/coff/w65.h
diff --git a/binutils/binutils-2.21/include/coff/we32k.h b/include/coff/we32k.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/we32k.h
rename to include/coff/we32k.h
diff --git a/binutils/binutils-2.21/include/coff/x86_64.h b/include/coff/x86_64.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/x86_64.h
rename to include/coff/x86_64.h
diff --git a/binutils/binutils-2.21/include/coff/xcoff.h b/include/coff/xcoff.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/xcoff.h
rename to include/coff/xcoff.h
diff --git a/binutils/binutils-2.21/include/coff/z80.h b/include/coff/z80.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/z80.h
rename to include/coff/z80.h
diff --git a/binutils/binutils-2.21/include/coff/z8k.h b/include/coff/z8k.h
similarity index 100%
rename from binutils/binutils-2.21/include/coff/z8k.h
rename to include/coff/z8k.h
diff --git a/binutils/binutils-2.21/include/demangle.h b/include/demangle.h
similarity index 100%
rename from binutils/binutils-2.21/include/demangle.h
rename to include/demangle.h
diff --git a/binutils/binutils-2.21/include/dis-asm.h b/include/dis-asm.h
similarity index 100%
rename from binutils/binutils-2.21/include/dis-asm.h
rename to include/dis-asm.h
diff --git a/binutils/binutils-2.21/include/dwarf2.h b/include/dwarf2.h
similarity index 100%
rename from binutils/binutils-2.21/include/dwarf2.h
rename to include/dwarf2.h
diff --git a/binutils/binutils-2.21/include/dyn-string.h b/include/dyn-string.h
similarity index 100%
rename from binutils/binutils-2.21/include/dyn-string.h
rename to include/dyn-string.h
diff --git a/binutils/binutils-2.21/include/elf/ChangeLog b/include/elf/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/elf/ChangeLog
rename to include/elf/ChangeLog
diff --git a/binutils/binutils-2.21/include/elf/ChangeLog-9103 b/include/elf/ChangeLog-9103
similarity index 100%
rename from binutils/binutils-2.21/include/elf/ChangeLog-9103
rename to include/elf/ChangeLog-9103
diff --git a/binutils/binutils-2.21/include/elf/alpha.h b/include/elf/alpha.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/alpha.h
rename to include/elf/alpha.h
diff --git a/binutils/binutils-2.21/include/elf/arc.h b/include/elf/arc.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/arc.h
rename to include/elf/arc.h
diff --git a/binutils/binutils-2.21/include/elf/arm.h b/include/elf/arm.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/arm.h
rename to include/elf/arm.h
diff --git a/binutils/binutils-2.21/include/elf/avr.h b/include/elf/avr.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/avr.h
rename to include/elf/avr.h
diff --git a/binutils/binutils-2.21/include/elf/bfin.h b/include/elf/bfin.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/bfin.h
rename to include/elf/bfin.h
diff --git a/binutils/binutils-2.21/include/elf/common.h b/include/elf/common.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/common.h
rename to include/elf/common.h
diff --git a/binutils/binutils-2.21/include/elf/cr16.h b/include/elf/cr16.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/cr16.h
rename to include/elf/cr16.h
diff --git a/binutils/binutils-2.21/include/elf/cr16c.h b/include/elf/cr16c.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/cr16c.h
rename to include/elf/cr16c.h
diff --git a/binutils/binutils-2.21/include/elf/cris.h b/include/elf/cris.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/cris.h
rename to include/elf/cris.h
diff --git a/binutils/binutils-2.21/include/elf/crx.h b/include/elf/crx.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/crx.h
rename to include/elf/crx.h
diff --git a/binutils/binutils-2.21/include/elf/d10v.h b/include/elf/d10v.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/d10v.h
rename to include/elf/d10v.h
diff --git a/binutils/binutils-2.21/include/elf/d30v.h b/include/elf/d30v.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/d30v.h
rename to include/elf/d30v.h
diff --git a/binutils/binutils-2.21/include/elf/dlx.h b/include/elf/dlx.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/dlx.h
rename to include/elf/dlx.h
diff --git a/binutils/binutils-2.21/include/elf/dwarf.h b/include/elf/dwarf.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/dwarf.h
rename to include/elf/dwarf.h
diff --git a/binutils/binutils-2.21/include/elf/external.h b/include/elf/external.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/external.h
rename to include/elf/external.h
diff --git a/binutils/binutils-2.21/include/elf/fr30.h b/include/elf/fr30.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/fr30.h
rename to include/elf/fr30.h
diff --git a/binutils/binutils-2.21/include/elf/frv.h b/include/elf/frv.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/frv.h
rename to include/elf/frv.h
diff --git a/binutils/binutils-2.21/include/elf/h8.h b/include/elf/h8.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/h8.h
rename to include/elf/h8.h
diff --git a/binutils/binutils-2.21/include/elf/hppa.h b/include/elf/hppa.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/hppa.h
rename to include/elf/hppa.h
diff --git a/binutils/binutils-2.21/include/elf/i370.h b/include/elf/i370.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/i370.h
rename to include/elf/i370.h
diff --git a/binutils/binutils-2.21/include/elf/i386.h b/include/elf/i386.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/i386.h
rename to include/elf/i386.h
diff --git a/binutils/binutils-2.21/include/elf/i860.h b/include/elf/i860.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/i860.h
rename to include/elf/i860.h
diff --git a/binutils/binutils-2.21/include/elf/i960.h b/include/elf/i960.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/i960.h
rename to include/elf/i960.h
diff --git a/binutils/binutils-2.21/include/elf/ia64.h b/include/elf/ia64.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/ia64.h
rename to include/elf/ia64.h
diff --git a/binutils/binutils-2.21/include/elf/internal.h b/include/elf/internal.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/internal.h
rename to include/elf/internal.h
diff --git a/binutils/binutils-2.21/include/elf/ip2k.h b/include/elf/ip2k.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/ip2k.h
rename to include/elf/ip2k.h
diff --git a/binutils/binutils-2.21/include/elf/iq2000.h b/include/elf/iq2000.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/iq2000.h
rename to include/elf/iq2000.h
diff --git a/binutils/binutils-2.21/include/elf/lm32.h b/include/elf/lm32.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/lm32.h
rename to include/elf/lm32.h
diff --git a/binutils/binutils-2.21/include/elf/m32c.h b/include/elf/m32c.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/m32c.h
rename to include/elf/m32c.h
diff --git a/binutils/binutils-2.21/include/elf/m32r.h b/include/elf/m32r.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/m32r.h
rename to include/elf/m32r.h
diff --git a/binutils/binutils-2.21/include/elf/m68hc11.h b/include/elf/m68hc11.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/m68hc11.h
rename to include/elf/m68hc11.h
diff --git a/binutils/binutils-2.21/include/elf/m68k.h b/include/elf/m68k.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/m68k.h
rename to include/elf/m68k.h
diff --git a/binutils/binutils-2.21/include/elf/mcore.h b/include/elf/mcore.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/mcore.h
rename to include/elf/mcore.h
diff --git a/binutils/binutils-2.21/include/elf/mep.h b/include/elf/mep.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/mep.h
rename to include/elf/mep.h
diff --git a/binutils/binutils-2.21/include/elf/microblaze.h b/include/elf/microblaze.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/microblaze.h
rename to include/elf/microblaze.h
diff --git a/binutils/binutils-2.21/include/elf/mips.h b/include/elf/mips.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/mips.h
rename to include/elf/mips.h
diff --git a/binutils/binutils-2.21/include/elf/mmix.h b/include/elf/mmix.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/mmix.h
rename to include/elf/mmix.h
diff --git a/binutils/binutils-2.21/include/elf/mn10200.h b/include/elf/mn10200.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/mn10200.h
rename to include/elf/mn10200.h
diff --git a/binutils/binutils-2.21/include/elf/mn10300.h b/include/elf/mn10300.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/mn10300.h
rename to include/elf/mn10300.h
diff --git a/binutils/binutils-2.21/include/elf/moxie.h b/include/elf/moxie.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/moxie.h
rename to include/elf/moxie.h
diff --git a/binutils/binutils-2.21/include/elf/msp430.h b/include/elf/msp430.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/msp430.h
rename to include/elf/msp430.h
diff --git a/binutils/binutils-2.21/include/elf/mt.h b/include/elf/mt.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/mt.h
rename to include/elf/mt.h
diff --git a/binutils/binutils-2.21/include/elf/openrisc.h b/include/elf/openrisc.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/openrisc.h
rename to include/elf/openrisc.h
diff --git a/binutils/binutils-2.21/include/elf/or32.h b/include/elf/or32.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/or32.h
rename to include/elf/or32.h
diff --git a/binutils/binutils-2.21/include/elf/pj.h b/include/elf/pj.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/pj.h
rename to include/elf/pj.h
diff --git a/binutils/binutils-2.21/include/elf/ppc.h b/include/elf/ppc.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/ppc.h
rename to include/elf/ppc.h
diff --git a/binutils/binutils-2.21/include/elf/ppc64.h b/include/elf/ppc64.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/ppc64.h
rename to include/elf/ppc64.h
diff --git a/binutils/binutils-2.21/include/elf/reloc-macros.h b/include/elf/reloc-macros.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/reloc-macros.h
rename to include/elf/reloc-macros.h
diff --git a/binutils/binutils-2.21/include/elf/rx.h b/include/elf/rx.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/rx.h
rename to include/elf/rx.h
diff --git a/binutils/binutils-2.21/include/elf/s390.h b/include/elf/s390.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/s390.h
rename to include/elf/s390.h
diff --git a/binutils/binutils-2.21/include/elf/score.h b/include/elf/score.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/score.h
rename to include/elf/score.h
diff --git a/binutils/binutils-2.21/include/elf/sh.h b/include/elf/sh.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/sh.h
rename to include/elf/sh.h
diff --git a/binutils/binutils-2.21/include/elf/sparc.h b/include/elf/sparc.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/sparc.h
rename to include/elf/sparc.h
diff --git a/binutils/binutils-2.21/include/elf/spu.h b/include/elf/spu.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/spu.h
rename to include/elf/spu.h
diff --git a/binutils/binutils-2.21/include/elf/tic6x-attrs.h b/include/elf/tic6x-attrs.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/tic6x-attrs.h
rename to include/elf/tic6x-attrs.h
diff --git a/binutils/binutils-2.21/include/elf/tic6x.h b/include/elf/tic6x.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/tic6x.h
rename to include/elf/tic6x.h
diff --git a/binutils/binutils-2.21/include/elf/v850.h b/include/elf/v850.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/v850.h
rename to include/elf/v850.h
diff --git a/binutils/binutils-2.21/include/elf/vax.h b/include/elf/vax.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/vax.h
rename to include/elf/vax.h
diff --git a/binutils/binutils-2.21/include/elf/vxworks.h b/include/elf/vxworks.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/vxworks.h
rename to include/elf/vxworks.h
diff --git a/binutils/binutils-2.21/include/elf/x86-64.h b/include/elf/x86-64.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/x86-64.h
rename to include/elf/x86-64.h
diff --git a/binutils/binutils-2.21/include/elf/xc16x.h b/include/elf/xc16x.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/xc16x.h
rename to include/elf/xc16x.h
diff --git a/binutils/binutils-2.21/include/elf/xstormy16.h b/include/elf/xstormy16.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/xstormy16.h
rename to include/elf/xstormy16.h
diff --git a/binutils/binutils-2.21/include/elf/xtensa.h b/include/elf/xtensa.h
similarity index 100%
rename from binutils/binutils-2.21/include/elf/xtensa.h
rename to include/elf/xtensa.h
diff --git a/binutils/binutils-2.21/include/fibheap.h b/include/fibheap.h
similarity index 100%
rename from binutils/binutils-2.21/include/fibheap.h
rename to include/fibheap.h
diff --git a/binutils/binutils-2.21/include/filenames.h b/include/filenames.h
similarity index 100%
rename from binutils/binutils-2.21/include/filenames.h
rename to include/filenames.h
diff --git a/binutils/binutils-2.21/include/floatformat.h b/include/floatformat.h
similarity index 100%
rename from binutils/binutils-2.21/include/floatformat.h
rename to include/floatformat.h
diff --git a/binutils/binutils-2.21/include/fnmatch.h b/include/fnmatch.h
similarity index 100%
rename from binutils/binutils-2.21/include/fnmatch.h
rename to include/fnmatch.h
diff --git a/binutils/binutils-2.21/include/fopen-bin.h b/include/fopen-bin.h
similarity index 100%
rename from binutils/binutils-2.21/include/fopen-bin.h
rename to include/fopen-bin.h
diff --git a/binutils/binutils-2.21/include/fopen-same.h b/include/fopen-same.h
similarity index 100%
rename from binutils/binutils-2.21/include/fopen-same.h
rename to include/fopen-same.h
diff --git a/binutils/binutils-2.21/include/fopen-vms.h b/include/fopen-vms.h
similarity index 100%
rename from binutils/binutils-2.21/include/fopen-vms.h
rename to include/fopen-vms.h
diff --git a/binutils/binutils-2.21/include/gdb/ChangeLog b/include/gdb/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/ChangeLog
rename to include/gdb/ChangeLog
diff --git a/binutils/binutils-2.21/include/gdb/callback.h b/include/gdb/callback.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/callback.h
rename to include/gdb/callback.h
diff --git a/binutils/binutils-2.21/include/gdb/fileio.h b/include/gdb/fileio.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/fileio.h
rename to include/gdb/fileio.h
diff --git a/binutils/binutils-2.21/include/gdb/remote-sim.h b/include/gdb/remote-sim.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/remote-sim.h
rename to include/gdb/remote-sim.h
diff --git a/binutils/binutils-2.21/include/gdb/signals.def b/include/gdb/signals.def
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/signals.def
rename to include/gdb/signals.def
diff --git a/binutils/binutils-2.21/include/gdb/signals.h b/include/gdb/signals.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/signals.h
rename to include/gdb/signals.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-arm.h b/include/gdb/sim-arm.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-arm.h
rename to include/gdb/sim-arm.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-cr16.h b/include/gdb/sim-cr16.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-cr16.h
rename to include/gdb/sim-cr16.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-d10v.h b/include/gdb/sim-d10v.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-d10v.h
rename to include/gdb/sim-d10v.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-frv.h b/include/gdb/sim-frv.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-frv.h
rename to include/gdb/sim-frv.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-h8300.h b/include/gdb/sim-h8300.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-h8300.h
rename to include/gdb/sim-h8300.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-lm32.h b/include/gdb/sim-lm32.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-lm32.h
rename to include/gdb/sim-lm32.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-m32c.h b/include/gdb/sim-m32c.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-m32c.h
rename to include/gdb/sim-m32c.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-ppc.h b/include/gdb/sim-ppc.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-ppc.h
rename to include/gdb/sim-ppc.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-rx.h b/include/gdb/sim-rx.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-rx.h
rename to include/gdb/sim-rx.h
diff --git a/binutils/binutils-2.21/include/gdb/sim-sh.h b/include/gdb/sim-sh.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdb/sim-sh.h
rename to include/gdb/sim-sh.h
diff --git a/binutils/binutils-2.21/include/gdbm.h b/include/gdbm.h
similarity index 100%
rename from binutils/binutils-2.21/include/gdbm.h
rename to include/gdbm.h
diff --git a/binutils/binutils-2.21/include/getopt.h b/include/getopt.h
similarity index 100%
rename from binutils/binutils-2.21/include/getopt.h
rename to include/getopt.h
diff --git a/binutils/binutils-2.21/include/hashtab.h b/include/hashtab.h
similarity index 100%
rename from binutils/binutils-2.21/include/hashtab.h
rename to include/hashtab.h
diff --git a/binutils/binutils-2.21/include/hp-symtab.h b/include/hp-symtab.h
similarity index 100%
rename from binutils/binutils-2.21/include/hp-symtab.h
rename to include/hp-symtab.h
diff --git a/binutils/binutils-2.21/include/ieee.h b/include/ieee.h
similarity index 100%
rename from binutils/binutils-2.21/include/ieee.h
rename to include/ieee.h
diff --git a/binutils/binutils-2.21/include/libiberty.h b/include/libiberty.h
similarity index 100%
rename from binutils/binutils-2.21/include/libiberty.h
rename to include/libiberty.h
diff --git a/binutils/binutils-2.21/include/lto-symtab.h b/include/lto-symtab.h
similarity index 100%
rename from binutils/binutils-2.21/include/lto-symtab.h
rename to include/lto-symtab.h
diff --git a/binutils/binutils-2.21/include/md5.h b/include/md5.h
similarity index 100%
rename from binutils/binutils-2.21/include/md5.h
rename to include/md5.h
diff --git a/binutils/binutils-2.21/include/nlm/ChangeLog b/include/nlm/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/ChangeLog
rename to include/nlm/ChangeLog
diff --git a/binutils/binutils-2.21/include/nlm/alpha-ext.h b/include/nlm/alpha-ext.h
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/alpha-ext.h
rename to include/nlm/alpha-ext.h
diff --git a/binutils/binutils-2.21/include/nlm/common.h b/include/nlm/common.h
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/common.h
rename to include/nlm/common.h
diff --git a/binutils/binutils-2.21/include/nlm/external.h b/include/nlm/external.h
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/external.h
rename to include/nlm/external.h
diff --git a/binutils/binutils-2.21/include/nlm/i386-ext.h b/include/nlm/i386-ext.h
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/i386-ext.h
rename to include/nlm/i386-ext.h
diff --git a/binutils/binutils-2.21/include/nlm/internal.h b/include/nlm/internal.h
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/internal.h
rename to include/nlm/internal.h
diff --git a/binutils/binutils-2.21/include/nlm/ppc-ext.h b/include/nlm/ppc-ext.h
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/ppc-ext.h
rename to include/nlm/ppc-ext.h
diff --git a/binutils/binutils-2.21/include/nlm/sparc32-ext.h b/include/nlm/sparc32-ext.h
similarity index 100%
rename from binutils/binutils-2.21/include/nlm/sparc32-ext.h
rename to include/nlm/sparc32-ext.h
diff --git a/binutils/binutils-2.21/include/oasys.h b/include/oasys.h
similarity index 100%
rename from binutils/binutils-2.21/include/oasys.h
rename to include/oasys.h
diff --git a/binutils/binutils-2.21/include/objalloc.h b/include/objalloc.h
similarity index 100%
rename from binutils/binutils-2.21/include/objalloc.h
rename to include/objalloc.h
diff --git a/binutils/binutils-2.21/include/obstack.h b/include/obstack.h
similarity index 100%
rename from binutils/binutils-2.21/include/obstack.h
rename to include/obstack.h
diff --git a/binutils/binutils-2.21/include/opcode/ChangeLog b/include/opcode/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/ChangeLog
rename to include/opcode/ChangeLog
diff --git a/binutils/binutils-2.21/include/opcode/ChangeLog-9103 b/include/opcode/ChangeLog-9103
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/ChangeLog-9103
rename to include/opcode/ChangeLog-9103
diff --git a/binutils/binutils-2.21/include/opcode/alpha.h b/include/opcode/alpha.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/alpha.h
rename to include/opcode/alpha.h
diff --git a/binutils/binutils-2.21/include/opcode/arc.h b/include/opcode/arc.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/arc.h
rename to include/opcode/arc.h
diff --git a/binutils/binutils-2.21/include/opcode/arm.h b/include/opcode/arm.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/arm.h
rename to include/opcode/arm.h
diff --git a/binutils/binutils-2.21/include/opcode/avr.h b/include/opcode/avr.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/avr.h
rename to include/opcode/avr.h
diff --git a/binutils/binutils-2.21/include/opcode/bfin.h b/include/opcode/bfin.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/bfin.h
rename to include/opcode/bfin.h
diff --git a/binutils/binutils-2.21/include/opcode/cgen.h b/include/opcode/cgen.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/cgen.h
rename to include/opcode/cgen.h
diff --git a/binutils/binutils-2.21/include/opcode/convex.h b/include/opcode/convex.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/convex.h
rename to include/opcode/convex.h
diff --git a/binutils/binutils-2.21/include/opcode/cr16.h b/include/opcode/cr16.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/cr16.h
rename to include/opcode/cr16.h
diff --git a/binutils/binutils-2.21/include/opcode/cris.h b/include/opcode/cris.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/cris.h
rename to include/opcode/cris.h
diff --git a/binutils/binutils-2.21/include/opcode/crx.h b/include/opcode/crx.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/crx.h
rename to include/opcode/crx.h
diff --git a/binutils/binutils-2.21/include/opcode/d10v.h b/include/opcode/d10v.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/d10v.h
rename to include/opcode/d10v.h
diff --git a/binutils/binutils-2.21/include/opcode/d30v.h b/include/opcode/d30v.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/d30v.h
rename to include/opcode/d30v.h
diff --git a/binutils/binutils-2.21/include/opcode/dlx.h b/include/opcode/dlx.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/dlx.h
rename to include/opcode/dlx.h
diff --git a/binutils/binutils-2.21/include/opcode/h8300.h b/include/opcode/h8300.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/h8300.h
rename to include/opcode/h8300.h
diff --git a/binutils/binutils-2.21/include/opcode/hppa.h b/include/opcode/hppa.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/hppa.h
rename to include/opcode/hppa.h
diff --git a/binutils/binutils-2.21/include/opcode/i370.h b/include/opcode/i370.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/i370.h
rename to include/opcode/i370.h
diff --git a/binutils/binutils-2.21/include/opcode/i386.h b/include/opcode/i386.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/i386.h
rename to include/opcode/i386.h
diff --git a/binutils/binutils-2.21/include/opcode/i860.h b/include/opcode/i860.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/i860.h
rename to include/opcode/i860.h
diff --git a/binutils/binutils-2.21/include/opcode/i960.h b/include/opcode/i960.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/i960.h
rename to include/opcode/i960.h
diff --git a/binutils/binutils-2.21/include/opcode/ia64.h b/include/opcode/ia64.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/ia64.h
rename to include/opcode/ia64.h
diff --git a/binutils/binutils-2.21/include/opcode/m68hc11.h b/include/opcode/m68hc11.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/m68hc11.h
rename to include/opcode/m68hc11.h
diff --git a/binutils/binutils-2.21/include/opcode/m68k.h b/include/opcode/m68k.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/m68k.h
rename to include/opcode/m68k.h
diff --git a/binutils/binutils-2.21/include/opcode/m88k.h b/include/opcode/m88k.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/m88k.h
rename to include/opcode/m88k.h
diff --git a/binutils/binutils-2.21/include/opcode/mips.h b/include/opcode/mips.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/mips.h
rename to include/opcode/mips.h
diff --git a/binutils/binutils-2.21/include/opcode/mmix.h b/include/opcode/mmix.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/mmix.h
rename to include/opcode/mmix.h
diff --git a/binutils/binutils-2.21/include/opcode/mn10200.h b/include/opcode/mn10200.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/mn10200.h
rename to include/opcode/mn10200.h
diff --git a/binutils/binutils-2.21/include/opcode/mn10300.h b/include/opcode/mn10300.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/mn10300.h
rename to include/opcode/mn10300.h
diff --git a/binutils/binutils-2.21/include/opcode/moxie.h b/include/opcode/moxie.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/moxie.h
rename to include/opcode/moxie.h
diff --git a/binutils/binutils-2.21/include/opcode/msp430.h b/include/opcode/msp430.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/msp430.h
rename to include/opcode/msp430.h
diff --git a/binutils/binutils-2.21/include/opcode/np1.h b/include/opcode/np1.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/np1.h
rename to include/opcode/np1.h
diff --git a/binutils/binutils-2.21/include/opcode/ns32k.h b/include/opcode/ns32k.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/ns32k.h
rename to include/opcode/ns32k.h
diff --git a/binutils/binutils-2.21/include/opcode/or32.h b/include/opcode/or32.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/or32.h
rename to include/opcode/or32.h
diff --git a/binutils/binutils-2.21/include/opcode/pdp11.h b/include/opcode/pdp11.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/pdp11.h
rename to include/opcode/pdp11.h
diff --git a/binutils/binutils-2.21/include/opcode/pj.h b/include/opcode/pj.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/pj.h
rename to include/opcode/pj.h
diff --git a/binutils/binutils-2.21/include/opcode/pn.h b/include/opcode/pn.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/pn.h
rename to include/opcode/pn.h
diff --git a/binutils/binutils-2.21/include/opcode/ppc.h b/include/opcode/ppc.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/ppc.h
rename to include/opcode/ppc.h
diff --git a/binutils/binutils-2.21/include/opcode/pyr.h b/include/opcode/pyr.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/pyr.h
rename to include/opcode/pyr.h
diff --git a/binutils/binutils-2.21/include/opcode/rx.h b/include/opcode/rx.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/rx.h
rename to include/opcode/rx.h
diff --git a/binutils/binutils-2.21/include/opcode/s390.h b/include/opcode/s390.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/s390.h
rename to include/opcode/s390.h
diff --git a/binutils/binutils-2.21/include/opcode/score-datadep.h b/include/opcode/score-datadep.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/score-datadep.h
rename to include/opcode/score-datadep.h
diff --git a/binutils/binutils-2.21/include/opcode/score-inst.h b/include/opcode/score-inst.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/score-inst.h
rename to include/opcode/score-inst.h
diff --git a/binutils/binutils-2.21/include/opcode/sparc.h b/include/opcode/sparc.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/sparc.h
rename to include/opcode/sparc.h
diff --git a/binutils/binutils-2.21/include/opcode/spu-insns.h b/include/opcode/spu-insns.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/spu-insns.h
rename to include/opcode/spu-insns.h
diff --git a/binutils/binutils-2.21/include/opcode/spu.h b/include/opcode/spu.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/spu.h
rename to include/opcode/spu.h
diff --git a/binutils/binutils-2.21/include/opcode/tahoe.h b/include/opcode/tahoe.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tahoe.h
rename to include/opcode/tahoe.h
diff --git a/binutils/binutils-2.21/include/opcode/tic30.h b/include/opcode/tic30.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic30.h
rename to include/opcode/tic30.h
diff --git a/binutils/binutils-2.21/include/opcode/tic4x.h b/include/opcode/tic4x.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic4x.h
rename to include/opcode/tic4x.h
diff --git a/binutils/binutils-2.21/include/opcode/tic54x.h b/include/opcode/tic54x.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic54x.h
rename to include/opcode/tic54x.h
diff --git a/binutils/binutils-2.21/include/opcode/tic6x-control-registers.h b/include/opcode/tic6x-control-registers.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic6x-control-registers.h
rename to include/opcode/tic6x-control-registers.h
diff --git a/binutils/binutils-2.21/include/opcode/tic6x-insn-formats.h b/include/opcode/tic6x-insn-formats.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic6x-insn-formats.h
rename to include/opcode/tic6x-insn-formats.h
diff --git a/binutils/binutils-2.21/include/opcode/tic6x-opcode-table.h b/include/opcode/tic6x-opcode-table.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic6x-opcode-table.h
rename to include/opcode/tic6x-opcode-table.h
diff --git a/binutils/binutils-2.21/include/opcode/tic6x.h b/include/opcode/tic6x.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic6x.h
rename to include/opcode/tic6x.h
diff --git a/binutils/binutils-2.21/include/opcode/tic80.h b/include/opcode/tic80.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/tic80.h
rename to include/opcode/tic80.h
diff --git a/binutils/binutils-2.21/include/opcode/v850.h b/include/opcode/v850.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/v850.h
rename to include/opcode/v850.h
diff --git a/binutils/binutils-2.21/include/opcode/vax.h b/include/opcode/vax.h
similarity index 100%
rename from binutils/binutils-2.21/include/opcode/vax.h
rename to include/opcode/vax.h
diff --git a/binutils/binutils-2.21/include/os9k.h b/include/os9k.h
similarity index 100%
rename from binutils/binutils-2.21/include/os9k.h
rename to include/os9k.h
diff --git a/binutils/binutils-2.21/include/partition.h b/include/partition.h
similarity index 100%
rename from binutils/binutils-2.21/include/partition.h
rename to include/partition.h
diff --git a/binutils/binutils-2.21/include/plugin-api.h b/include/plugin-api.h
similarity index 100%
rename from binutils/binutils-2.21/include/plugin-api.h
rename to include/plugin-api.h
diff --git a/binutils/binutils-2.21/include/progress.h b/include/progress.h
similarity index 100%
rename from binutils/binutils-2.21/include/progress.h
rename to include/progress.h
diff --git a/binutils/binutils-2.21/include/safe-ctype.h b/include/safe-ctype.h
similarity index 100%
rename from binutils/binutils-2.21/include/safe-ctype.h
rename to include/safe-ctype.h
diff --git a/binutils/binutils-2.21/include/sha1.h b/include/sha1.h
similarity index 100%
rename from binutils/binutils-2.21/include/sha1.h
rename to include/sha1.h
diff --git a/binutils/binutils-2.21/include/simple-object.h b/include/simple-object.h
similarity index 100%
rename from binutils/binutils-2.21/include/simple-object.h
rename to include/simple-object.h
diff --git a/binutils/binutils-2.21/include/som/ChangeLog b/include/som/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/som/ChangeLog
rename to include/som/ChangeLog
diff --git a/binutils/binutils-2.21/include/som/aout.h b/include/som/aout.h
similarity index 100%
rename from binutils/binutils-2.21/include/som/aout.h
rename to include/som/aout.h
diff --git a/binutils/binutils-2.21/include/som/clock.h b/include/som/clock.h
similarity index 100%
rename from binutils/binutils-2.21/include/som/clock.h
rename to include/som/clock.h
diff --git a/binutils/binutils-2.21/include/som/internal.h b/include/som/internal.h
similarity index 100%
rename from binutils/binutils-2.21/include/som/internal.h
rename to include/som/internal.h
diff --git a/binutils/binutils-2.21/include/som/lst.h b/include/som/lst.h
similarity index 100%
rename from binutils/binutils-2.21/include/som/lst.h
rename to include/som/lst.h
diff --git a/binutils/binutils-2.21/include/som/reloc.h b/include/som/reloc.h
similarity index 100%
rename from binutils/binutils-2.21/include/som/reloc.h
rename to include/som/reloc.h
diff --git a/binutils/binutils-2.21/include/sort.h b/include/sort.h
similarity index 100%
rename from binutils/binutils-2.21/include/sort.h
rename to include/sort.h
diff --git a/binutils/binutils-2.21/include/splay-tree.h b/include/splay-tree.h
similarity index 100%
rename from binutils/binutils-2.21/include/splay-tree.h
rename to include/splay-tree.h
diff --git a/binutils/binutils-2.21/include/symcat.h b/include/symcat.h
similarity index 100%
rename from binutils/binutils-2.21/include/symcat.h
rename to include/symcat.h
diff --git a/binutils/binutils-2.21/include/vms/ChangeLog b/include/vms/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/include/vms/ChangeLog
rename to include/vms/ChangeLog
diff --git a/binutils/binutils-2.21/include/vms/dcx.h b/include/vms/dcx.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/dcx.h
rename to include/vms/dcx.h
diff --git a/binutils/binutils-2.21/include/vms/dmt.h b/include/vms/dmt.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/dmt.h
rename to include/vms/dmt.h
diff --git a/binutils/binutils-2.21/include/vms/dsc.h b/include/vms/dsc.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/dsc.h
rename to include/vms/dsc.h
diff --git a/binutils/binutils-2.21/include/vms/dst.h b/include/vms/dst.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/dst.h
rename to include/vms/dst.h
diff --git a/binutils/binutils-2.21/include/vms/eeom.h b/include/vms/eeom.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eeom.h
rename to include/vms/eeom.h
diff --git a/binutils/binutils-2.21/include/vms/egps.h b/include/vms/egps.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/egps.h
rename to include/vms/egps.h
diff --git a/binutils/binutils-2.21/include/vms/egsd.h b/include/vms/egsd.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/egsd.h
rename to include/vms/egsd.h
diff --git a/binutils/binutils-2.21/include/vms/egst.h b/include/vms/egst.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/egst.h
rename to include/vms/egst.h
diff --git a/binutils/binutils-2.21/include/vms/egsy.h b/include/vms/egsy.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/egsy.h
rename to include/vms/egsy.h
diff --git a/binutils/binutils-2.21/include/vms/eiaf.h b/include/vms/eiaf.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eiaf.h
rename to include/vms/eiaf.h
diff --git a/binutils/binutils-2.21/include/vms/eicp.h b/include/vms/eicp.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eicp.h
rename to include/vms/eicp.h
diff --git a/binutils/binutils-2.21/include/vms/eidc.h b/include/vms/eidc.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eidc.h
rename to include/vms/eidc.h
diff --git a/binutils/binutils-2.21/include/vms/eiha.h b/include/vms/eiha.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eiha.h
rename to include/vms/eiha.h
diff --git a/binutils/binutils-2.21/include/vms/eihd.h b/include/vms/eihd.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eihd.h
rename to include/vms/eihd.h
diff --git a/binutils/binutils-2.21/include/vms/eihi.h b/include/vms/eihi.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eihi.h
rename to include/vms/eihi.h
diff --git a/binutils/binutils-2.21/include/vms/eihs.h b/include/vms/eihs.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eihs.h
rename to include/vms/eihs.h
diff --git a/binutils/binutils-2.21/include/vms/eihvn.h b/include/vms/eihvn.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eihvn.h
rename to include/vms/eihvn.h
diff --git a/binutils/binutils-2.21/include/vms/eisd.h b/include/vms/eisd.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eisd.h
rename to include/vms/eisd.h
diff --git a/binutils/binutils-2.21/include/vms/emh.h b/include/vms/emh.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/emh.h
rename to include/vms/emh.h
diff --git a/binutils/binutils-2.21/include/vms/eobjrec.h b/include/vms/eobjrec.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/eobjrec.h
rename to include/vms/eobjrec.h
diff --git a/binutils/binutils-2.21/include/vms/esdf.h b/include/vms/esdf.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/esdf.h
rename to include/vms/esdf.h
diff --git a/binutils/binutils-2.21/include/vms/esdfm.h b/include/vms/esdfm.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/esdfm.h
rename to include/vms/esdfm.h
diff --git a/binutils/binutils-2.21/include/vms/esdfv.h b/include/vms/esdfv.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/esdfv.h
rename to include/vms/esdfv.h
diff --git a/binutils/binutils-2.21/include/vms/esgps.h b/include/vms/esgps.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/esgps.h
rename to include/vms/esgps.h
diff --git a/binutils/binutils-2.21/include/vms/esrf.h b/include/vms/esrf.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/esrf.h
rename to include/vms/esrf.h
diff --git a/binutils/binutils-2.21/include/vms/etir.h b/include/vms/etir.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/etir.h
rename to include/vms/etir.h
diff --git a/binutils/binutils-2.21/include/vms/internal.h b/include/vms/internal.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/internal.h
rename to include/vms/internal.h
diff --git a/binutils/binutils-2.21/include/vms/lbr.h b/include/vms/lbr.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/lbr.h
rename to include/vms/lbr.h
diff --git a/binutils/binutils-2.21/include/vms/prt.h b/include/vms/prt.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/prt.h
rename to include/vms/prt.h
diff --git a/binutils/binutils-2.21/include/vms/shl.h b/include/vms/shl.h
similarity index 100%
rename from binutils/binutils-2.21/include/vms/shl.h
rename to include/vms/shl.h
diff --git a/binutils/binutils-2.21/include/xregex.h b/include/xregex.h
similarity index 100%
rename from binutils/binutils-2.21/include/xregex.h
rename to include/xregex.h
diff --git a/binutils/binutils-2.21/include/xregex2.h b/include/xregex2.h
similarity index 100%
rename from binutils/binutils-2.21/include/xregex2.h
rename to include/xregex2.h
diff --git a/binutils/binutils-2.21/include/xtensa-config.h b/include/xtensa-config.h
similarity index 100%
rename from binutils/binutils-2.21/include/xtensa-config.h
rename to include/xtensa-config.h
diff --git a/binutils/binutils-2.21/include/xtensa-isa-internal.h b/include/xtensa-isa-internal.h
similarity index 100%
rename from binutils/binutils-2.21/include/xtensa-isa-internal.h
rename to include/xtensa-isa-internal.h
diff --git a/binutils/binutils-2.21/include/xtensa-isa.h b/include/xtensa-isa.h
similarity index 100%
rename from binutils/binutils-2.21/include/xtensa-isa.h
rename to include/xtensa-isa.h
diff --git a/binutils/binutils-2.21/install-sh b/install-sh
similarity index 100%
rename from binutils/binutils-2.21/install-sh
rename to install-sh
diff --git a/binutils/binutils-2.21/intl/ChangeLog b/intl/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/intl/ChangeLog
rename to intl/ChangeLog
diff --git a/binutils/binutils-2.21/intl/Makefile.in b/intl/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/intl/Makefile.in
rename to intl/Makefile.in
diff --git a/binutils/binutils-2.21/intl/README b/intl/README
similarity index 100%
rename from binutils/binutils-2.21/intl/README
rename to intl/README
diff --git a/binutils/binutils-2.21/intl/VERSION b/intl/VERSION
similarity index 100%
rename from binutils/binutils-2.21/intl/VERSION
rename to intl/VERSION
diff --git a/binutils/binutils-2.21/intl/aclocal.m4 b/intl/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/intl/aclocal.m4
rename to intl/aclocal.m4
diff --git a/binutils/binutils-2.21/intl/bindtextdom.c b/intl/bindtextdom.c
similarity index 100%
rename from binutils/binutils-2.21/intl/bindtextdom.c
rename to intl/bindtextdom.c
diff --git a/binutils/binutils-2.21/intl/config.h.in b/intl/config.h.in
similarity index 100%
rename from binutils/binutils-2.21/intl/config.h.in
rename to intl/config.h.in
diff --git a/binutils/binutils-2.21/intl/config.intl.in b/intl/config.intl.in
similarity index 100%
rename from binutils/binutils-2.21/intl/config.intl.in
rename to intl/config.intl.in
diff --git a/binutils/binutils-2.21/intl/configure b/intl/configure
similarity index 100%
rename from binutils/binutils-2.21/intl/configure
rename to intl/configure
diff --git a/binutils/binutils-2.21/intl/configure.ac b/intl/configure.ac
similarity index 100%
rename from binutils/binutils-2.21/intl/configure.ac
rename to intl/configure.ac
diff --git a/binutils/binutils-2.21/intl/dcgettext.c b/intl/dcgettext.c
similarity index 100%
rename from binutils/binutils-2.21/intl/dcgettext.c
rename to intl/dcgettext.c
diff --git a/binutils/binutils-2.21/intl/dcigettext.c b/intl/dcigettext.c
similarity index 100%
rename from binutils/binutils-2.21/intl/dcigettext.c
rename to intl/dcigettext.c
diff --git a/binutils/binutils-2.21/intl/dcngettext.c b/intl/dcngettext.c
similarity index 100%
rename from binutils/binutils-2.21/intl/dcngettext.c
rename to intl/dcngettext.c
diff --git a/binutils/binutils-2.21/intl/dgettext.c b/intl/dgettext.c
similarity index 100%
rename from binutils/binutils-2.21/intl/dgettext.c
rename to intl/dgettext.c
diff --git a/binutils/binutils-2.21/intl/dngettext.c b/intl/dngettext.c
similarity index 100%
rename from binutils/binutils-2.21/intl/dngettext.c
rename to intl/dngettext.c
diff --git a/binutils/binutils-2.21/intl/eval-plural.h b/intl/eval-plural.h
similarity index 100%
rename from binutils/binutils-2.21/intl/eval-plural.h
rename to intl/eval-plural.h
diff --git a/binutils/binutils-2.21/intl/explodename.c b/intl/explodename.c
similarity index 100%
rename from binutils/binutils-2.21/intl/explodename.c
rename to intl/explodename.c
diff --git a/binutils/binutils-2.21/intl/finddomain.c b/intl/finddomain.c
similarity index 100%
rename from binutils/binutils-2.21/intl/finddomain.c
rename to intl/finddomain.c
diff --git a/binutils/binutils-2.21/intl/gettext.c b/intl/gettext.c
similarity index 100%
rename from binutils/binutils-2.21/intl/gettext.c
rename to intl/gettext.c
diff --git a/binutils/binutils-2.21/intl/gettextP.h b/intl/gettextP.h
similarity index 100%
rename from binutils/binutils-2.21/intl/gettextP.h
rename to intl/gettextP.h
diff --git a/binutils/binutils-2.21/intl/gmo.h b/intl/gmo.h
similarity index 100%
rename from binutils/binutils-2.21/intl/gmo.h
rename to intl/gmo.h
diff --git a/binutils/binutils-2.21/intl/hash-string.h b/intl/hash-string.h
similarity index 100%
rename from binutils/binutils-2.21/intl/hash-string.h
rename to intl/hash-string.h
diff --git a/binutils/binutils-2.21/intl/intl-compat.c b/intl/intl-compat.c
similarity index 100%
rename from binutils/binutils-2.21/intl/intl-compat.c
rename to intl/intl-compat.c
diff --git a/binutils/binutils-2.21/intl/l10nflist.c b/intl/l10nflist.c
similarity index 100%
rename from binutils/binutils-2.21/intl/l10nflist.c
rename to intl/l10nflist.c
diff --git a/binutils/binutils-2.21/intl/libgnuintl.h b/intl/libgnuintl.h
similarity index 100%
rename from binutils/binutils-2.21/intl/libgnuintl.h
rename to intl/libgnuintl.h
diff --git a/binutils/binutils-2.21/intl/loadinfo.h b/intl/loadinfo.h
similarity index 100%
rename from binutils/binutils-2.21/intl/loadinfo.h
rename to intl/loadinfo.h
diff --git a/binutils/binutils-2.21/intl/loadmsgcat.c b/intl/loadmsgcat.c
similarity index 100%
rename from binutils/binutils-2.21/intl/loadmsgcat.c
rename to intl/loadmsgcat.c
diff --git a/binutils/binutils-2.21/intl/localcharset.c b/intl/localcharset.c
similarity index 100%
rename from binutils/binutils-2.21/intl/localcharset.c
rename to intl/localcharset.c
diff --git a/binutils/binutils-2.21/intl/localcharset.h b/intl/localcharset.h
similarity index 100%
rename from binutils/binutils-2.21/intl/localcharset.h
rename to intl/localcharset.h
diff --git a/binutils/binutils-2.21/intl/locale.alias b/intl/locale.alias
similarity index 100%
rename from binutils/binutils-2.21/intl/locale.alias
rename to intl/locale.alias
diff --git a/binutils/binutils-2.21/intl/localealias.c b/intl/localealias.c
similarity index 100%
rename from binutils/binutils-2.21/intl/localealias.c
rename to intl/localealias.c
diff --git a/binutils/binutils-2.21/intl/localename.c b/intl/localename.c
similarity index 100%
rename from binutils/binutils-2.21/intl/localename.c
rename to intl/localename.c
diff --git a/binutils/binutils-2.21/intl/log.c b/intl/log.c
similarity index 100%
rename from binutils/binutils-2.21/intl/log.c
rename to intl/log.c
diff --git a/binutils/binutils-2.21/intl/ngettext.c b/intl/ngettext.c
similarity index 100%
rename from binutils/binutils-2.21/intl/ngettext.c
rename to intl/ngettext.c
diff --git a/binutils/binutils-2.21/intl/osdep.c b/intl/osdep.c
similarity index 100%
rename from binutils/binutils-2.21/intl/osdep.c
rename to intl/osdep.c
diff --git a/binutils/binutils-2.21/intl/plural-exp.c b/intl/plural-exp.c
similarity index 100%
rename from binutils/binutils-2.21/intl/plural-exp.c
rename to intl/plural-exp.c
diff --git a/binutils/binutils-2.21/intl/plural-exp.h b/intl/plural-exp.h
similarity index 100%
rename from binutils/binutils-2.21/intl/plural-exp.h
rename to intl/plural-exp.h
diff --git a/binutils/binutils-2.21/intl/plural.c b/intl/plural.c
similarity index 100%
rename from binutils/binutils-2.21/intl/plural.c
rename to intl/plural.c
diff --git a/binutils/binutils-2.21/intl/plural.y b/intl/plural.y
similarity index 100%
rename from binutils/binutils-2.21/intl/plural.y
rename to intl/plural.y
diff --git a/binutils/binutils-2.21/intl/relocatable.c b/intl/relocatable.c
similarity index 100%
rename from binutils/binutils-2.21/intl/relocatable.c
rename to intl/relocatable.c
diff --git a/binutils/binutils-2.21/intl/relocatable.h b/intl/relocatable.h
similarity index 100%
rename from binutils/binutils-2.21/intl/relocatable.h
rename to intl/relocatable.h
diff --git a/binutils/binutils-2.21/intl/textdomain.c b/intl/textdomain.c
similarity index 100%
rename from binutils/binutils-2.21/intl/textdomain.c
rename to intl/textdomain.c
diff --git a/binutils/binutils-2.21/ld/ChangeLog b/ld/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog
rename to ld/ChangeLog
diff --git a/binutils/binutils-2.21/ld/ChangeLog-0001 b/ld/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-0001
rename to ld/ChangeLog-0001
diff --git a/binutils/binutils-2.21/ld/ChangeLog-0203 b/ld/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-0203
rename to ld/ChangeLog-0203
diff --git a/binutils/binutils-2.21/ld/ChangeLog-2004 b/ld/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-2004
rename to ld/ChangeLog-2004
diff --git a/binutils/binutils-2.21/ld/ChangeLog-2005 b/ld/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-2005
rename to ld/ChangeLog-2005
diff --git a/binutils/binutils-2.21/ld/ChangeLog-2006 b/ld/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-2006
rename to ld/ChangeLog-2006
diff --git a/binutils/binutils-2.21/ld/ChangeLog-2007 b/ld/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-2007
rename to ld/ChangeLog-2007
diff --git a/binutils/binutils-2.21/ld/ChangeLog-2008 b/ld/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-2008
rename to ld/ChangeLog-2008
diff --git a/binutils/binutils-2.21/ld/ChangeLog-2009 b/ld/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-2009
rename to ld/ChangeLog-2009
diff --git a/binutils/binutils-2.21/ld/ChangeLog-9197 b/ld/ChangeLog-9197
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-9197
rename to ld/ChangeLog-9197
diff --git a/binutils/binutils-2.21/ld/ChangeLog-9899 b/ld/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/ld/ChangeLog-9899
rename to ld/ChangeLog-9899
diff --git a/binutils/binutils-2.21/ld/MAINTAINERS b/ld/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/ld/MAINTAINERS
rename to ld/MAINTAINERS
diff --git a/binutils/binutils-2.21/ld/Makefile.am b/ld/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/ld/Makefile.am
rename to ld/Makefile.am
diff --git a/binutils/binutils-2.21/ld/Makefile.in b/ld/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/ld/Makefile.in
rename to ld/Makefile.in
diff --git a/binutils/binutils-2.21/ld/NEWS b/ld/NEWS
similarity index 100%
rename from binutils/binutils-2.21/ld/NEWS
rename to ld/NEWS
diff --git a/binutils/binutils-2.21/ld/README b/ld/README
similarity index 100%
rename from binutils/binutils-2.21/ld/README
rename to ld/README
diff --git a/binutils/binutils-2.21/ld/TODO b/ld/TODO
similarity index 100%
rename from binutils/binutils-2.21/ld/TODO
rename to ld/TODO
diff --git a/binutils/binutils-2.21/ld/aclocal.m4 b/ld/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/ld/aclocal.m4
rename to ld/aclocal.m4
diff --git a/binutils/binutils-2.21/ld/config.in b/ld/config.in
similarity index 100%
rename from binutils/binutils-2.21/ld/config.in
rename to ld/config.in
diff --git a/binutils/binutils-2.21/ld/configdoc.texi b/ld/configdoc.texi
similarity index 100%
rename from binutils/binutils-2.21/ld/configdoc.texi
rename to ld/configdoc.texi
diff --git a/binutils/binutils-2.21/ld/configure b/ld/configure
similarity index 100%
rename from binutils/binutils-2.21/ld/configure
rename to ld/configure
diff --git a/binutils/binutils-2.21/ld/configure.host b/ld/configure.host
similarity index 100%
rename from binutils/binutils-2.21/ld/configure.host
rename to ld/configure.host
diff --git a/binutils/binutils-2.21/ld/configure.in b/ld/configure.in
similarity index 100%
rename from binutils/binutils-2.21/ld/configure.in
rename to ld/configure.in
diff --git a/binutils/binutils-2.21/ld/configure.tgt b/ld/configure.tgt
similarity index 100%
rename from binutils/binutils-2.21/ld/configure.tgt
rename to ld/configure.tgt
diff --git a/binutils/binutils-2.21/ld/deffile.h b/ld/deffile.h
similarity index 100%
rename from binutils/binutils-2.21/ld/deffile.h
rename to ld/deffile.h
diff --git a/binutils/binutils-2.21/ld/deffilep.c b/ld/deffilep.c
similarity index 100%
rename from binutils/binutils-2.21/ld/deffilep.c
rename to ld/deffilep.c
diff --git a/binutils/binutils-2.21/ld/deffilep.h b/ld/deffilep.h
similarity index 100%
rename from binutils/binutils-2.21/ld/deffilep.h
rename to ld/deffilep.h
diff --git a/binutils/binutils-2.21/ld/deffilep.y b/ld/deffilep.y
similarity index 100%
rename from binutils/binutils-2.21/ld/deffilep.y
rename to ld/deffilep.y
diff --git a/binutils/binutils-2.21/ld/dep-in.sed b/ld/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/ld/dep-in.sed
rename to ld/dep-in.sed
diff --git a/binutils/binutils-2.21/ld/elf-hints-local.h b/ld/elf-hints-local.h
similarity index 100%
rename from binutils/binutils-2.21/ld/elf-hints-local.h
rename to ld/elf-hints-local.h
diff --git a/binutils/binutils-2.21/ld/emulparams/README b/ld/emulparams/README
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/README
rename to ld/emulparams/README
diff --git a/binutils/binutils-2.21/ld/emulparams/aix5ppc.sh b/ld/emulparams/aix5ppc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/aix5ppc.sh
rename to ld/emulparams/aix5ppc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/aix5rs6.sh b/ld/emulparams/aix5rs6.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/aix5rs6.sh
rename to ld/emulparams/aix5rs6.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/aixppc.sh b/ld/emulparams/aixppc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/aixppc.sh
rename to ld/emulparams/aixppc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/aixrs6.sh b/ld/emulparams/aixrs6.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/aixrs6.sh
rename to ld/emulparams/aixrs6.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/alpha.sh b/ld/emulparams/alpha.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/alpha.sh
rename to ld/emulparams/alpha.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/alphavms.sh b/ld/emulparams/alphavms.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/alphavms.sh
rename to ld/emulparams/alphavms.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/arcelf.sh b/ld/emulparams/arcelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/arcelf.sh
rename to ld/emulparams/arcelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/arm_epoc_pe.sh b/ld/emulparams/arm_epoc_pe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/arm_epoc_pe.sh
rename to ld/emulparams/arm_epoc_pe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/arm_wince_pe.sh b/ld/emulparams/arm_wince_pe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/arm_wince_pe.sh
rename to ld/emulparams/arm_wince_pe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armaoutb.sh b/ld/emulparams/armaoutb.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armaoutb.sh
rename to ld/emulparams/armaoutb.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armaoutl.sh b/ld/emulparams/armaoutl.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armaoutl.sh
rename to ld/emulparams/armaoutl.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armcoff.sh b/ld/emulparams/armcoff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armcoff.sh
rename to ld/emulparams/armcoff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelf.sh b/ld/emulparams/armelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelf.sh
rename to ld/emulparams/armelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelf_fbsd.sh b/ld/emulparams/armelf_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelf_fbsd.sh
rename to ld/emulparams/armelf_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelf_linux.sh b/ld/emulparams/armelf_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelf_linux.sh
rename to ld/emulparams/armelf_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelf_linux_eabi.sh b/ld/emulparams/armelf_linux_eabi.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelf_linux_eabi.sh
rename to ld/emulparams/armelf_linux_eabi.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelf_nbsd.sh b/ld/emulparams/armelf_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelf_nbsd.sh
rename to ld/emulparams/armelf_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelf_vxworks.sh b/ld/emulparams/armelf_vxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelf_vxworks.sh
rename to ld/emulparams/armelf_vxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelfb.sh b/ld/emulparams/armelfb.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelfb.sh
rename to ld/emulparams/armelfb.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelfb_linux.sh b/ld/emulparams/armelfb_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelfb_linux.sh
rename to ld/emulparams/armelfb_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelfb_linux_eabi.sh b/ld/emulparams/armelfb_linux_eabi.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelfb_linux_eabi.sh
rename to ld/emulparams/armelfb_linux_eabi.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armelfb_nbsd.sh b/ld/emulparams/armelfb_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armelfb_nbsd.sh
rename to ld/emulparams/armelfb_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armnbsd.sh b/ld/emulparams/armnbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armnbsd.sh
rename to ld/emulparams/armnbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armnto.sh b/ld/emulparams/armnto.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armnto.sh
rename to ld/emulparams/armnto.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armpe.sh b/ld/emulparams/armpe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armpe.sh
rename to ld/emulparams/armpe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/armsymbian.sh b/ld/emulparams/armsymbian.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/armsymbian.sh
rename to ld/emulparams/armsymbian.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr1.sh b/ld/emulparams/avr1.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr1.sh
rename to ld/emulparams/avr1.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr2.sh b/ld/emulparams/avr2.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr2.sh
rename to ld/emulparams/avr2.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr25.sh b/ld/emulparams/avr25.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr25.sh
rename to ld/emulparams/avr25.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr3.sh b/ld/emulparams/avr3.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr3.sh
rename to ld/emulparams/avr3.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr31.sh b/ld/emulparams/avr31.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr31.sh
rename to ld/emulparams/avr31.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr35.sh b/ld/emulparams/avr35.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr35.sh
rename to ld/emulparams/avr35.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr4.sh b/ld/emulparams/avr4.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr4.sh
rename to ld/emulparams/avr4.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr5.sh b/ld/emulparams/avr5.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr5.sh
rename to ld/emulparams/avr5.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr51.sh b/ld/emulparams/avr51.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr51.sh
rename to ld/emulparams/avr51.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/avr6.sh b/ld/emulparams/avr6.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/avr6.sh
rename to ld/emulparams/avr6.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/bfin.sh b/ld/emulparams/bfin.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/bfin.sh
rename to ld/emulparams/bfin.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/coff_i860.sh b/ld/emulparams/coff_i860.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/coff_i860.sh
rename to ld/emulparams/coff_i860.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/coff_sparc.sh b/ld/emulparams/coff_sparc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/coff_sparc.sh
rename to ld/emulparams/coff_sparc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/crisaout.sh b/ld/emulparams/crisaout.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/crisaout.sh
rename to ld/emulparams/crisaout.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/criself.sh b/ld/emulparams/criself.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/criself.sh
rename to ld/emulparams/criself.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/crislinux.sh b/ld/emulparams/crislinux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/crislinux.sh
rename to ld/emulparams/crislinux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/d10velf.sh b/ld/emulparams/d10velf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/d10velf.sh
rename to ld/emulparams/d10velf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/d30v_e.sh b/ld/emulparams/d30v_e.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/d30v_e.sh
rename to ld/emulparams/d30v_e.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/d30v_o.sh b/ld/emulparams/d30v_o.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/d30v_o.sh
rename to ld/emulparams/d30v_o.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/d30velf.sh b/ld/emulparams/d30velf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/d30velf.sh
rename to ld/emulparams/d30velf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/delta68.sh b/ld/emulparams/delta68.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/delta68.sh
rename to ld/emulparams/delta68.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_dlx.sh b/ld/emulparams/elf32_dlx.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_dlx.sh
rename to ld/emulparams/elf32_dlx.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_i860.sh b/ld/emulparams/elf32_i860.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_i860.sh
rename to ld/emulparams/elf32_i860.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_i960.sh b/ld/emulparams/elf32_i960.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_i960.sh
rename to ld/emulparams/elf32_i960.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_sparc.sh b/ld/emulparams/elf32_sparc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_sparc.sh
rename to ld/emulparams/elf32_sparc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_sparc_sol2.sh b/ld/emulparams/elf32_sparc_sol2.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_sparc_sol2.sh
rename to ld/emulparams/elf32_sparc_sol2.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_sparc_vxworks.sh b/ld/emulparams/elf32_sparc_vxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_sparc_vxworks.sh
rename to ld/emulparams/elf32_sparc_vxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_spu.sh b/ld/emulparams/elf32_spu.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_spu.sh
rename to ld/emulparams/elf32_spu.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_tic6x_be.sh b/ld/emulparams/elf32_tic6x_be.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_tic6x_be.sh
rename to ld/emulparams/elf32_tic6x_be.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32_tic6x_le.sh b/ld/emulparams/elf32_tic6x_le.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32_tic6x_le.sh
rename to ld/emulparams/elf32_tic6x_le.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32am33lin.sh b/ld/emulparams/elf32am33lin.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32am33lin.sh
rename to ld/emulparams/elf32am33lin.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32b4300.sh b/ld/emulparams/elf32b4300.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32b4300.sh
rename to ld/emulparams/elf32b4300.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32bfinfd.sh b/ld/emulparams/elf32bfinfd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32bfinfd.sh
rename to ld/emulparams/elf32bfinfd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32bmip.sh b/ld/emulparams/elf32bmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32bmip.sh
rename to ld/emulparams/elf32bmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32bmipn32-defs.sh b/ld/emulparams/elf32bmipn32-defs.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32bmipn32-defs.sh
rename to ld/emulparams/elf32bmipn32-defs.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32bmipn32.sh b/ld/emulparams/elf32bmipn32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32bmipn32.sh
rename to ld/emulparams/elf32bmipn32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32bsmip.sh b/ld/emulparams/elf32bsmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32bsmip.sh
rename to ld/emulparams/elf32bsmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32btsmip.sh b/ld/emulparams/elf32btsmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32btsmip.sh
rename to ld/emulparams/elf32btsmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32btsmipn32.sh b/ld/emulparams/elf32btsmipn32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32btsmipn32.sh
rename to ld/emulparams/elf32btsmipn32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32cr16.sh b/ld/emulparams/elf32cr16.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32cr16.sh
rename to ld/emulparams/elf32cr16.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32cr16c.sh b/ld/emulparams/elf32cr16c.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32cr16c.sh
rename to ld/emulparams/elf32cr16c.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32crx.sh b/ld/emulparams/elf32crx.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32crx.sh
rename to ld/emulparams/elf32crx.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ebmip.sh b/ld/emulparams/elf32ebmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ebmip.sh
rename to ld/emulparams/elf32ebmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ebmipvxworks.sh b/ld/emulparams/elf32ebmipvxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ebmipvxworks.sh
rename to ld/emulparams/elf32ebmipvxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32elmip.sh b/ld/emulparams/elf32elmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32elmip.sh
rename to ld/emulparams/elf32elmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32elmipvxworks.sh b/ld/emulparams/elf32elmipvxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32elmipvxworks.sh
rename to ld/emulparams/elf32elmipvxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32fr30.sh b/ld/emulparams/elf32fr30.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32fr30.sh
rename to ld/emulparams/elf32fr30.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32frv.sh b/ld/emulparams/elf32frv.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32frv.sh
rename to ld/emulparams/elf32frv.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32frvfd.sh b/ld/emulparams/elf32frvfd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32frvfd.sh
rename to ld/emulparams/elf32frvfd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32i370.sh b/ld/emulparams/elf32i370.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32i370.sh
rename to ld/emulparams/elf32i370.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ip2k.sh b/ld/emulparams/elf32ip2k.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ip2k.sh
rename to ld/emulparams/elf32ip2k.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32iq10.sh b/ld/emulparams/elf32iq10.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32iq10.sh
rename to ld/emulparams/elf32iq10.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32iq2000.sh b/ld/emulparams/elf32iq2000.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32iq2000.sh
rename to ld/emulparams/elf32iq2000.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32l4300.sh b/ld/emulparams/elf32l4300.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32l4300.sh
rename to ld/emulparams/elf32l4300.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32lm32.sh b/ld/emulparams/elf32lm32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32lm32.sh
rename to ld/emulparams/elf32lm32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32lm32fd.sh b/ld/emulparams/elf32lm32fd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32lm32fd.sh
rename to ld/emulparams/elf32lm32fd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32lmip.sh b/ld/emulparams/elf32lmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32lmip.sh
rename to ld/emulparams/elf32lmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32lppc.sh b/ld/emulparams/elf32lppc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32lppc.sh
rename to ld/emulparams/elf32lppc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32lppcnto.sh b/ld/emulparams/elf32lppcnto.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32lppcnto.sh
rename to ld/emulparams/elf32lppcnto.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32lppcsim.sh b/ld/emulparams/elf32lppcsim.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32lppcsim.sh
rename to ld/emulparams/elf32lppcsim.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32lsmip.sh b/ld/emulparams/elf32lsmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32lsmip.sh
rename to ld/emulparams/elf32lsmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ltsmip.sh b/ld/emulparams/elf32ltsmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ltsmip.sh
rename to ld/emulparams/elf32ltsmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ltsmipn32.sh b/ld/emulparams/elf32ltsmipn32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ltsmipn32.sh
rename to ld/emulparams/elf32ltsmipn32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32m32c.sh b/ld/emulparams/elf32m32c.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32m32c.sh
rename to ld/emulparams/elf32m32c.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32mb_linux.sh b/ld/emulparams/elf32mb_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32mb_linux.sh
rename to ld/emulparams/elf32mb_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32mcore.sh b/ld/emulparams/elf32mcore.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32mcore.sh
rename to ld/emulparams/elf32mcore.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32mep.sh b/ld/emulparams/elf32mep.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32mep.sh
rename to ld/emulparams/elf32mep.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32microblaze.sh b/ld/emulparams/elf32microblaze.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32microblaze.sh
rename to ld/emulparams/elf32microblaze.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32mipswindiss.sh b/ld/emulparams/elf32mipswindiss.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32mipswindiss.sh
rename to ld/emulparams/elf32mipswindiss.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32moxie.sh b/ld/emulparams/elf32moxie.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32moxie.sh
rename to ld/emulparams/elf32moxie.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32mt.sh b/ld/emulparams/elf32mt.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32mt.sh
rename to ld/emulparams/elf32mt.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32openrisc.sh b/ld/emulparams/elf32openrisc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32openrisc.sh
rename to ld/emulparams/elf32openrisc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppc.sh b/ld/emulparams/elf32ppc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppc.sh
rename to ld/emulparams/elf32ppc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppc_fbsd.sh b/ld/emulparams/elf32ppc_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppc_fbsd.sh
rename to ld/emulparams/elf32ppc_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppccommon.sh
rename to ld/emulparams/elf32ppccommon.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppclinux.sh b/ld/emulparams/elf32ppclinux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppclinux.sh
rename to ld/emulparams/elf32ppclinux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppcnto.sh b/ld/emulparams/elf32ppcnto.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppcnto.sh
rename to ld/emulparams/elf32ppcnto.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppcsim.sh b/ld/emulparams/elf32ppcsim.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppcsim.sh
rename to ld/emulparams/elf32ppcsim.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppcvxworks.sh b/ld/emulparams/elf32ppcvxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppcvxworks.sh
rename to ld/emulparams/elf32ppcvxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32ppcwindiss.sh b/ld/emulparams/elf32ppcwindiss.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32ppcwindiss.sh
rename to ld/emulparams/elf32ppcwindiss.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32rx.sh b/ld/emulparams/elf32rx.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32rx.sh
rename to ld/emulparams/elf32rx.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32vax.sh b/ld/emulparams/elf32vax.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32vax.sh
rename to ld/emulparams/elf32vax.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32xc16x.sh b/ld/emulparams/elf32xc16x.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32xc16x.sh
rename to ld/emulparams/elf32xc16x.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32xc16xl.sh b/ld/emulparams/elf32xc16xl.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32xc16xl.sh
rename to ld/emulparams/elf32xc16xl.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32xc16xs.sh b/ld/emulparams/elf32xc16xs.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32xc16xs.sh
rename to ld/emulparams/elf32xc16xs.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32xstormy16.sh b/ld/emulparams/elf32xstormy16.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32xstormy16.sh
rename to ld/emulparams/elf32xstormy16.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf32xtensa.sh b/ld/emulparams/elf32xtensa.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf32xtensa.sh
rename to ld/emulparams/elf32xtensa.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64_aix.sh b/ld/emulparams/elf64_aix.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64_aix.sh
rename to ld/emulparams/elf64_aix.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64_ia64.sh b/ld/emulparams/elf64_ia64.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64_ia64.sh
rename to ld/emulparams/elf64_ia64.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64_ia64_fbsd.sh b/ld/emulparams/elf64_ia64_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64_ia64_fbsd.sh
rename to ld/emulparams/elf64_ia64_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64_s390.sh
rename to ld/emulparams/elf64_s390.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64_sparc.sh b/ld/emulparams/elf64_sparc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64_sparc.sh
rename to ld/emulparams/elf64_sparc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64_sparc_fbsd.sh b/ld/emulparams/elf64_sparc_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64_sparc_fbsd.sh
rename to ld/emulparams/elf64_sparc_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64_sparc_sol2.sh b/ld/emulparams/elf64_sparc_sol2.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64_sparc_sol2.sh
rename to ld/emulparams/elf64_sparc_sol2.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64alpha.sh b/ld/emulparams/elf64alpha.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64alpha.sh
rename to ld/emulparams/elf64alpha.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64alpha_fbsd.sh b/ld/emulparams/elf64alpha_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64alpha_fbsd.sh
rename to ld/emulparams/elf64alpha_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64alpha_nbsd.sh b/ld/emulparams/elf64alpha_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64alpha_nbsd.sh
rename to ld/emulparams/elf64alpha_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64bmip-defs.sh b/ld/emulparams/elf64bmip-defs.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64bmip-defs.sh
rename to ld/emulparams/elf64bmip-defs.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64bmip.sh b/ld/emulparams/elf64bmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64bmip.sh
rename to ld/emulparams/elf64bmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64btsmip.sh b/ld/emulparams/elf64btsmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64btsmip.sh
rename to ld/emulparams/elf64btsmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64hppa.sh b/ld/emulparams/elf64hppa.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64hppa.sh
rename to ld/emulparams/elf64hppa.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64lppc.sh b/ld/emulparams/elf64lppc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64lppc.sh
rename to ld/emulparams/elf64lppc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64ltsmip.sh b/ld/emulparams/elf64ltsmip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64ltsmip.sh
rename to ld/emulparams/elf64ltsmip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64mmix.sh b/ld/emulparams/elf64mmix.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64mmix.sh
rename to ld/emulparams/elf64mmix.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf64ppc.sh b/ld/emulparams/elf64ppc.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf64ppc.sh
rename to ld/emulparams/elf64ppc.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_fbsd.sh b/ld/emulparams/elf_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_fbsd.sh
rename to ld/emulparams/elf_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_i386.sh
rename to ld/emulparams/elf_i386.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_i386_be.sh b/ld/emulparams/elf_i386_be.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_i386_be.sh
rename to ld/emulparams/elf_i386_be.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_i386_chaos.sh b/ld/emulparams/elf_i386_chaos.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_i386_chaos.sh
rename to ld/emulparams/elf_i386_chaos.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_i386_fbsd.sh b/ld/emulparams/elf_i386_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_i386_fbsd.sh
rename to ld/emulparams/elf_i386_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_i386_ldso.sh b/ld/emulparams/elf_i386_ldso.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_i386_ldso.sh
rename to ld/emulparams/elf_i386_ldso.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_i386_sol2.sh b/ld/emulparams/elf_i386_sol2.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_i386_sol2.sh
rename to ld/emulparams/elf_i386_sol2.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_i386_vxworks.sh b/ld/emulparams/elf_i386_vxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_i386_vxworks.sh
rename to ld/emulparams/elf_i386_vxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_l1om.sh b/ld/emulparams/elf_l1om.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_l1om.sh
rename to ld/emulparams/elf_l1om.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_l1om_fbsd.sh b/ld/emulparams/elf_l1om_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_l1om_fbsd.sh
rename to ld/emulparams/elf_l1om_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_s390.sh b/ld/emulparams/elf_s390.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_s390.sh
rename to ld/emulparams/elf_s390.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_x86_64.sh
rename to ld/emulparams/elf_x86_64.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_x86_64_fbsd.sh b/ld/emulparams/elf_x86_64_fbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_x86_64_fbsd.sh
rename to ld/emulparams/elf_x86_64_fbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/elf_x86_64_sol2.sh b/ld/emulparams/elf_x86_64_sol2.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/elf_x86_64_sol2.sh
rename to ld/emulparams/elf_x86_64_sol2.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/gld960.sh b/ld/emulparams/gld960.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/gld960.sh
rename to ld/emulparams/gld960.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/gld960coff.sh b/ld/emulparams/gld960coff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/gld960coff.sh
rename to ld/emulparams/gld960coff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300.sh b/ld/emulparams/h8300.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300.sh
rename to ld/emulparams/h8300.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300elf.sh b/ld/emulparams/h8300elf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300elf.sh
rename to ld/emulparams/h8300elf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300h.sh b/ld/emulparams/h8300h.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300h.sh
rename to ld/emulparams/h8300h.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300helf.sh b/ld/emulparams/h8300helf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300helf.sh
rename to ld/emulparams/h8300helf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300hn.sh b/ld/emulparams/h8300hn.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300hn.sh
rename to ld/emulparams/h8300hn.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300hnelf.sh b/ld/emulparams/h8300hnelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300hnelf.sh
rename to ld/emulparams/h8300hnelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300s.sh b/ld/emulparams/h8300s.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300s.sh
rename to ld/emulparams/h8300s.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300self.sh b/ld/emulparams/h8300self.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300self.sh
rename to ld/emulparams/h8300self.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300sn.sh b/ld/emulparams/h8300sn.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300sn.sh
rename to ld/emulparams/h8300sn.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300snelf.sh b/ld/emulparams/h8300snelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300snelf.sh
rename to ld/emulparams/h8300snelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300sx.sh b/ld/emulparams/h8300sx.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300sx.sh
rename to ld/emulparams/h8300sx.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300sxelf.sh b/ld/emulparams/h8300sxelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300sxelf.sh
rename to ld/emulparams/h8300sxelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300sxn.sh b/ld/emulparams/h8300sxn.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300sxn.sh
rename to ld/emulparams/h8300sxn.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8300sxnelf.sh b/ld/emulparams/h8300sxnelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8300sxnelf.sh
rename to ld/emulparams/h8300sxnelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8500.sh b/ld/emulparams/h8500.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8500.sh
rename to ld/emulparams/h8500.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8500b.sh b/ld/emulparams/h8500b.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8500b.sh
rename to ld/emulparams/h8500b.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8500c.sh b/ld/emulparams/h8500c.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8500c.sh
rename to ld/emulparams/h8500c.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8500m.sh b/ld/emulparams/h8500m.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8500m.sh
rename to ld/emulparams/h8500m.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/h8500s.sh b/ld/emulparams/h8500s.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/h8500s.sh
rename to ld/emulparams/h8500s.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/hp300bsd.sh b/ld/emulparams/hp300bsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/hp300bsd.sh
rename to ld/emulparams/hp300bsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/hp3hpux.sh b/ld/emulparams/hp3hpux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/hp3hpux.sh
rename to ld/emulparams/hp3hpux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/hppa64linux.sh b/ld/emulparams/hppa64linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/hppa64linux.sh
rename to ld/emulparams/hppa64linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/hppaelf.sh b/ld/emulparams/hppaelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/hppaelf.sh
rename to ld/emulparams/hppaelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/hppalinux.sh b/ld/emulparams/hppalinux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/hppalinux.sh
rename to ld/emulparams/hppalinux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/hppanbsd.sh b/ld/emulparams/hppanbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/hppanbsd.sh
rename to ld/emulparams/hppanbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/hppaobsd.sh b/ld/emulparams/hppaobsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/hppaobsd.sh
rename to ld/emulparams/hppaobsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386aout.sh b/ld/emulparams/i386aout.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386aout.sh
rename to ld/emulparams/i386aout.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386beos.sh b/ld/emulparams/i386beos.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386beos.sh
rename to ld/emulparams/i386beos.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386bsd.sh b/ld/emulparams/i386bsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386bsd.sh
rename to ld/emulparams/i386bsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386coff.sh b/ld/emulparams/i386coff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386coff.sh
rename to ld/emulparams/i386coff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386go32.sh b/ld/emulparams/i386go32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386go32.sh
rename to ld/emulparams/i386go32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386linux.sh b/ld/emulparams/i386linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386linux.sh
rename to ld/emulparams/i386linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386lynx.sh b/ld/emulparams/i386lynx.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386lynx.sh
rename to ld/emulparams/i386lynx.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386mach.sh b/ld/emulparams/i386mach.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386mach.sh
rename to ld/emulparams/i386mach.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386moss.sh b/ld/emulparams/i386moss.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386moss.sh
rename to ld/emulparams/i386moss.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386msdos.sh b/ld/emulparams/i386msdos.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386msdos.sh
rename to ld/emulparams/i386msdos.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386nbsd.sh b/ld/emulparams/i386nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386nbsd.sh
rename to ld/emulparams/i386nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386nto.sh b/ld/emulparams/i386nto.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386nto.sh
rename to ld/emulparams/i386nto.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386nw.sh b/ld/emulparams/i386nw.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386nw.sh
rename to ld/emulparams/i386nw.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386pe.sh b/ld/emulparams/i386pe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386pe.sh
rename to ld/emulparams/i386pe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386pe_posix.sh b/ld/emulparams/i386pe_posix.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386pe_posix.sh
rename to ld/emulparams/i386pe_posix.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/i386pep.sh b/ld/emulparams/i386pep.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/i386pep.sh
rename to ld/emulparams/i386pep.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/lnk960.sh b/ld/emulparams/lnk960.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/lnk960.sh
rename to ld/emulparams/lnk960.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m32relf.sh b/ld/emulparams/m32relf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m32relf.sh
rename to ld/emulparams/m32relf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m32relf_linux.sh b/ld/emulparams/m32relf_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m32relf_linux.sh
rename to ld/emulparams/m32relf_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m32rlelf.sh b/ld/emulparams/m32rlelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m32rlelf.sh
rename to ld/emulparams/m32rlelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m32rlelf_linux.sh b/ld/emulparams/m32rlelf_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m32rlelf_linux.sh
rename to ld/emulparams/m32rlelf_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68hc11elf.sh b/ld/emulparams/m68hc11elf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68hc11elf.sh
rename to ld/emulparams/m68hc11elf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68hc11elfb.sh b/ld/emulparams/m68hc11elfb.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68hc11elfb.sh
rename to ld/emulparams/m68hc11elfb.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68hc12elf.sh b/ld/emulparams/m68hc12elf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68hc12elf.sh
rename to ld/emulparams/m68hc12elf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68hc12elfb.sh b/ld/emulparams/m68hc12elfb.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68hc12elfb.sh
rename to ld/emulparams/m68hc12elfb.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68k4knbsd.sh b/ld/emulparams/m68k4knbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68k4knbsd.sh
rename to ld/emulparams/m68k4knbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68kaout.sh b/ld/emulparams/m68kaout.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68kaout.sh
rename to ld/emulparams/m68kaout.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68kaux.sh b/ld/emulparams/m68kaux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68kaux.sh
rename to ld/emulparams/m68kaux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68kcoff.sh b/ld/emulparams/m68kcoff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68kcoff.sh
rename to ld/emulparams/m68kcoff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68kelf.sh b/ld/emulparams/m68kelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68kelf.sh
rename to ld/emulparams/m68kelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68kelfnbsd.sh b/ld/emulparams/m68kelfnbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68kelfnbsd.sh
rename to ld/emulparams/m68kelfnbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68klinux.sh b/ld/emulparams/m68klinux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68klinux.sh
rename to ld/emulparams/m68klinux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68knbsd.sh b/ld/emulparams/m68knbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68knbsd.sh
rename to ld/emulparams/m68knbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m68kpsos.sh b/ld/emulparams/m68kpsos.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m68kpsos.sh
rename to ld/emulparams/m68kpsos.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/m88kbcs.sh b/ld/emulparams/m88kbcs.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/m88kbcs.sh
rename to ld/emulparams/m88kbcs.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mcorepe.sh b/ld/emulparams/mcorepe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mcorepe.sh
rename to ld/emulparams/mcorepe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mipsbig.sh b/ld/emulparams/mipsbig.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mipsbig.sh
rename to ld/emulparams/mipsbig.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mipsbsd.sh b/ld/emulparams/mipsbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mipsbsd.sh
rename to ld/emulparams/mipsbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mipsidt.sh b/ld/emulparams/mipsidt.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mipsidt.sh
rename to ld/emulparams/mipsidt.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mipsidtl.sh b/ld/emulparams/mipsidtl.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mipsidtl.sh
rename to ld/emulparams/mipsidtl.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mipslit.sh b/ld/emulparams/mipslit.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mipslit.sh
rename to ld/emulparams/mipslit.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mipslnews.sh b/ld/emulparams/mipslnews.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mipslnews.sh
rename to ld/emulparams/mipslnews.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mipspe.sh b/ld/emulparams/mipspe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mipspe.sh
rename to ld/emulparams/mipspe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mmo.sh b/ld/emulparams/mmo.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mmo.sh
rename to ld/emulparams/mmo.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mn10200.sh b/ld/emulparams/mn10200.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mn10200.sh
rename to ld/emulparams/mn10200.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/mn10300.sh b/ld/emulparams/mn10300.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/mn10300.sh
rename to ld/emulparams/mn10300.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/msp430all.sh b/ld/emulparams/msp430all.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/msp430all.sh
rename to ld/emulparams/msp430all.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/news.sh b/ld/emulparams/news.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/news.sh
rename to ld/emulparams/news.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/ns32knbsd.sh b/ld/emulparams/ns32knbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/ns32knbsd.sh
rename to ld/emulparams/ns32knbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/or32.sh b/ld/emulparams/or32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/or32.sh
rename to ld/emulparams/or32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/or32elf.sh b/ld/emulparams/or32elf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/or32elf.sh
rename to ld/emulparams/or32elf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/pc532macha.sh b/ld/emulparams/pc532macha.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/pc532macha.sh
rename to ld/emulparams/pc532macha.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/pdp11.sh b/ld/emulparams/pdp11.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/pdp11.sh
rename to ld/emulparams/pdp11.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/pjelf.sh b/ld/emulparams/pjelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/pjelf.sh
rename to ld/emulparams/pjelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/pjlelf.sh b/ld/emulparams/pjlelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/pjlelf.sh
rename to ld/emulparams/pjlelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/ppclynx.sh b/ld/emulparams/ppclynx.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/ppclynx.sh
rename to ld/emulparams/ppclynx.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/ppcmacos.sh b/ld/emulparams/ppcmacos.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/ppcmacos.sh
rename to ld/emulparams/ppcmacos.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/ppcnw.sh b/ld/emulparams/ppcnw.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/ppcnw.sh
rename to ld/emulparams/ppcnw.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/ppcpe.sh b/ld/emulparams/ppcpe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/ppcpe.sh
rename to ld/emulparams/ppcpe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/riscix.sh b/ld/emulparams/riscix.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/riscix.sh
rename to ld/emulparams/riscix.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/scoreelf.sh b/ld/emulparams/scoreelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/scoreelf.sh
rename to ld/emulparams/scoreelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/sh.sh b/ld/emulparams/sh.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/sh.sh
rename to ld/emulparams/sh.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf.sh b/ld/emulparams/shelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf.sh
rename to ld/emulparams/shelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf32.sh b/ld/emulparams/shelf32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf32.sh
rename to ld/emulparams/shelf32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf32_linux.sh b/ld/emulparams/shelf32_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf32_linux.sh
rename to ld/emulparams/shelf32_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf32_nbsd.sh b/ld/emulparams/shelf32_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf32_nbsd.sh
rename to ld/emulparams/shelf32_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf64.sh b/ld/emulparams/shelf64.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf64.sh
rename to ld/emulparams/shelf64.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf64_nbsd.sh b/ld/emulparams/shelf64_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf64_nbsd.sh
rename to ld/emulparams/shelf64_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf_fd.sh b/ld/emulparams/shelf_fd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf_fd.sh
rename to ld/emulparams/shelf_fd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf_linux.sh b/ld/emulparams/shelf_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf_linux.sh
rename to ld/emulparams/shelf_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf_nbsd.sh b/ld/emulparams/shelf_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf_nbsd.sh
rename to ld/emulparams/shelf_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf_nto.sh b/ld/emulparams/shelf_nto.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf_nto.sh
rename to ld/emulparams/shelf_nto.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf_uclinux.sh b/ld/emulparams/shelf_uclinux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf_uclinux.sh
rename to ld/emulparams/shelf_uclinux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shelf_vxworks.sh b/ld/emulparams/shelf_vxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shelf_vxworks.sh
rename to ld/emulparams/shelf_vxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shl.sh b/ld/emulparams/shl.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shl.sh
rename to ld/emulparams/shl.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf.sh b/ld/emulparams/shlelf.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf.sh
rename to ld/emulparams/shlelf.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf32.sh b/ld/emulparams/shlelf32.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf32.sh
rename to ld/emulparams/shlelf32.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf32_linux.sh b/ld/emulparams/shlelf32_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf32_linux.sh
rename to ld/emulparams/shlelf32_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf32_nbsd.sh b/ld/emulparams/shlelf32_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf32_nbsd.sh
rename to ld/emulparams/shlelf32_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf64.sh b/ld/emulparams/shlelf64.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf64.sh
rename to ld/emulparams/shlelf64.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf64_nbsd.sh b/ld/emulparams/shlelf64_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf64_nbsd.sh
rename to ld/emulparams/shlelf64_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf_fd.sh b/ld/emulparams/shlelf_fd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf_fd.sh
rename to ld/emulparams/shlelf_fd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf_linux.sh b/ld/emulparams/shlelf_linux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf_linux.sh
rename to ld/emulparams/shlelf_linux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf_nbsd.sh b/ld/emulparams/shlelf_nbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf_nbsd.sh
rename to ld/emulparams/shlelf_nbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf_nto.sh b/ld/emulparams/shlelf_nto.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf_nto.sh
rename to ld/emulparams/shlelf_nto.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlelf_vxworks.sh b/ld/emulparams/shlelf_vxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlelf_vxworks.sh
rename to ld/emulparams/shlelf_vxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shlsymbian.sh b/ld/emulparams/shlsymbian.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shlsymbian.sh
rename to ld/emulparams/shlsymbian.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/shpe.sh b/ld/emulparams/shpe.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/shpe.sh
rename to ld/emulparams/shpe.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/solaris2.sh b/ld/emulparams/solaris2.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/solaris2.sh
rename to ld/emulparams/solaris2.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/sparcaout.sh b/ld/emulparams/sparcaout.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/sparcaout.sh
rename to ld/emulparams/sparcaout.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/sparclinux.sh b/ld/emulparams/sparclinux.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/sparclinux.sh
rename to ld/emulparams/sparclinux.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/sparcnbsd.sh b/ld/emulparams/sparcnbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/sparcnbsd.sh
rename to ld/emulparams/sparcnbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/st2000.sh b/ld/emulparams/st2000.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/st2000.sh
rename to ld/emulparams/st2000.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/sun3.sh b/ld/emulparams/sun3.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/sun3.sh
rename to ld/emulparams/sun3.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/sun4.sh b/ld/emulparams/sun4.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/sun4.sh
rename to ld/emulparams/sun4.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/tic30aout.sh b/ld/emulparams/tic30aout.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/tic30aout.sh
rename to ld/emulparams/tic30aout.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/tic30coff.sh b/ld/emulparams/tic30coff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/tic30coff.sh
rename to ld/emulparams/tic30coff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/tic3xcoff.sh b/ld/emulparams/tic3xcoff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/tic3xcoff.sh
rename to ld/emulparams/tic3xcoff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/tic3xcoff_onchip.sh b/ld/emulparams/tic3xcoff_onchip.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/tic3xcoff_onchip.sh
rename to ld/emulparams/tic3xcoff_onchip.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/tic4xcoff.sh b/ld/emulparams/tic4xcoff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/tic4xcoff.sh
rename to ld/emulparams/tic4xcoff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/tic54xcoff.sh b/ld/emulparams/tic54xcoff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/tic54xcoff.sh
rename to ld/emulparams/tic54xcoff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/tic80coff.sh b/ld/emulparams/tic80coff.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/tic80coff.sh
rename to ld/emulparams/tic80coff.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/v850.sh b/ld/emulparams/v850.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/v850.sh
rename to ld/emulparams/v850.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/vanilla.sh b/ld/emulparams/vanilla.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/vanilla.sh
rename to ld/emulparams/vanilla.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/vax.sh b/ld/emulparams/vax.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/vax.sh
rename to ld/emulparams/vax.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/vaxnbsd.sh b/ld/emulparams/vaxnbsd.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/vaxnbsd.sh
rename to ld/emulparams/vaxnbsd.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/vsta.sh b/ld/emulparams/vsta.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/vsta.sh
rename to ld/emulparams/vsta.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/vxworks.sh b/ld/emulparams/vxworks.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/vxworks.sh
rename to ld/emulparams/vxworks.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/w65.sh b/ld/emulparams/w65.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/w65.sh
rename to ld/emulparams/w65.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/z80.sh b/ld/emulparams/z80.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/z80.sh
rename to ld/emulparams/z80.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/z8001.sh b/ld/emulparams/z8001.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/z8001.sh
rename to ld/emulparams/z8001.sh
diff --git a/binutils/binutils-2.21/ld/emulparams/z8002.sh b/ld/emulparams/z8002.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/emulparams/z8002.sh
rename to ld/emulparams/z8002.sh
diff --git a/binutils/binutils-2.21/ld/emultempl/README b/ld/emultempl/README
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/README
rename to ld/emultempl/README
diff --git a/binutils/binutils-2.21/ld/emultempl/aix.em b/ld/emultempl/aix.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/aix.em
rename to ld/emultempl/aix.em
diff --git a/binutils/binutils-2.21/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/alphaelf.em
rename to ld/emultempl/alphaelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/armcoff.em b/ld/emultempl/armcoff.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/armcoff.em
rename to ld/emultempl/armcoff.em
diff --git a/binutils/binutils-2.21/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/armelf.em
rename to ld/emultempl/armelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/astring.sed b/ld/emultempl/astring.sed
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/astring.sed
rename to ld/emultempl/astring.sed
diff --git a/binutils/binutils-2.21/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/avrelf.em
rename to ld/emultempl/avrelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/beos.em b/ld/emultempl/beos.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/beos.em
rename to ld/emultempl/beos.em
diff --git a/binutils/binutils-2.21/ld/emultempl/cr16elf.em b/ld/emultempl/cr16elf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/cr16elf.em
rename to ld/emultempl/cr16elf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/crxelf.em b/ld/emultempl/crxelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/crxelf.em
rename to ld/emultempl/crxelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/elf-generic.em
rename to ld/emultempl/elf-generic.em
diff --git a/binutils/binutils-2.21/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/elf32.em
rename to ld/emultempl/elf32.em
diff --git a/binutils/binutils-2.21/ld/emultempl/genelf.em b/ld/emultempl/genelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/genelf.em
rename to ld/emultempl/genelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/generic.em b/ld/emultempl/generic.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/generic.em
rename to ld/emultempl/generic.em
diff --git a/binutils/binutils-2.21/ld/emultempl/gld960.em b/ld/emultempl/gld960.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/gld960.em
rename to ld/emultempl/gld960.em
diff --git a/binutils/binutils-2.21/ld/emultempl/gld960c.em b/ld/emultempl/gld960c.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/gld960c.em
rename to ld/emultempl/gld960c.em
diff --git a/binutils/binutils-2.21/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/hppaelf.em
rename to ld/emultempl/hppaelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/ia64elf.em b/ld/emultempl/ia64elf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/ia64elf.em
rename to ld/emultempl/ia64elf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/irix.em b/ld/emultempl/irix.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/irix.em
rename to ld/emultempl/irix.em
diff --git a/binutils/binutils-2.21/ld/emultempl/linux.em b/ld/emultempl/linux.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/linux.em
rename to ld/emultempl/linux.em
diff --git a/binutils/binutils-2.21/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/lnk960.em
rename to ld/emultempl/lnk960.em
diff --git a/binutils/binutils-2.21/ld/emultempl/m68hc1xelf.em b/ld/emultempl/m68hc1xelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/m68hc1xelf.em
rename to ld/emultempl/m68hc1xelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/m68kcoff.em b/ld/emultempl/m68kcoff.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/m68kcoff.em
rename to ld/emultempl/m68kcoff.em
diff --git a/binutils/binutils-2.21/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/m68kelf.em
rename to ld/emultempl/m68kelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/mipsecoff.em b/ld/emultempl/mipsecoff.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/mipsecoff.em
rename to ld/emultempl/mipsecoff.em
diff --git a/binutils/binutils-2.21/ld/emultempl/mipself.em b/ld/emultempl/mipself.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/mipself.em
rename to ld/emultempl/mipself.em
diff --git a/binutils/binutils-2.21/ld/emultempl/mmix-elfnmmo.em b/ld/emultempl/mmix-elfnmmo.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/mmix-elfnmmo.em
rename to ld/emultempl/mmix-elfnmmo.em
diff --git a/binutils/binutils-2.21/ld/emultempl/mmixelf.em b/ld/emultempl/mmixelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/mmixelf.em
rename to ld/emultempl/mmixelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/mmo.em b/ld/emultempl/mmo.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/mmo.em
rename to ld/emultempl/mmo.em
diff --git a/binutils/binutils-2.21/ld/emultempl/needrelax.em b/ld/emultempl/needrelax.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/needrelax.em
rename to ld/emultempl/needrelax.em
diff --git a/binutils/binutils-2.21/ld/emultempl/netbsd.em b/ld/emultempl/netbsd.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/netbsd.em
rename to ld/emultempl/netbsd.em
diff --git a/binutils/binutils-2.21/ld/emultempl/ostring.sed b/ld/emultempl/ostring.sed
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/ostring.sed
rename to ld/emultempl/ostring.sed
diff --git a/binutils/binutils-2.21/ld/emultempl/pe.em b/ld/emultempl/pe.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/pe.em
rename to ld/emultempl/pe.em
diff --git a/binutils/binutils-2.21/ld/emultempl/pep.em b/ld/emultempl/pep.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/pep.em
rename to ld/emultempl/pep.em
diff --git a/binutils/binutils-2.21/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/ppc32elf.em
rename to ld/emultempl/ppc32elf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/ppc64elf.em
rename to ld/emultempl/ppc64elf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/rxelf.em b/ld/emultempl/rxelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/rxelf.em
rename to ld/emultempl/rxelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/scoreelf.em b/ld/emultempl/scoreelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/scoreelf.em
rename to ld/emultempl/scoreelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/sh64elf.em b/ld/emultempl/sh64elf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/sh64elf.em
rename to ld/emultempl/sh64elf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/solaris2.em b/ld/emultempl/solaris2.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/solaris2.em
rename to ld/emultempl/solaris2.em
diff --git a/binutils/binutils-2.21/ld/emultempl/spu_icache.S b/ld/emultempl/spu_icache.S
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/spu_icache.S
rename to ld/emultempl/spu_icache.S
diff --git a/binutils/binutils-2.21/ld/emultempl/spu_icache.o_c b/ld/emultempl/spu_icache.o_c
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/spu_icache.o_c
rename to ld/emultempl/spu_icache.o_c
diff --git a/binutils/binutils-2.21/ld/emultempl/spu_ovl.S b/ld/emultempl/spu_ovl.S
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/spu_ovl.S
rename to ld/emultempl/spu_ovl.S
diff --git a/binutils/binutils-2.21/ld/emultempl/spu_ovl.o_c b/ld/emultempl/spu_ovl.o_c
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/spu_ovl.o_c
rename to ld/emultempl/spu_ovl.o_c
diff --git a/binutils/binutils-2.21/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/spuelf.em
rename to ld/emultempl/spuelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/sunos.em b/ld/emultempl/sunos.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/sunos.em
rename to ld/emultempl/sunos.em
diff --git a/binutils/binutils-2.21/ld/emultempl/ticoff.em b/ld/emultempl/ticoff.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/ticoff.em
rename to ld/emultempl/ticoff.em
diff --git a/binutils/binutils-2.21/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/vanilla.em
rename to ld/emultempl/vanilla.em
diff --git a/binutils/binutils-2.21/ld/emultempl/vms.em b/ld/emultempl/vms.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/vms.em
rename to ld/emultempl/vms.em
diff --git a/binutils/binutils-2.21/ld/emultempl/vxworks.em b/ld/emultempl/vxworks.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/vxworks.em
rename to ld/emultempl/vxworks.em
diff --git a/binutils/binutils-2.21/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/xtensaelf.em
rename to ld/emultempl/xtensaelf.em
diff --git a/binutils/binutils-2.21/ld/emultempl/z80.em b/ld/emultempl/z80.em
similarity index 100%
rename from binutils/binutils-2.21/ld/emultempl/z80.em
rename to ld/emultempl/z80.em
diff --git a/binutils/binutils-2.21/ld/fdl.texi b/ld/fdl.texi
similarity index 100%
rename from binutils/binutils-2.21/ld/fdl.texi
rename to ld/fdl.texi
diff --git a/binutils/binutils-2.21/ld/gen-doc.texi b/ld/gen-doc.texi
similarity index 100%
rename from binutils/binutils-2.21/ld/gen-doc.texi
rename to ld/gen-doc.texi
diff --git a/binutils/binutils-2.21/ld/genscrba.sh b/ld/genscrba.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/genscrba.sh
rename to ld/genscrba.sh
diff --git a/binutils/binutils-2.21/ld/genscripts.sh b/ld/genscripts.sh
similarity index 100%
rename from binutils/binutils-2.21/ld/genscripts.sh
rename to ld/genscripts.sh
diff --git a/binutils/binutils-2.21/ld/h8-doc.texi b/ld/h8-doc.texi
similarity index 100%
rename from binutils/binutils-2.21/ld/h8-doc.texi
rename to ld/h8-doc.texi
diff --git a/binutils/binutils-2.21/ld/ld.h b/ld/ld.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ld.h
rename to ld/ld.h
diff --git a/binutils/binutils-2.21/ld/ld.texinfo b/ld/ld.texinfo
similarity index 100%
rename from binutils/binutils-2.21/ld/ld.texinfo
rename to ld/ld.texinfo
diff --git a/binutils/binutils-2.21/ld/ldcref.c b/ld/ldcref.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldcref.c
rename to ld/ldcref.c
diff --git a/binutils/binutils-2.21/ld/ldctor.c b/ld/ldctor.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldctor.c
rename to ld/ldctor.c
diff --git a/binutils/binutils-2.21/ld/ldctor.h b/ld/ldctor.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldctor.h
rename to ld/ldctor.h
diff --git a/binutils/binutils-2.21/ld/ldemul.c b/ld/ldemul.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldemul.c
rename to ld/ldemul.c
diff --git a/binutils/binutils-2.21/ld/ldemul.h b/ld/ldemul.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldemul.h
rename to ld/ldemul.h
diff --git a/binutils/binutils-2.21/ld/ldexp.c b/ld/ldexp.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldexp.c
rename to ld/ldexp.c
diff --git a/binutils/binutils-2.21/ld/ldexp.h b/ld/ldexp.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldexp.h
rename to ld/ldexp.h
diff --git a/binutils/binutils-2.21/ld/ldfile.c b/ld/ldfile.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldfile.c
rename to ld/ldfile.c
diff --git a/binutils/binutils-2.21/ld/ldfile.h b/ld/ldfile.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldfile.h
rename to ld/ldfile.h
diff --git a/binutils/binutils-2.21/ld/ldgram.c b/ld/ldgram.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldgram.c
rename to ld/ldgram.c
diff --git a/binutils/binutils-2.21/ld/ldgram.h b/ld/ldgram.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldgram.h
rename to ld/ldgram.h
diff --git a/binutils/binutils-2.21/ld/ldgram.y b/ld/ldgram.y
similarity index 100%
rename from binutils/binutils-2.21/ld/ldgram.y
rename to ld/ldgram.y
diff --git a/binutils/binutils-2.21/ld/ldint.texinfo b/ld/ldint.texinfo
similarity index 100%
rename from binutils/binutils-2.21/ld/ldint.texinfo
rename to ld/ldint.texinfo
diff --git a/binutils/binutils-2.21/ld/ldlang.c b/ld/ldlang.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldlang.c
rename to ld/ldlang.c
diff --git a/binutils/binutils-2.21/ld/ldlang.h b/ld/ldlang.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldlang.h
rename to ld/ldlang.h
diff --git a/binutils/binutils-2.21/ld/ldlex-wrapper.c b/ld/ldlex-wrapper.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldlex-wrapper.c
rename to ld/ldlex-wrapper.c
diff --git a/binutils/binutils-2.21/ld/ldlex.c b/ld/ldlex.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldlex.c
rename to ld/ldlex.c
diff --git a/binutils/binutils-2.21/ld/ldlex.h b/ld/ldlex.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldlex.h
rename to ld/ldlex.h
diff --git a/binutils/binutils-2.21/ld/ldlex.l b/ld/ldlex.l
similarity index 100%
rename from binutils/binutils-2.21/ld/ldlex.l
rename to ld/ldlex.l
diff --git a/binutils/binutils-2.21/ld/ldmain.c b/ld/ldmain.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldmain.c
rename to ld/ldmain.c
diff --git a/binutils/binutils-2.21/ld/ldmain.h b/ld/ldmain.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldmain.h
rename to ld/ldmain.h
diff --git a/binutils/binutils-2.21/ld/ldmisc.c b/ld/ldmisc.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldmisc.c
rename to ld/ldmisc.c
diff --git a/binutils/binutils-2.21/ld/ldmisc.h b/ld/ldmisc.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldmisc.h
rename to ld/ldmisc.h
diff --git a/binutils/binutils-2.21/ld/ldver.c b/ld/ldver.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldver.c
rename to ld/ldver.c
diff --git a/binutils/binutils-2.21/ld/ldver.h b/ld/ldver.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldver.h
rename to ld/ldver.h
diff --git a/binutils/binutils-2.21/ld/ldwrite.c b/ld/ldwrite.c
similarity index 100%
rename from binutils/binutils-2.21/ld/ldwrite.c
rename to ld/ldwrite.c
diff --git a/binutils/binutils-2.21/ld/ldwrite.h b/ld/ldwrite.h
similarity index 100%
rename from binutils/binutils-2.21/ld/ldwrite.h
rename to ld/ldwrite.h
diff --git a/binutils/binutils-2.21/ld/lexsup.c b/ld/lexsup.c
similarity index 100%
rename from binutils/binutils-2.21/ld/lexsup.c
rename to ld/lexsup.c
diff --git a/binutils/binutils-2.21/ld/mri.c b/ld/mri.c
similarity index 100%
rename from binutils/binutils-2.21/ld/mri.c
rename to ld/mri.c
diff --git a/binutils/binutils-2.21/ld/mri.h b/ld/mri.h
similarity index 100%
rename from binutils/binutils-2.21/ld/mri.h
rename to ld/mri.h
diff --git a/binutils/binutils-2.21/ld/pe-dll.c b/ld/pe-dll.c
similarity index 100%
rename from binutils/binutils-2.21/ld/pe-dll.c
rename to ld/pe-dll.c
diff --git a/binutils/binutils-2.21/ld/pe-dll.h b/ld/pe-dll.h
similarity index 100%
rename from binutils/binutils-2.21/ld/pe-dll.h
rename to ld/pe-dll.h
diff --git a/binutils/binutils-2.21/ld/pep-dll.c b/ld/pep-dll.c
similarity index 100%
rename from binutils/binutils-2.21/ld/pep-dll.c
rename to ld/pep-dll.c
diff --git a/binutils/binutils-2.21/ld/pep-dll.h b/ld/pep-dll.h
similarity index 100%
rename from binutils/binutils-2.21/ld/pep-dll.h
rename to ld/pep-dll.h
diff --git a/binutils/binutils-2.21/ld/plugin.c b/ld/plugin.c
similarity index 100%
rename from binutils/binutils-2.21/ld/plugin.c
rename to ld/plugin.c
diff --git a/binutils/binutils-2.21/ld/plugin.h b/ld/plugin.h
similarity index 100%
rename from binutils/binutils-2.21/ld/plugin.h
rename to ld/plugin.h
diff --git a/binutils/binutils-2.21/ld/po/Make-in b/ld/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/ld/po/Make-in
rename to ld/po/Make-in
diff --git a/binutils/binutils-2.21/ld/po/POTFILES.in b/ld/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/ld/po/POTFILES.in
rename to ld/po/POTFILES.in
diff --git a/binutils/binutils-2.21/ld/po/bg.gmo b/ld/po/bg.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/bg.gmo
rename to ld/po/bg.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/bg.po b/ld/po/bg.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/bg.po
rename to ld/po/bg.po
diff --git a/binutils/binutils-2.21/ld/po/da.gmo b/ld/po/da.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/da.gmo
rename to ld/po/da.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/da.po b/ld/po/da.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/da.po
rename to ld/po/da.po
diff --git a/binutils/binutils-2.21/ld/po/es.gmo b/ld/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/es.gmo
rename to ld/po/es.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/es.po b/ld/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/es.po
rename to ld/po/es.po
diff --git a/binutils/binutils-2.21/ld/po/fi.gmo b/ld/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/fi.gmo
rename to ld/po/fi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/fi.po b/ld/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/fi.po
rename to ld/po/fi.po
diff --git a/binutils/binutils-2.21/ld/po/fr.gmo b/ld/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/fr.gmo
rename to ld/po/fr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/fr.po b/ld/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/fr.po
rename to ld/po/fr.po
diff --git a/binutils/binutils-2.21/ld/po/ga.gmo b/ld/po/ga.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/ga.gmo
rename to ld/po/ga.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/ga.po b/ld/po/ga.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/ga.po
rename to ld/po/ga.po
diff --git a/binutils/binutils-2.21/ld/po/id.gmo b/ld/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/id.gmo
rename to ld/po/id.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/id.po b/ld/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/id.po
rename to ld/po/id.po
diff --git a/binutils/binutils-2.21/ld/po/ja.gmo b/ld/po/ja.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/ja.gmo
rename to ld/po/ja.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/ja.po b/ld/po/ja.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/ja.po
rename to ld/po/ja.po
diff --git a/binutils/binutils-2.21/ld/po/ld.pot b/ld/po/ld.pot
similarity index 100%
rename from binutils/binutils-2.21/ld/po/ld.pot
rename to ld/po/ld.pot
diff --git a/binutils/binutils-2.21/ld/po/sv.gmo b/ld/po/sv.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/sv.gmo
rename to ld/po/sv.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/sv.po b/ld/po/sv.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/sv.po
rename to ld/po/sv.po
diff --git a/binutils/binutils-2.21/ld/po/tr.gmo b/ld/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/tr.gmo
rename to ld/po/tr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/tr.po b/ld/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/tr.po
rename to ld/po/tr.po
diff --git a/binutils/binutils-2.21/ld/po/vi.gmo b/ld/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/vi.gmo
rename to ld/po/vi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/vi.po b/ld/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/vi.po
rename to ld/po/vi.po
diff --git a/binutils/binutils-2.21/ld/po/zh_CN.gmo b/ld/po/zh_CN.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/zh_CN.gmo
rename to ld/po/zh_CN.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/zh_CN.po b/ld/po/zh_CN.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/zh_CN.po
rename to ld/po/zh_CN.po
diff --git a/binutils/binutils-2.21/ld/po/zh_TW.gmo b/ld/po/zh_TW.gmo
similarity index 100%
rename from binutils/binutils-2.21/ld/po/zh_TW.gmo
rename to ld/po/zh_TW.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/ld/po/zh_TW.po b/ld/po/zh_TW.po
similarity index 100%
rename from binutils/binutils-2.21/ld/po/zh_TW.po
rename to ld/po/zh_TW.po
diff --git a/binutils/binutils-2.21/ld/scripttempl/README b/ld/scripttempl/README
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/README
rename to ld/scripttempl/README
diff --git a/binutils/binutils-2.21/ld/scripttempl/aix.sc b/ld/scripttempl/aix.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/aix.sc
rename to ld/scripttempl/aix.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/alpha.sc b/ld/scripttempl/alpha.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/alpha.sc
rename to ld/scripttempl/alpha.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/alphavms.sc b/ld/scripttempl/alphavms.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/alphavms.sc
rename to ld/scripttempl/alphavms.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/aout.sc b/ld/scripttempl/aout.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/aout.sc
rename to ld/scripttempl/aout.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/armaout.sc b/ld/scripttempl/armaout.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/armaout.sc
rename to ld/scripttempl/armaout.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/armbpabi.sc b/ld/scripttempl/armbpabi.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/armbpabi.sc
rename to ld/scripttempl/armbpabi.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/armcoff.sc b/ld/scripttempl/armcoff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/armcoff.sc
rename to ld/scripttempl/armcoff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/avr.sc b/ld/scripttempl/avr.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/avr.sc
rename to ld/scripttempl/avr.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/crisaout.sc b/ld/scripttempl/crisaout.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/crisaout.sc
rename to ld/scripttempl/crisaout.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/delta68.sc b/ld/scripttempl/delta68.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/delta68.sc
rename to ld/scripttempl/delta68.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/dlx.sc b/ld/scripttempl/dlx.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/dlx.sc
rename to ld/scripttempl/dlx.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf.sc
rename to ld/scripttempl/elf.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32cr16.sc b/ld/scripttempl/elf32cr16.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32cr16.sc
rename to ld/scripttempl/elf32cr16.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32cr16c.sc b/ld/scripttempl/elf32cr16c.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32cr16c.sc
rename to ld/scripttempl/elf32cr16c.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32crx.sc b/ld/scripttempl/elf32crx.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32crx.sc
rename to ld/scripttempl/elf32crx.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32msp430.sc b/ld/scripttempl/elf32msp430.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32msp430.sc
rename to ld/scripttempl/elf32msp430.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32msp430_3.sc b/ld/scripttempl/elf32msp430_3.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32msp430_3.sc
rename to ld/scripttempl/elf32msp430_3.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32sh-symbian.sc b/ld/scripttempl/elf32sh-symbian.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32sh-symbian.sc
rename to ld/scripttempl/elf32sh-symbian.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32xc16x.sc b/ld/scripttempl/elf32xc16x.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32xc16x.sc
rename to ld/scripttempl/elf32xc16x.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32xc16xl.sc b/ld/scripttempl/elf32xc16xl.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32xc16xl.sc
rename to ld/scripttempl/elf32xc16xl.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf32xc16xs.sc b/ld/scripttempl/elf32xc16xs.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf32xc16xs.sc
rename to ld/scripttempl/elf32xc16xs.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf64hppa.sc b/ld/scripttempl/elf64hppa.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf64hppa.sc
rename to ld/scripttempl/elf64hppa.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elf_chaos.sc b/ld/scripttempl/elf_chaos.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elf_chaos.sc
rename to ld/scripttempl/elf_chaos.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elfd10v.sc b/ld/scripttempl/elfd10v.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elfd10v.sc
rename to ld/scripttempl/elfd10v.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elfd30v.sc b/ld/scripttempl/elfd30v.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elfd30v.sc
rename to ld/scripttempl/elfd30v.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elfi370.sc b/ld/scripttempl/elfi370.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elfi370.sc
rename to ld/scripttempl/elfi370.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elfm68hc11.sc b/ld/scripttempl/elfm68hc11.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elfm68hc11.sc
rename to ld/scripttempl/elfm68hc11.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elfm68hc12.sc b/ld/scripttempl/elfm68hc12.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elfm68hc12.sc
rename to ld/scripttempl/elfm68hc12.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elfmicroblaze.sc b/ld/scripttempl/elfmicroblaze.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elfmicroblaze.sc
rename to ld/scripttempl/elfmicroblaze.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/elfxtensa.sc b/ld/scripttempl/elfxtensa.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/elfxtensa.sc
rename to ld/scripttempl/elfxtensa.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/epocpe.sc b/ld/scripttempl/epocpe.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/epocpe.sc
rename to ld/scripttempl/epocpe.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8300.sc b/ld/scripttempl/h8300.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8300.sc
rename to ld/scripttempl/h8300.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8300h.sc b/ld/scripttempl/h8300h.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8300h.sc
rename to ld/scripttempl/h8300h.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8300hn.sc b/ld/scripttempl/h8300hn.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8300hn.sc
rename to ld/scripttempl/h8300hn.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8300s.sc b/ld/scripttempl/h8300s.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8300s.sc
rename to ld/scripttempl/h8300s.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8300sn.sc b/ld/scripttempl/h8300sn.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8300sn.sc
rename to ld/scripttempl/h8300sn.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8300sx.sc b/ld/scripttempl/h8300sx.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8300sx.sc
rename to ld/scripttempl/h8300sx.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8300sxn.sc b/ld/scripttempl/h8300sxn.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8300sxn.sc
rename to ld/scripttempl/h8300sxn.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8500.sc b/ld/scripttempl/h8500.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8500.sc
rename to ld/scripttempl/h8500.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8500b.sc b/ld/scripttempl/h8500b.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8500b.sc
rename to ld/scripttempl/h8500b.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8500c.sc b/ld/scripttempl/h8500c.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8500c.sc
rename to ld/scripttempl/h8500c.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8500m.sc b/ld/scripttempl/h8500m.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8500m.sc
rename to ld/scripttempl/h8500m.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/h8500s.sc b/ld/scripttempl/h8500s.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/h8500s.sc
rename to ld/scripttempl/h8500s.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/hppaelf.sc b/ld/scripttempl/hppaelf.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/hppaelf.sc
rename to ld/scripttempl/hppaelf.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/i386beos.sc b/ld/scripttempl/i386beos.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/i386beos.sc
rename to ld/scripttempl/i386beos.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/i386coff.sc b/ld/scripttempl/i386coff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/i386coff.sc
rename to ld/scripttempl/i386coff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/i386go32.sc b/ld/scripttempl/i386go32.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/i386go32.sc
rename to ld/scripttempl/i386go32.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/i386msdos.sc b/ld/scripttempl/i386msdos.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/i386msdos.sc
rename to ld/scripttempl/i386msdos.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/i860coff.sc b/ld/scripttempl/i860coff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/i860coff.sc
rename to ld/scripttempl/i860coff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/i960.sc b/ld/scripttempl/i960.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/i960.sc
rename to ld/scripttempl/i960.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/ip2k.sc b/ld/scripttempl/ip2k.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/ip2k.sc
rename to ld/scripttempl/ip2k.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/iq2000.sc b/ld/scripttempl/iq2000.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/iq2000.sc
rename to ld/scripttempl/iq2000.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/m68kaux.sc b/ld/scripttempl/m68kaux.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/m68kaux.sc
rename to ld/scripttempl/m68kaux.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/m68kcoff.sc b/ld/scripttempl/m68kcoff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/m68kcoff.sc
rename to ld/scripttempl/m68kcoff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/m88kbcs.sc b/ld/scripttempl/m88kbcs.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/m88kbcs.sc
rename to ld/scripttempl/m88kbcs.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/mcorepe.sc b/ld/scripttempl/mcorepe.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/mcorepe.sc
rename to ld/scripttempl/mcorepe.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/mep.sc b/ld/scripttempl/mep.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/mep.sc
rename to ld/scripttempl/mep.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/mips.sc b/ld/scripttempl/mips.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/mips.sc
rename to ld/scripttempl/mips.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/mipsbsd.sc b/ld/scripttempl/mipsbsd.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/mipsbsd.sc
rename to ld/scripttempl/mipsbsd.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/mmo.sc b/ld/scripttempl/mmo.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/mmo.sc
rename to ld/scripttempl/mmo.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/moxie.sc b/ld/scripttempl/moxie.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/moxie.sc
rename to ld/scripttempl/moxie.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/nw.sc b/ld/scripttempl/nw.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/nw.sc
rename to ld/scripttempl/nw.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/or32.sc b/ld/scripttempl/or32.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/or32.sc
rename to ld/scripttempl/or32.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/pe.sc
rename to ld/scripttempl/pe.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/pep.sc
rename to ld/scripttempl/pep.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/pj.sc b/ld/scripttempl/pj.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/pj.sc
rename to ld/scripttempl/pj.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/ppcpe.sc b/ld/scripttempl/ppcpe.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/ppcpe.sc
rename to ld/scripttempl/ppcpe.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/psos.sc b/ld/scripttempl/psos.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/psos.sc
rename to ld/scripttempl/psos.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/riscix.sc b/ld/scripttempl/riscix.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/riscix.sc
rename to ld/scripttempl/riscix.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/sh.sc b/ld/scripttempl/sh.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/sh.sc
rename to ld/scripttempl/sh.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/sparccoff.sc b/ld/scripttempl/sparccoff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/sparccoff.sc
rename to ld/scripttempl/sparccoff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/st2000.sc b/ld/scripttempl/st2000.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/st2000.sc
rename to ld/scripttempl/st2000.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/tic30aout.sc b/ld/scripttempl/tic30aout.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/tic30aout.sc
rename to ld/scripttempl/tic30aout.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/tic30coff.sc b/ld/scripttempl/tic30coff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/tic30coff.sc
rename to ld/scripttempl/tic30coff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/tic4xcoff.sc b/ld/scripttempl/tic4xcoff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/tic4xcoff.sc
rename to ld/scripttempl/tic4xcoff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/tic54xcoff.sc b/ld/scripttempl/tic54xcoff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/tic54xcoff.sc
rename to ld/scripttempl/tic54xcoff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/tic80coff.sc b/ld/scripttempl/tic80coff.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/tic80coff.sc
rename to ld/scripttempl/tic80coff.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/v850.sc b/ld/scripttempl/v850.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/v850.sc
rename to ld/scripttempl/v850.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/vanilla.sc b/ld/scripttempl/vanilla.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/vanilla.sc
rename to ld/scripttempl/vanilla.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/w65.sc b/ld/scripttempl/w65.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/w65.sc
rename to ld/scripttempl/w65.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/xstormy16.sc b/ld/scripttempl/xstormy16.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/xstormy16.sc
rename to ld/scripttempl/xstormy16.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/z80.sc b/ld/scripttempl/z80.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/z80.sc
rename to ld/scripttempl/z80.sc
diff --git a/binutils/binutils-2.21/ld/scripttempl/z8000.sc b/ld/scripttempl/z8000.sc
similarity index 100%
rename from binutils/binutils-2.21/ld/scripttempl/z8000.sc
rename to ld/scripttempl/z8000.sc
diff --git a/binutils/binutils-2.21/ld/stamp-h.in b/ld/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/ld/stamp-h.in
rename to ld/stamp-h.in
diff --git a/binutils/binutils-2.21/ld/sysdep.h b/ld/sysdep.h
similarity index 100%
rename from binutils/binutils-2.21/ld/sysdep.h
rename to ld/sysdep.h
diff --git a/binutils/binutils-2.21/ld/testplug.c b/ld/testplug.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testplug.c
rename to ld/testplug.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog
rename to ld/testsuite/ChangeLog
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog-2004 b/ld/testsuite/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog-2004
rename to ld/testsuite/ChangeLog-2004
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog-2005 b/ld/testsuite/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog-2005
rename to ld/testsuite/ChangeLog-2005
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog-2006 b/ld/testsuite/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog-2006
rename to ld/testsuite/ChangeLog-2006
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog-2007 b/ld/testsuite/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog-2007
rename to ld/testsuite/ChangeLog-2007
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog-2008 b/ld/testsuite/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog-2008
rename to ld/testsuite/ChangeLog-2008
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog-2009 b/ld/testsuite/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog-2009
rename to ld/testsuite/ChangeLog-2009
diff --git a/binutils/binutils-2.21/ld/testsuite/ChangeLog-9303 b/ld/testsuite/ChangeLog-9303
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ChangeLog-9303
rename to ld/testsuite/ChangeLog-9303
diff --git a/binutils/binutils-2.21/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/config/default.exp
rename to ld/testsuite/config/default.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/align.s b/ld/testsuite/ld-alpha/align.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/align.s
rename to ld/testsuite/ld-alpha/align.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/alpha.exp b/ld/testsuite/ld-alpha/alpha.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/alpha.exp
rename to ld/testsuite/ld-alpha/alpha.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.dd b/ld/testsuite/ld-alpha/tlsbin.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.dd
rename to ld/testsuite/ld-alpha/tlsbin.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.rd b/ld/testsuite/ld-alpha/tlsbin.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.rd
rename to ld/testsuite/ld-alpha/tlsbin.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.s b/ld/testsuite/ld-alpha/tlsbin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.s
rename to ld/testsuite/ld-alpha/tlsbin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.sd b/ld/testsuite/ld-alpha/tlsbin.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.sd
rename to ld/testsuite/ld-alpha/tlsbin.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.td b/ld/testsuite/ld-alpha/tlsbin.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbin.td
rename to ld/testsuite/ld-alpha/tlsbin.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinpic.s b/ld/testsuite/ld-alpha/tlsbinpic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinpic.s
rename to ld/testsuite/ld-alpha/tlsbinpic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinr.dd b/ld/testsuite/ld-alpha/tlsbinr.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinr.dd
rename to ld/testsuite/ld-alpha/tlsbinr.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinr.rd
rename to ld/testsuite/ld-alpha/tlsbinr.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinr.sd b/ld/testsuite/ld-alpha/tlsbinr.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsbinr.sd
rename to ld/testsuite/ld-alpha/tlsbinr.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsg.s b/ld/testsuite/ld-alpha/tlsg.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsg.s
rename to ld/testsuite/ld-alpha/tlsg.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsg.sd b/ld/testsuite/ld-alpha/tlsg.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlsg.sd
rename to ld/testsuite/ld-alpha/tlsg.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlslib.s b/ld/testsuite/ld-alpha/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlslib.s
rename to ld/testsuite/ld-alpha/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.dd b/ld/testsuite/ld-alpha/tlspic.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.dd
rename to ld/testsuite/ld-alpha/tlspic.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.rd
rename to ld/testsuite/ld-alpha/tlspic.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.sd b/ld/testsuite/ld-alpha/tlspic.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.sd
rename to ld/testsuite/ld-alpha/tlspic.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.td b/ld/testsuite/ld-alpha/tlspic.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic.td
rename to ld/testsuite/ld-alpha/tlspic.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic1.s b/ld/testsuite/ld-alpha/tlspic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic1.s
rename to ld/testsuite/ld-alpha/tlspic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic2.s b/ld/testsuite/ld-alpha/tlspic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-alpha/tlspic2.s
rename to ld/testsuite/ld-alpha/tlspic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arch-v6.s b/ld/testsuite/ld-arm/arch-v6.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arch-v6.s
rename to ld/testsuite/ld-arm/arch-v6.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arch-v6k.s b/ld/testsuite/ld-arm/arch-v6k.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arch-v6k.s
rename to ld/testsuite/ld-arm/arch-v6k.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arch-v6t2.s b/ld/testsuite/ld-arm/arch-v6t2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arch-v6t2.s
rename to ld/testsuite/ld-arm/arch-v6t2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-abs32.d
rename to ld/testsuite/ld-arm/arm-app-abs32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-abs32.r b/ld/testsuite/ld-arm/arm-app-abs32.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-abs32.r
rename to ld/testsuite/ld-arm/arm-app-abs32.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-abs32.s b/ld/testsuite/ld-arm/arm-app-abs32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-abs32.s
rename to ld/testsuite/ld-arm/arm-app-abs32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-movw.s b/ld/testsuite/ld-arm/arm-app-movw.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app-movw.s
rename to ld/testsuite/ld-arm/arm-app-movw.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app.d
rename to ld/testsuite/ld-arm/arm-app.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app.r b/ld/testsuite/ld-arm/arm-app.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app.r
rename to ld/testsuite/ld-arm/arm-app.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app.s b/ld/testsuite/ld-arm/arm-app.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-app.s
rename to ld/testsuite/ld-arm/arm-app.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-be8.d b/ld/testsuite/ld-arm/arm-be8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-be8.d
rename to ld/testsuite/ld-arm/arm-be8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-be8.s b/ld/testsuite/ld-arm/arm-be8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-be8.s
rename to ld/testsuite/ld-arm/arm-be8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-call.d b/ld/testsuite/ld-arm/arm-call.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-call.d
rename to ld/testsuite/ld-arm/arm-call.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-call1.s b/ld/testsuite/ld-arm/arm-call1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-call1.s
rename to ld/testsuite/ld-arm/arm-call1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-call2.s b/ld/testsuite/ld-arm/arm-call2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-call2.s
rename to ld/testsuite/ld-arm/arm-call2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-dyn.ld b/ld/testsuite/ld-arm/arm-dyn.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-dyn.ld
rename to ld/testsuite/ld-arm/arm-dyn.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-elf.exp
rename to ld/testsuite/ld-arm/arm-elf.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib-plt32.d
rename to ld/testsuite/ld-arm/arm-lib-plt32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib-plt32.r b/ld/testsuite/ld-arm/arm-lib-plt32.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib-plt32.r
rename to ld/testsuite/ld-arm/arm-lib-plt32.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib-plt32.s b/ld/testsuite/ld-arm/arm-lib-plt32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib-plt32.s
rename to ld/testsuite/ld-arm/arm-lib-plt32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.d
rename to ld/testsuite/ld-arm/arm-lib.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.ld b/ld/testsuite/ld-arm/arm-lib.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.ld
rename to ld/testsuite/ld-arm/arm-lib.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.r b/ld/testsuite/ld-arm/arm-lib.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.r
rename to ld/testsuite/ld-arm/arm-lib.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.s b/ld/testsuite/ld-arm/arm-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-lib.s
rename to ld/testsuite/ld-arm/arm-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-movwt.d b/ld/testsuite/ld-arm/arm-movwt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-movwt.d
rename to ld/testsuite/ld-arm/arm-movwt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-movwt.s b/ld/testsuite/ld-arm/arm-movwt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-movwt.s
rename to ld/testsuite/ld-arm/arm-movwt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-pic-veneer.d b/ld/testsuite/ld-arm/arm-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-pic-veneer.d
rename to ld/testsuite/ld-arm/arm-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-pic-veneer.s b/ld/testsuite/ld-arm/arm-pic-veneer.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-pic-veneer.s
rename to ld/testsuite/ld-arm/arm-pic-veneer.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-rel31.d b/ld/testsuite/ld-arm/arm-rel31.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-rel31.d
rename to ld/testsuite/ld-arm/arm-rel31.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-rel31.s b/ld/testsuite/ld-arm/arm-rel31.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-rel31.s
rename to ld/testsuite/ld-arm/arm-rel31.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-static-app.d b/ld/testsuite/ld-arm/arm-static-app.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-static-app.d
rename to ld/testsuite/ld-arm/arm-static-app.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-static-app.r b/ld/testsuite/ld-arm/arm-static-app.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-static-app.r
rename to ld/testsuite/ld-arm/arm-static-app.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-static-app.s b/ld/testsuite/ld-arm/arm-static-app.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-static-app.s
rename to ld/testsuite/ld-arm/arm-static-app.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target1-abs.d b/ld/testsuite/ld-arm/arm-target1-abs.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target1-abs.d
rename to ld/testsuite/ld-arm/arm-target1-abs.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target1-rel.d b/ld/testsuite/ld-arm/arm-target1-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target1-rel.d
rename to ld/testsuite/ld-arm/arm-target1-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target1.s b/ld/testsuite/ld-arm/arm-target1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target1.s
rename to ld/testsuite/ld-arm/arm-target1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2-abs.d b/ld/testsuite/ld-arm/arm-target2-abs.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2-abs.d
rename to ld/testsuite/ld-arm/arm-target2-abs.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2-got-rel.d b/ld/testsuite/ld-arm/arm-target2-got-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2-got-rel.d
rename to ld/testsuite/ld-arm/arm-target2-got-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2-rel.d b/ld/testsuite/ld-arm/arm-target2-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2-rel.d
rename to ld/testsuite/ld-arm/arm-target2-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2.s b/ld/testsuite/ld-arm/arm-target2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm-target2.s
rename to ld/testsuite/ld-arm/arm-target2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/arm.ld b/ld/testsuite/ld-arm/arm.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/arm.ld
rename to ld/testsuite/ld-arm/arm.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/armthumb-lib.d
rename to ld/testsuite/ld-arm/armthumb-lib.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/armthumb-lib.sym b/ld/testsuite/ld-arm/armthumb-lib.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/armthumb-lib.sym
rename to ld/testsuite/ld-arm/armthumb-lib.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/armv4-bx.d b/ld/testsuite/ld-arm/armv4-bx.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/armv4-bx.d
rename to ld/testsuite/ld-arm/armv4-bx.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/armv4-bx.s b/ld/testsuite/ld-arm/armv4-bx.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/armv4-bx.s
rename to ld/testsuite/ld-arm/armv4-bx.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-2.attr b/ld/testsuite/ld-arm/attr-merge-2.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-2.attr
rename to ld/testsuite/ld-arm/attr-merge-2.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-2a.s b/ld/testsuite/ld-arm/attr-merge-2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-2a.s
rename to ld/testsuite/ld-arm/attr-merge-2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-2b.s b/ld/testsuite/ld-arm/attr-merge-2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-2b.s
rename to ld/testsuite/ld-arm/attr-merge-2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-3.attr b/ld/testsuite/ld-arm/attr-merge-3.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-3.attr
rename to ld/testsuite/ld-arm/attr-merge-3.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-3a.s b/ld/testsuite/ld-arm/attr-merge-3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-3a.s
rename to ld/testsuite/ld-arm/attr-merge-3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-3b.s b/ld/testsuite/ld-arm/attr-merge-3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-3b.s
rename to ld/testsuite/ld-arm/attr-merge-3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-4.attr b/ld/testsuite/ld-arm/attr-merge-4.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-4.attr
rename to ld/testsuite/ld-arm/attr-merge-4.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-4a.s b/ld/testsuite/ld-arm/attr-merge-4a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-4a.s
rename to ld/testsuite/ld-arm/attr-merge-4a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-4b.s b/ld/testsuite/ld-arm/attr-merge-4b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-4b.s
rename to ld/testsuite/ld-arm/attr-merge-4b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-5.attr b/ld/testsuite/ld-arm/attr-merge-5.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-5.attr
rename to ld/testsuite/ld-arm/attr-merge-5.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-5.s b/ld/testsuite/ld-arm/attr-merge-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-5.s
rename to ld/testsuite/ld-arm/attr-merge-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-6.attr b/ld/testsuite/ld-arm/attr-merge-6.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-6.attr
rename to ld/testsuite/ld-arm/attr-merge-6.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-6a.s b/ld/testsuite/ld-arm/attr-merge-6a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-6a.s
rename to ld/testsuite/ld-arm/attr-merge-6a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-6b.s b/ld/testsuite/ld-arm/attr-merge-6b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-6b.s
rename to ld/testsuite/ld-arm/attr-merge-6b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-7.attr b/ld/testsuite/ld-arm/attr-merge-7.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-7.attr
rename to ld/testsuite/ld-arm/attr-merge-7.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-7a.s b/ld/testsuite/ld-arm/attr-merge-7a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-7a.s
rename to ld/testsuite/ld-arm/attr-merge-7a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-7b.s b/ld/testsuite/ld-arm/attr-merge-7b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-7b.s
rename to ld/testsuite/ld-arm/attr-merge-7b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-arch-1.attr b/ld/testsuite/ld-arm/attr-merge-arch-1.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-arch-1.attr
rename to ld/testsuite/ld-arm/attr-merge-arch-1.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-arch-2.attr b/ld/testsuite/ld-arm/attr-merge-arch-2.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-arch-2.attr
rename to ld/testsuite/ld-arm/attr-merge-arch-2.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-incompatible.d b/ld/testsuite/ld-arm/attr-merge-incompatible.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-incompatible.d
rename to ld/testsuite/ld-arm/attr-merge-incompatible.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-incompatiblea.s b/ld/testsuite/ld-arm/attr-merge-incompatiblea.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-incompatiblea.s
rename to ld/testsuite/ld-arm/attr-merge-incompatiblea.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-incompatibleb.s b/ld/testsuite/ld-arm/attr-merge-incompatibleb.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-incompatibleb.s
rename to ld/testsuite/ld-arm/attr-merge-incompatibleb.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-1.d b/ld/testsuite/ld-arm/attr-merge-unknown-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-1.d
rename to ld/testsuite/ld-arm/attr-merge-unknown-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-1.s b/ld/testsuite/ld-arm/attr-merge-unknown-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-1.s
rename to ld/testsuite/ld-arm/attr-merge-unknown-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-2.d b/ld/testsuite/ld-arm/attr-merge-unknown-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-2.d
rename to ld/testsuite/ld-arm/attr-merge-unknown-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-2.s b/ld/testsuite/ld-arm/attr-merge-unknown-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-2.s
rename to ld/testsuite/ld-arm/attr-merge-unknown-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-2r.d b/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-2r.d
rename to ld/testsuite/ld-arm/attr-merge-unknown-2r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-3.d b/ld/testsuite/ld-arm/attr-merge-unknown-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-unknown-3.d
rename to ld/testsuite/ld-arm/attr-merge-unknown-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-1.d b/ld/testsuite/ld-arm/attr-merge-vfp-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-1.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-1r.d b/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-1r.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-1r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-2.d b/ld/testsuite/ld-arm/attr-merge-vfp-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-2.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-2.s b/ld/testsuite/ld-arm/attr-merge-vfp-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-2.s
rename to ld/testsuite/ld-arm/attr-merge-vfp-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-2r.d b/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-2r.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-2r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3-d16.s b/ld/testsuite/ld-arm/attr-merge-vfp-3-d16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3-d16.s
rename to ld/testsuite/ld-arm/attr-merge-vfp-3-d16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3.d b/ld/testsuite/ld-arm/attr-merge-vfp-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3.s b/ld/testsuite/ld-arm/attr-merge-vfp-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3.s
rename to ld/testsuite/ld-arm/attr-merge-vfp-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3r.d b/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-3r.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-3r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4-d16.s b/ld/testsuite/ld-arm/attr-merge-vfp-4-d16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4-d16.s
rename to ld/testsuite/ld-arm/attr-merge-vfp-4-d16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4.d b/ld/testsuite/ld-arm/attr-merge-vfp-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4.s b/ld/testsuite/ld-arm/attr-merge-vfp-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4.s
rename to ld/testsuite/ld-arm/attr-merge-vfp-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4r.d b/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-4r.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-4r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-5.d b/ld/testsuite/ld-arm/attr-merge-vfp-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-5.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-5r.d b/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-5r.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-5r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-6.d b/ld/testsuite/ld-arm/attr-merge-vfp-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-6.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-6r.d b/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfp-6r.d
rename to ld/testsuite/ld-arm/attr-merge-vfp-6r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfpv3xd.s b/ld/testsuite/ld-arm/attr-merge-vfpv3xd.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-vfpv3xd.s
rename to ld/testsuite/ld-arm/attr-merge-vfpv3xd.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-0.s b/ld/testsuite/ld-arm/attr-merge-wchar-0.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-0.s
rename to ld/testsuite/ld-arm/attr-merge-wchar-0.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-00.d b/ld/testsuite/ld-arm/attr-merge-wchar-00.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-00.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-00.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-02.d b/ld/testsuite/ld-arm/attr-merge-wchar-02.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-02.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-02.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-04.d b/ld/testsuite/ld-arm/attr-merge-wchar-04.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-04.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-04.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-2.s b/ld/testsuite/ld-arm/attr-merge-wchar-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-2.s
rename to ld/testsuite/ld-arm/attr-merge-wchar-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-20.d b/ld/testsuite/ld-arm/attr-merge-wchar-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-20.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-22.d b/ld/testsuite/ld-arm/attr-merge-wchar-22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-22.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-24.d b/ld/testsuite/ld-arm/attr-merge-wchar-24.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-24.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-24.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-4.s b/ld/testsuite/ld-arm/attr-merge-wchar-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-4.s
rename to ld/testsuite/ld-arm/attr-merge-wchar-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-40.d b/ld/testsuite/ld-arm/attr-merge-wchar-40.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-40.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-40.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-42.d b/ld/testsuite/ld-arm/attr-merge-wchar-42.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-42.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-42.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-44.d b/ld/testsuite/ld-arm/attr-merge-wchar-44.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge-wchar-44.d
rename to ld/testsuite/ld-arm/attr-merge-wchar-44.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge.attr b/ld/testsuite/ld-arm/attr-merge.attr
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge.attr
rename to ld/testsuite/ld-arm/attr-merge.attr
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge.s b/ld/testsuite/ld-arm/attr-merge.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/attr-merge.s
rename to ld/testsuite/ld-arm/attr-merge.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/blank.s b/ld/testsuite/ld-arm/blank.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/blank.s
rename to ld/testsuite/ld-arm/blank.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/callweak-2.d b/ld/testsuite/ld-arm/callweak-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/callweak-2.d
rename to ld/testsuite/ld-arm/callweak-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/callweak-2.s b/ld/testsuite/ld-arm/callweak-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/callweak-2.s
rename to ld/testsuite/ld-arm/callweak-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/callweak.d b/ld/testsuite/ld-arm/callweak.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/callweak.d
rename to ld/testsuite/ld-arm/callweak.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/callweak.s b/ld/testsuite/ld-arm/callweak.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/callweak.s
rename to ld/testsuite/ld-arm/callweak.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-arm-target.s b/ld/testsuite/ld-arm/cortex-a8-arm-target.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-arm-target.s
rename to ld/testsuite/ld-arm/cortex-a8-arm-target.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-far-1.s b/ld/testsuite/ld-arm/cortex-a8-far-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-far-1.s
rename to ld/testsuite/ld-arm/cortex-a8-far-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-far-2.s b/ld/testsuite/ld-arm/cortex-a8-far-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-far-2.s
rename to ld/testsuite/ld-arm/cortex-a8-far-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-far.d b/ld/testsuite/ld-arm/cortex-a8-far.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-far.d
rename to ld/testsuite/ld-arm/cortex-a8-far.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.s b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-b-plt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-rel-arm.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-rel-arm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-rel-arm.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-b-rel-arm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-rel-thumb.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-rel-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-rel-thumb.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-b-rel-thumb.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-rel.s b/ld/testsuite/ld-arm/cortex-a8-fix-b-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b-rel.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-b-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b.d b/ld/testsuite/ld-arm/cortex-a8-fix-b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b.s b/ld/testsuite/ld-arm/cortex-a8-fix-b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-b.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.s b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel-thumb.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel-thumb.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel-thumb.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel.s b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bcc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc.s b/ld/testsuite/ld-arm/cortex-a8-fix-bcc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bcc.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-bcc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.s b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-arm.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-arm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-arm.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-arm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-thumb.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-thumb.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-thumb.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel.s b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl.s b/ld/testsuite/ld-arm/cortex-a8-fix-bl.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-bl.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-bl.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.s b/ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.s b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-arm.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-arm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-arm.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-arm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-thumb.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-thumb.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-thumb.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel.s b/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx-rel.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx.s b/ld/testsuite/ld-arm/cortex-a8-fix-blx.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-blx.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-blx.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-hdr.d b/ld/testsuite/ld-arm/cortex-a8-fix-hdr.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-hdr.d
rename to ld/testsuite/ld-arm/cortex-a8-fix-hdr.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-hdr.s b/ld/testsuite/ld-arm/cortex-a8-fix-hdr.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-hdr.s
rename to ld/testsuite/ld-arm/cortex-a8-fix-hdr.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-hdr.t b/ld/testsuite/ld-arm/cortex-a8-fix-hdr.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-hdr.t
rename to ld/testsuite/ld-arm/cortex-a8-fix-hdr.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-plt.ld b/ld/testsuite/ld-arm/cortex-a8-fix-plt.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-fix-plt.ld
rename to ld/testsuite/ld-arm/cortex-a8-fix-plt.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-thumb-target.s b/ld/testsuite/ld-arm/cortex-a8-thumb-target.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/cortex-a8-thumb-target.s
rename to ld/testsuite/ld-arm/cortex-a8-thumb-target.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/data-only-map.d b/ld/testsuite/ld-arm/data-only-map.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/data-only-map.d
rename to ld/testsuite/ld-arm/data-only-map.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/data-only-map.ld b/ld/testsuite/ld-arm/data-only-map.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/data-only-map.ld
rename to ld/testsuite/ld-arm/data-only-map.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/data-only-map.s b/ld/testsuite/ld-arm/data-only-map.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/data-only-map.s
rename to ld/testsuite/ld-arm/data-only-map.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/discard-unwind.ld b/ld/testsuite/ld-arm/discard-unwind.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/discard-unwind.ld
rename to ld/testsuite/ld-arm/discard-unwind.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/emit-relocs1-vxworks.d b/ld/testsuite/ld-arm/emit-relocs1-vxworks.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/emit-relocs1-vxworks.d
rename to ld/testsuite/ld-arm/emit-relocs1-vxworks.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/emit-relocs1.d b/ld/testsuite/ld-arm/emit-relocs1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/emit-relocs1.d
rename to ld/testsuite/ld-arm/emit-relocs1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/emit-relocs1.s b/ld/testsuite/ld-arm/emit-relocs1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/emit-relocs1.s
rename to ld/testsuite/ld-arm/emit-relocs1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-arm.d b/ld/testsuite/ld-arm/farcall-arm-arm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-arm.d
rename to ld/testsuite/ld-arm/farcall-arm-arm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-arm.s b/ld/testsuite/ld-arm/farcall-arm-arm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-arm.s
rename to ld/testsuite/ld-arm/farcall-arm-arm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d b/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d
rename to ld/testsuite/ld-arm/farcall-arm-thumb-blx.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb.d b/ld/testsuite/ld-arm/farcall-arm-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb.d
rename to ld/testsuite/ld-arm/farcall-arm-thumb.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb.s b/ld/testsuite/ld-arm/farcall-arm-thumb.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-arm-thumb.s
rename to ld/testsuite/ld-arm/farcall-arm-thumb.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-data.d b/ld/testsuite/ld-arm/farcall-data.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-data.d
rename to ld/testsuite/ld-arm/farcall-data.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-data.s b/ld/testsuite/ld-arm/farcall-data.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-data.s
rename to ld/testsuite/ld-arm/farcall-data.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group-limit.d b/ld/testsuite/ld-arm/farcall-group-limit.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group-limit.d
rename to ld/testsuite/ld-arm/farcall-group-limit.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group-size2.d b/ld/testsuite/ld-arm/farcall-group-size2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group-size2.d
rename to ld/testsuite/ld-arm/farcall-group-size2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group.d b/ld/testsuite/ld-arm/farcall-group.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group.d
rename to ld/testsuite/ld-arm/farcall-group.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group.s b/ld/testsuite/ld-arm/farcall-group.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group.s
rename to ld/testsuite/ld-arm/farcall-group.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group2.s b/ld/testsuite/ld-arm/farcall-group2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group2.s
rename to ld/testsuite/ld-arm/farcall-group2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group3.s b/ld/testsuite/ld-arm/farcall-group3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group3.s
rename to ld/testsuite/ld-arm/farcall-group3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group4.s b/ld/testsuite/ld-arm/farcall-group4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-group4.s
rename to ld/testsuite/ld-arm/farcall-group4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix.d b/ld/testsuite/ld-arm/farcall-mix.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix.d
rename to ld/testsuite/ld-arm/farcall-mix.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix.s b/ld/testsuite/ld-arm/farcall-mix.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix.s
rename to ld/testsuite/ld-arm/farcall-mix.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix2.d b/ld/testsuite/ld-arm/farcall-mix2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix2.d
rename to ld/testsuite/ld-arm/farcall-mix2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix2.s b/ld/testsuite/ld-arm/farcall-mix2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mix2.s
rename to ld/testsuite/ld-arm/farcall-mix2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
rename to ld/testsuite/ld-arm/farcall-mixed-app-v5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.d
rename to ld/testsuite/ld-arm/farcall-mixed-app.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.r b/ld/testsuite/ld-arm/farcall-mixed-app.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.r
rename to ld/testsuite/ld-arm/farcall-mixed-app.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.s b/ld/testsuite/ld-arm/farcall-mixed-app.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.s
rename to ld/testsuite/ld-arm/farcall-mixed-app.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.sym b/ld/testsuite/ld-arm/farcall-mixed-app.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-app.sym
rename to ld/testsuite/ld-arm/farcall-mixed-app.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
rename to ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib.d
rename to ld/testsuite/ld-arm/farcall-mixed-lib.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib.r b/ld/testsuite/ld-arm/farcall-mixed-lib.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib.r
rename to ld/testsuite/ld-arm/farcall-mixed-lib.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib1.s b/ld/testsuite/ld-arm/farcall-mixed-lib1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib1.s
rename to ld/testsuite/ld-arm/farcall-mixed-lib1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib2.s b/ld/testsuite/ld-arm/farcall-mixed-lib2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-mixed-lib2.s
rename to ld/testsuite/ld-arm/farcall-mixed-lib2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-section.d b/ld/testsuite/ld-arm/farcall-section.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-section.d
rename to ld/testsuite/ld-arm/farcall-section.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-section.s b/ld/testsuite/ld-arm/farcall-section.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-section.s
rename to ld/testsuite/ld-arm/farcall-section.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d b/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d
rename to ld/testsuite/ld-arm/farcall-thumb-arm-blx.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-short.d b/ld/testsuite/ld-arm/farcall-thumb-arm-short.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-short.d
rename to ld/testsuite/ld-arm/farcall-thumb-arm-short.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-short.s b/ld/testsuite/ld-arm/farcall-thumb-arm-short.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm-short.s
rename to ld/testsuite/ld-arm/farcall-thumb-arm-short.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm.d b/ld/testsuite/ld-arm/farcall-thumb-arm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm.d
rename to ld/testsuite/ld-arm/farcall-thumb-arm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm.s b/ld/testsuite/ld-arm/farcall-thumb-arm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-arm.s
rename to ld/testsuite/ld-arm/farcall-thumb-arm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
rename to ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
rename to ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
rename to ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb.d b/ld/testsuite/ld-arm/farcall-thumb-thumb.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb.d
rename to ld/testsuite/ld-arm/farcall-thumb-thumb.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb.s b/ld/testsuite/ld-arm/farcall-thumb-thumb.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/farcall-thumb-thumb.s
rename to ld/testsuite/ld-arm/farcall-thumb-thumb.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/gc-unwind.d b/ld/testsuite/ld-arm/gc-unwind.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/gc-unwind.d
rename to ld/testsuite/ld-arm/gc-unwind.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/gc-unwind.s b/ld/testsuite/ld-arm/gc-unwind.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/gc-unwind.s
rename to ld/testsuite/ld-arm/gc-unwind.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-alu-bad.d b/ld/testsuite/ld-arm/group-relocs-alu-bad.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-alu-bad.d
rename to ld/testsuite/ld-arm/group-relocs-alu-bad.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-alu-bad.s b/ld/testsuite/ld-arm/group-relocs-alu-bad.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-alu-bad.s
rename to ld/testsuite/ld-arm/group-relocs-alu-bad.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldc-bad.d b/ld/testsuite/ld-arm/group-relocs-ldc-bad.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldc-bad.d
rename to ld/testsuite/ld-arm/group-relocs-ldc-bad.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldc-bad.s b/ld/testsuite/ld-arm/group-relocs-ldc-bad.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldc-bad.s
rename to ld/testsuite/ld-arm/group-relocs-ldc-bad.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldr-bad.d b/ld/testsuite/ld-arm/group-relocs-ldr-bad.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldr-bad.d
rename to ld/testsuite/ld-arm/group-relocs-ldr-bad.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldr-bad.s b/ld/testsuite/ld-arm/group-relocs-ldr-bad.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldr-bad.s
rename to ld/testsuite/ld-arm/group-relocs-ldr-bad.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldrs-bad.d b/ld/testsuite/ld-arm/group-relocs-ldrs-bad.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldrs-bad.d
rename to ld/testsuite/ld-arm/group-relocs-ldrs-bad.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldrs-bad.s b/ld/testsuite/ld-arm/group-relocs-ldrs-bad.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs-ldrs-bad.s
rename to ld/testsuite/ld-arm/group-relocs-ldrs-bad.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs.d b/ld/testsuite/ld-arm/group-relocs.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs.d
rename to ld/testsuite/ld-arm/group-relocs.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs.s b/ld/testsuite/ld-arm/group-relocs.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/group-relocs.s
rename to ld/testsuite/ld-arm/group-relocs.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers-long.d b/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
rename to ld/testsuite/ld-arm/jump-reloc-veneers-long.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers-short1.d b/ld/testsuite/ld-arm/jump-reloc-veneers-short1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers-short1.d
rename to ld/testsuite/ld-arm/jump-reloc-veneers-short1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers-short2.d b/ld/testsuite/ld-arm/jump-reloc-veneers-short2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers-short2.d
rename to ld/testsuite/ld-arm/jump-reloc-veneers-short2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers.s b/ld/testsuite/ld-arm/jump-reloc-veneers.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/jump-reloc-veneers.s
rename to ld/testsuite/ld-arm/jump-reloc-veneers.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/jump19.d b/ld/testsuite/ld-arm/jump19.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/jump19.d
rename to ld/testsuite/ld-arm/jump19.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/jump19.s b/ld/testsuite/ld-arm/jump19.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/jump19.s
rename to ld/testsuite/ld-arm/jump19.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app-v5.d
rename to ld/testsuite/ld-arm/mixed-app-v5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.d
rename to ld/testsuite/ld-arm/mixed-app.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.r b/ld/testsuite/ld-arm/mixed-app.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.r
rename to ld/testsuite/ld-arm/mixed-app.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.s b/ld/testsuite/ld-arm/mixed-app.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.s
rename to ld/testsuite/ld-arm/mixed-app.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.sym b/ld/testsuite/ld-arm/mixed-app.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-app.sym
rename to ld/testsuite/ld-arm/mixed-app.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.d
rename to ld/testsuite/ld-arm/mixed-lib.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.r b/ld/testsuite/ld-arm/mixed-lib.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.r
rename to ld/testsuite/ld-arm/mixed-lib.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.s b/ld/testsuite/ld-arm/mixed-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.s
rename to ld/testsuite/ld-arm/mixed-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.sym b/ld/testsuite/ld-arm/mixed-lib.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/mixed-lib.sym
rename to ld/testsuite/ld-arm/mixed-lib.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-merge.d b/ld/testsuite/ld-arm/movw-merge.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-merge.d
rename to ld/testsuite/ld-arm/movw-merge.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-merge.s b/ld/testsuite/ld-arm/movw-merge.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-merge.s
rename to ld/testsuite/ld-arm/movw-merge.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-1.d b/ld/testsuite/ld-arm/movw-shared-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-1.d
rename to ld/testsuite/ld-arm/movw-shared-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-1.s b/ld/testsuite/ld-arm/movw-shared-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-1.s
rename to ld/testsuite/ld-arm/movw-shared-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-2.d b/ld/testsuite/ld-arm/movw-shared-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-2.d
rename to ld/testsuite/ld-arm/movw-shared-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-2.s b/ld/testsuite/ld-arm/movw-shared-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-2.s
rename to ld/testsuite/ld-arm/movw-shared-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-3.d b/ld/testsuite/ld-arm/movw-shared-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-3.d
rename to ld/testsuite/ld-arm/movw-shared-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-3.s b/ld/testsuite/ld-arm/movw-shared-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-3.s
rename to ld/testsuite/ld-arm/movw-shared-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-4.d b/ld/testsuite/ld-arm/movw-shared-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-4.d
rename to ld/testsuite/ld-arm/movw-shared-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-4.s b/ld/testsuite/ld-arm/movw-shared-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/movw-shared-4.s
rename to ld/testsuite/ld-arm/movw-shared-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/preempt-app.s b/ld/testsuite/ld-arm/preempt-app.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/preempt-app.s
rename to ld/testsuite/ld-arm/preempt-app.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/preempt-app.sym b/ld/testsuite/ld-arm/preempt-app.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/preempt-app.sym
rename to ld/testsuite/ld-arm/preempt-app.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/reloc-boundaries.d b/ld/testsuite/ld-arm/reloc-boundaries.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/reloc-boundaries.d
rename to ld/testsuite/ld-arm/reloc-boundaries.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/reloc-boundaries.s b/ld/testsuite/ld-arm/reloc-boundaries.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/reloc-boundaries.s
rename to ld/testsuite/ld-arm/reloc-boundaries.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/script-type.ld b/ld/testsuite/ld-arm/script-type.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/script-type.ld
rename to ld/testsuite/ld-arm/script-type.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/script-type.s b/ld/testsuite/ld-arm/script-type.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/script-type.s
rename to ld/testsuite/ld-arm/script-type.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/script-type.sym b/ld/testsuite/ld-arm/script-type.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/script-type.sym
rename to ld/testsuite/ld-arm/script-type.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/symbian-seg1.d b/ld/testsuite/ld-arm/symbian-seg1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/symbian-seg1.d
rename to ld/testsuite/ld-arm/symbian-seg1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/symbian-seg1.s b/ld/testsuite/ld-arm/symbian-seg1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/symbian-seg1.s
rename to ld/testsuite/ld-arm/symbian-seg1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-entry.d b/ld/testsuite/ld-arm/thumb-entry.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-entry.d
rename to ld/testsuite/ld-arm/thumb-entry.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-entry.s b/ld/testsuite/ld-arm/thumb-entry.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-entry.s
rename to ld/testsuite/ld-arm/thumb-entry.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-rel32.d b/ld/testsuite/ld-arm/thumb-rel32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-rel32.d
rename to ld/testsuite/ld-arm/thumb-rel32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-rel32.s b/ld/testsuite/ld-arm/thumb-rel32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb-rel32.s
rename to ld/testsuite/ld-arm/thumb-rel32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb1-bl.d b/ld/testsuite/ld-arm/thumb1-bl.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb1-bl.d
rename to ld/testsuite/ld-arm/thumb1-bl.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb1-bl.s b/ld/testsuite/ld-arm/thumb1-bl.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb1-bl.s
rename to ld/testsuite/ld-arm/thumb1-bl.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-b-interwork.d b/ld/testsuite/ld-arm/thumb2-b-interwork.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-b-interwork.d
rename to ld/testsuite/ld-arm/thumb2-b-interwork.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-b-interwork.s b/ld/testsuite/ld-arm/thumb2-b-interwork.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-b-interwork.s
rename to ld/testsuite/ld-arm/thumb2-b-interwork.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d
rename to ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
rename to ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s
rename to ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d b/ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d
rename to ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-bad.d b/ld/testsuite/ld-arm/thumb2-bl-bad.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-bad.d
rename to ld/testsuite/ld-arm/thumb2-bl-bad.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-bad.s b/ld/testsuite/ld-arm/thumb2-bl-bad.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-bad.s
rename to ld/testsuite/ld-arm/thumb2-bl-bad.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-blx-interwork.d b/ld/testsuite/ld-arm/thumb2-bl-blx-interwork.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-blx-interwork.d
rename to ld/testsuite/ld-arm/thumb2-bl-blx-interwork.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-blx-interwork.s b/ld/testsuite/ld-arm/thumb2-bl-blx-interwork.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-blx-interwork.s
rename to ld/testsuite/ld-arm/thumb2-bl-blx-interwork.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
rename to ld/testsuite/ld-arm/thumb2-bl-undefweak.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak.s b/ld/testsuite/ld-arm/thumb2-bl-undefweak.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak.s
rename to ld/testsuite/ld-arm/thumb2-bl-undefweak.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
rename to ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak1.s b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl-undefweak1.s
rename to ld/testsuite/ld-arm/thumb2-bl-undefweak1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl.d b/ld/testsuite/ld-arm/thumb2-bl.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl.d
rename to ld/testsuite/ld-arm/thumb2-bl.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl.s b/ld/testsuite/ld-arm/thumb2-bl.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/thumb2-bl.s
rename to ld/testsuite/ld-arm/thumb2-bl.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/tls-app.d b/ld/testsuite/ld-arm/tls-app.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/tls-app.d
rename to ld/testsuite/ld-arm/tls-app.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/tls-app.r b/ld/testsuite/ld-arm/tls-app.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/tls-app.r
rename to ld/testsuite/ld-arm/tls-app.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/tls-app.s b/ld/testsuite/ld-arm/tls-app.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/tls-app.s
rename to ld/testsuite/ld-arm/tls-app.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/tls-lib.d b/ld/testsuite/ld-arm/tls-lib.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/tls-lib.d
rename to ld/testsuite/ld-arm/tls-lib.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/tls-lib.r b/ld/testsuite/ld-arm/tls-lib.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/tls-lib.r
rename to ld/testsuite/ld-arm/tls-lib.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/tls-lib.s b/ld/testsuite/ld-arm/tls-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/tls-lib.s
rename to ld/testsuite/ld-arm/tls-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-1.d b/ld/testsuite/ld-arm/unwind-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-1.d
rename to ld/testsuite/ld-arm/unwind-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-1.s b/ld/testsuite/ld-arm/unwind-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-1.s
rename to ld/testsuite/ld-arm/unwind-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-2.d b/ld/testsuite/ld-arm/unwind-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-2.d
rename to ld/testsuite/ld-arm/unwind-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-2.s b/ld/testsuite/ld-arm/unwind-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-2.s
rename to ld/testsuite/ld-arm/unwind-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-3.d b/ld/testsuite/ld-arm/unwind-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-3.d
rename to ld/testsuite/ld-arm/unwind-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-3.s b/ld/testsuite/ld-arm/unwind-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-3.s
rename to ld/testsuite/ld-arm/unwind-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-4.d b/ld/testsuite/ld-arm/unwind-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-4.d
rename to ld/testsuite/ld-arm/unwind-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-4.s b/ld/testsuite/ld-arm/unwind-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-4.s
rename to ld/testsuite/ld-arm/unwind-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-5.d b/ld/testsuite/ld-arm/unwind-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-5.d
rename to ld/testsuite/ld-arm/unwind-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-5.s b/ld/testsuite/ld-arm/unwind-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/unwind-5.s
rename to ld/testsuite/ld-arm/unwind-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/use-thumb-lib.s b/ld/testsuite/ld-arm/use-thumb-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/use-thumb-lib.s
rename to ld/testsuite/ld-arm/use-thumb-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/use-thumb-lib.sym b/ld/testsuite/ld-arm/use-thumb-lib.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/use-thumb-lib.sym
rename to ld/testsuite/ld-arm/use-thumb-lib.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-none.d b/ld/testsuite/ld-arm/vfp11-fix-none.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-none.d
rename to ld/testsuite/ld-arm/vfp11-fix-none.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-none.s b/ld/testsuite/ld-arm/vfp11-fix-none.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-none.s
rename to ld/testsuite/ld-arm/vfp11-fix-none.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-scalar.d b/ld/testsuite/ld-arm/vfp11-fix-scalar.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-scalar.d
rename to ld/testsuite/ld-arm/vfp11-fix-scalar.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-scalar.s b/ld/testsuite/ld-arm/vfp11-fix-scalar.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-scalar.s
rename to ld/testsuite/ld-arm/vfp11-fix-scalar.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-vector.d b/ld/testsuite/ld-arm/vfp11-fix-vector.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-vector.d
rename to ld/testsuite/ld-arm/vfp11-fix-vector.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-vector.s b/ld/testsuite/ld-arm/vfp11-fix-vector.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vfp11-fix-vector.s
rename to ld/testsuite/ld-arm/vfp11-fix-vector.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.dd b/ld/testsuite/ld-arm/vxworks1-lib.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.dd
rename to ld/testsuite/ld-arm/vxworks1-lib.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.nd b/ld/testsuite/ld-arm/vxworks1-lib.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.nd
rename to ld/testsuite/ld-arm/vxworks1-lib.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.rd b/ld/testsuite/ld-arm/vxworks1-lib.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.rd
rename to ld/testsuite/ld-arm/vxworks1-lib.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.s b/ld/testsuite/ld-arm/vxworks1-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.s
rename to ld/testsuite/ld-arm/vxworks1-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.td b/ld/testsuite/ld-arm/vxworks1-lib.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-lib.td
rename to ld/testsuite/ld-arm/vxworks1-lib.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-static.d b/ld/testsuite/ld-arm/vxworks1-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1-static.d
rename to ld/testsuite/ld-arm/vxworks1-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.dd b/ld/testsuite/ld-arm/vxworks1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.dd
rename to ld/testsuite/ld-arm/vxworks1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.ld b/ld/testsuite/ld-arm/vxworks1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.ld
rename to ld/testsuite/ld-arm/vxworks1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.rd b/ld/testsuite/ld-arm/vxworks1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.rd
rename to ld/testsuite/ld-arm/vxworks1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.s b/ld/testsuite/ld-arm/vxworks1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks1.s
rename to ld/testsuite/ld-arm/vxworks1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks2-static.sd b/ld/testsuite/ld-arm/vxworks2-static.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks2-static.sd
rename to ld/testsuite/ld-arm/vxworks2-static.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks2.s b/ld/testsuite/ld-arm/vxworks2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks2.s
rename to ld/testsuite/ld-arm/vxworks2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks2.sd b/ld/testsuite/ld-arm/vxworks2.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-arm/vxworks2.sd
rename to ld/testsuite/ld-arm/vxworks2.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-auto-import/auto-import.exp b/ld/testsuite/ld-auto-import/auto-import.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-auto-import/auto-import.exp
rename to ld/testsuite/ld-auto-import/auto-import.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-auto-import/client.c b/ld/testsuite/ld-auto-import/client.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-auto-import/client.c
rename to ld/testsuite/ld-auto-import/client.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-auto-import/dll.c b/ld/testsuite/ld-auto-import/dll.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-auto-import/dll.c
rename to ld/testsuite/ld-auto-import/dll.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-bootstrap/bootstrap.exp
rename to ld/testsuite/ld-bootstrap/bootstrap.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-bar.cc b/ld/testsuite/ld-cdtest/cdtest-bar.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-bar.cc
rename to ld/testsuite/ld-cdtest/cdtest-bar.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-foo.cc b/ld/testsuite/ld-cdtest/cdtest-foo.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-foo.cc
rename to ld/testsuite/ld-cdtest/cdtest-foo.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-foo.h b/ld/testsuite/ld-cdtest/cdtest-foo.h
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-foo.h
rename to ld/testsuite/ld-cdtest/cdtest-foo.h
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-main.cc b/ld/testsuite/ld-cdtest/cdtest-main.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-main.cc
rename to ld/testsuite/ld-cdtest/cdtest-main.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-nrv.dat b/ld/testsuite/ld-cdtest/cdtest-nrv.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest-nrv.dat
rename to ld/testsuite/ld-cdtest/cdtest-nrv.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest.dat b/ld/testsuite/ld-cdtest/cdtest.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest.dat
rename to ld/testsuite/ld-cdtest/cdtest.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest.exp b/ld/testsuite/ld-cdtest/cdtest.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cdtest/cdtest.exp
rename to ld/testsuite/ld-cdtest/cdtest.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-checks/asm.s b/ld/testsuite/ld-checks/asm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-checks/asm.s
rename to ld/testsuite/ld-checks/asm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-checks/checks.exp b/ld/testsuite/ld-checks/checks.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-checks/checks.exp
rename to ld/testsuite/ld-checks/checks.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-checks/script b/ld/testsuite/ld-checks/script
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-checks/script
rename to ld/testsuite/ld-checks/script
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/badgotr1.d b/ld/testsuite/ld-cris/badgotr1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/badgotr1.d
rename to ld/testsuite/ld-cris/badgotr1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/comref1.s b/ld/testsuite/ld-cris/comref1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/comref1.s
rename to ld/testsuite/ld-cris/comref1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/cris.exp b/ld/testsuite/ld-cris/cris.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/cris.exp
rename to ld/testsuite/ld-cris/cris.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/def2.d b/ld/testsuite/ld-cris/def2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/def2.d
rename to ld/testsuite/ld-cris/def2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/def3.d b/ld/testsuite/ld-cris/def3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/def3.d
rename to ld/testsuite/ld-cris/def3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dso-1.s b/ld/testsuite/ld-cris/dso-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dso-1.s
rename to ld/testsuite/ld-cris/dso-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dso-1b.s b/ld/testsuite/ld-cris/dso-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dso-1b.s
rename to ld/testsuite/ld-cris/dso-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dso-2.s b/ld/testsuite/ld-cris/dso-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dso-2.s
rename to ld/testsuite/ld-cris/dso-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dso-3.s b/ld/testsuite/ld-cris/dso-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dso-3.s
rename to ld/testsuite/ld-cris/dso-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dso12-pltdis.d b/ld/testsuite/ld-cris/dso12-pltdis.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dso12-pltdis.d
rename to ld/testsuite/ld-cris/dso12-pltdis.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dsofnf.s b/ld/testsuite/ld-cris/dsofnf.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dsofnf.s
rename to ld/testsuite/ld-cris/dsofnf.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dsofnf2.s b/ld/testsuite/ld-cris/dsofnf2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dsofnf2.s
rename to ld/testsuite/ld-cris/dsofnf2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-1.s b/ld/testsuite/ld-cris/dsov32-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-1.s
rename to ld/testsuite/ld-cris/dsov32-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-2.s b/ld/testsuite/ld-cris/dsov32-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-2.s
rename to ld/testsuite/ld-cris/dsov32-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-3.s b/ld/testsuite/ld-cris/dsov32-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-3.s
rename to ld/testsuite/ld-cris/dsov32-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-4.s b/ld/testsuite/ld-cris/dsov32-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/dsov32-4.s
rename to ld/testsuite/ld-cris/dsov32-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/euwref1.s b/ld/testsuite/ld-cris/euwref1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/euwref1.s
rename to ld/testsuite/ld-cris/euwref1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expalltst3 b/ld/testsuite/ld-cris/expalltst3
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expalltst3
rename to ld/testsuite/ld-cris/expalltst3
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdref1.s b/ld/testsuite/ld-cris/expdref1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdref1.s
rename to ld/testsuite/ld-cris/expdref1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdref2.s b/ld/testsuite/ld-cris/expdref2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdref2.s
rename to ld/testsuite/ld-cris/expdref2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdref3.s b/ld/testsuite/ld-cris/expdref3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdref3.s
rename to ld/testsuite/ld-cris/expdref3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdref4.s b/ld/testsuite/ld-cris/expdref4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdref4.s
rename to ld/testsuite/ld-cris/expdref4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn1.d b/ld/testsuite/ld-cris/expdyn1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn1.d
rename to ld/testsuite/ld-cris/expdyn1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn1.s b/ld/testsuite/ld-cris/expdyn1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn1.s
rename to ld/testsuite/ld-cris/expdyn1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn1w.s b/ld/testsuite/ld-cris/expdyn1w.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn1w.s
rename to ld/testsuite/ld-cris/expdyn1w.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn2.d b/ld/testsuite/ld-cris/expdyn2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn2.d
rename to ld/testsuite/ld-cris/expdyn2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn2.s b/ld/testsuite/ld-cris/expdyn2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn2.s
rename to ld/testsuite/ld-cris/expdyn2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn3.d b/ld/testsuite/ld-cris/expdyn3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn3.d
rename to ld/testsuite/ld-cris/expdyn3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn4.d b/ld/testsuite/ld-cris/expdyn4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn4.d
rename to ld/testsuite/ld-cris/expdyn4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn5.d b/ld/testsuite/ld-cris/expdyn5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn5.d
rename to ld/testsuite/ld-cris/expdyn5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn6.d b/ld/testsuite/ld-cris/expdyn6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn6.d
rename to ld/testsuite/ld-cris/expdyn6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn7.d b/ld/testsuite/ld-cris/expdyn7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/expdyn7.d
rename to ld/testsuite/ld-cris/expdyn7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/globsym1ref.s b/ld/testsuite/ld-cris/globsym1ref.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/globsym1ref.s
rename to ld/testsuite/ld-cris/globsym1ref.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/globsymw1.s b/ld/testsuite/ld-cris/globsymw1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/globsymw1.s
rename to ld/testsuite/ld-cris/globsymw1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/globsymw2.s b/ld/testsuite/ld-cris/globsymw2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/globsymw2.s
rename to ld/testsuite/ld-cris/globsymw2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/got7.s b/ld/testsuite/ld-cris/got7.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/got7.s
rename to ld/testsuite/ld-cris/got7.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/gotplt1.d
rename to ld/testsuite/ld-cris/gotplt1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/gotplt2.d
rename to ld/testsuite/ld-cris/gotplt2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/gotplt3.d
rename to ld/testsuite/ld-cris/gotplt3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/gotrel1.s b/ld/testsuite/ld-cris/gotrel1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/gotrel1.s
rename to ld/testsuite/ld-cris/gotrel1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/gotrel2.s b/ld/testsuite/ld-cris/gotrel2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/gotrel2.s
rename to ld/testsuite/ld-cris/gotrel2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/hiddef1.d
rename to ld/testsuite/ld-cris/hiddef1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/hiddef1.s b/ld/testsuite/ld-cris/hiddef1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/hiddef1.s
rename to ld/testsuite/ld-cris/hiddef1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/hide1 b/ld/testsuite/ld-cris/hide1
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/hide1
rename to ld/testsuite/ld-cris/hide1
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/hidedsofns2468 b/ld/testsuite/ld-cris/hidedsofns2468
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/hidedsofns2468
rename to ld/testsuite/ld-cris/hidedsofns2468
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/hidrefgotplt1.s b/ld/testsuite/ld-cris/hidrefgotplt1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/hidrefgotplt1.s
rename to ld/testsuite/ld-cris/hidrefgotplt1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/init.s b/ld/testsuite/ld-cris/init.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/init.s
rename to ld/testsuite/ld-cris/init.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/ldsym1.d b/ld/testsuite/ld-cris/ldsym1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/ldsym1.d
rename to ld/testsuite/ld-cris/ldsym1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1.d b/ld/testsuite/ld-cris/libdso-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1.d
rename to ld/testsuite/ld-cris/libdso-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-10.d b/ld/testsuite/ld-cris/libdso-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-10.d
rename to ld/testsuite/ld-cris/libdso-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-11.d b/ld/testsuite/ld-cris/libdso-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-11.d
rename to ld/testsuite/ld-cris/libdso-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-12.d
rename to ld/testsuite/ld-cris/libdso-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-12b.d b/ld/testsuite/ld-cris/libdso-12b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-12b.d
rename to ld/testsuite/ld-cris/libdso-12b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-12c.d b/ld/testsuite/ld-cris/libdso-12c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-12c.d
rename to ld/testsuite/ld-cris/libdso-12c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-13.d b/ld/testsuite/ld-cris/libdso-13.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-13.d
rename to ld/testsuite/ld-cris/libdso-13.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-13b.d b/ld/testsuite/ld-cris/libdso-13b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-13b.d
rename to ld/testsuite/ld-cris/libdso-13b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-14.d b/ld/testsuite/ld-cris/libdso-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-14.d
rename to ld/testsuite/ld-cris/libdso-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-15.d b/ld/testsuite/ld-cris/libdso-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-15.d
rename to ld/testsuite/ld-cris/libdso-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-15b.d b/ld/testsuite/ld-cris/libdso-15b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-15b.d
rename to ld/testsuite/ld-cris/libdso-15b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1b.d b/ld/testsuite/ld-cris/libdso-1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1b.d
rename to ld/testsuite/ld-cris/libdso-1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1c.d b/ld/testsuite/ld-cris/libdso-1c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1c.d
rename to ld/testsuite/ld-cris/libdso-1c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1d.d b/ld/testsuite/ld-cris/libdso-1d.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-1d.d
rename to ld/testsuite/ld-cris/libdso-1d.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-2.d
rename to ld/testsuite/ld-cris/libdso-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-3.d b/ld/testsuite/ld-cris/libdso-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-3.d
rename to ld/testsuite/ld-cris/libdso-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-4.d b/ld/testsuite/ld-cris/libdso-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/libdso-4.d
rename to ld/testsuite/ld-cris/libdso-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/locref1.d b/ld/testsuite/ld-cris/locref1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/locref1.d
rename to ld/testsuite/ld-cris/locref1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/locref1.s b/ld/testsuite/ld-cris/locref1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/locref1.s
rename to ld/testsuite/ld-cris/locref1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/locref2.d b/ld/testsuite/ld-cris/locref2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/locref2.d
rename to ld/testsuite/ld-cris/locref2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/locref2.s b/ld/testsuite/ld-cris/locref2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/locref2.s
rename to ld/testsuite/ld-cris/locref2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/move-1.s b/ld/testsuite/ld-cris/move-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/move-1.s
rename to ld/testsuite/ld-cris/move-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/nodyn4.d b/ld/testsuite/ld-cris/nodyn4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/nodyn4.d
rename to ld/testsuite/ld-cris/nodyn4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/nodyn5.d b/ld/testsuite/ld-cris/nodyn5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/nodyn5.d
rename to ld/testsuite/ld-cris/nodyn5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/noglob1.d b/ld/testsuite/ld-cris/noglob1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/noglob1.d
rename to ld/testsuite/ld-cris/noglob1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/noglob1.s b/ld/testsuite/ld-cris/noglob1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/noglob1.s
rename to ld/testsuite/ld-cris/noglob1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/noov.d b/ld/testsuite/ld-cris/noov.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/noov.d
rename to ld/testsuite/ld-cris/noov.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/noov.s b/ld/testsuite/ld-cris/noov.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/noov.s
rename to ld/testsuite/ld-cris/noov.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pcrelcp-1.d b/ld/testsuite/ld-cris/pcrelcp-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pcrelcp-1.d
rename to ld/testsuite/ld-cris/pcrelcp-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pcrelcp-1.s b/ld/testsuite/ld-cris/pcrelcp-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pcrelcp-1.s
rename to ld/testsuite/ld-cris/pcrelcp-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-72.d b/ld/testsuite/ld-cris/pic-gc-72.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-72.d
rename to ld/testsuite/ld-cris/pic-gc-72.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-72.s b/ld/testsuite/ld-cris/pic-gc-72.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-72.s
rename to ld/testsuite/ld-cris/pic-gc-72.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-73.d b/ld/testsuite/ld-cris/pic-gc-73.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-73.d
rename to ld/testsuite/ld-cris/pic-gc-73.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-73.s b/ld/testsuite/ld-cris/pic-gc-73.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pic-gc-73.s
rename to ld/testsuite/ld-cris/pic-gc-73.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pv32-1.d b/ld/testsuite/ld-cris/pv32-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pv32-1.d
rename to ld/testsuite/ld-cris/pv32-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/pv32.s b/ld/testsuite/ld-cris/pv32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/pv32.s
rename to ld/testsuite/ld-cris/pv32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/stabs1.s b/ld/testsuite/ld-cris/stabs1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/stabs1.s
rename to ld/testsuite/ld-cris/stabs1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/start1.s b/ld/testsuite/ld-cris/start1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/start1.s
rename to ld/testsuite/ld-cris/start1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-commx.s b/ld/testsuite/ld-cris/tls-commx.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-commx.s
rename to ld/testsuite/ld-cris/tls-commx.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
rename to ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d b/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
rename to ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-x1x2-1.d b/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-x1x2-1.d
rename to ld/testsuite/ld-cris/tls-dso-x1x2-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-xz-1.d b/ld/testsuite/ld-cris/tls-dso-xz-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dso-xz-1.d
rename to ld/testsuite/ld-cris/tls-dso-xz-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dtpoffdx.s b/ld/testsuite/ld-cris/tls-dtpoffdx.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dtpoffdx.s
rename to ld/testsuite/ld-cris/tls-dtpoffdx.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dtprelm.s b/ld/testsuite/ld-cris/tls-dtprelm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-dtprelm.s
rename to ld/testsuite/ld-cris/tls-dtprelm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-20.d b/ld/testsuite/ld-cris/tls-e-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-20.d
rename to ld/testsuite/ld-cris/tls-e-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-20a.d b/ld/testsuite/ld-cris/tls-e-20a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-20a.d
rename to ld/testsuite/ld-cris/tls-e-20a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-21.d b/ld/testsuite/ld-cris/tls-e-21.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-21.d
rename to ld/testsuite/ld-cris/tls-e-21.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-22.d b/ld/testsuite/ld-cris/tls-e-22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-22.d
rename to ld/testsuite/ld-cris/tls-e-22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-23.d b/ld/testsuite/ld-cris/tls-e-23.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-23.d
rename to ld/testsuite/ld-cris/tls-e-23.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-66.d b/ld/testsuite/ld-cris/tls-e-66.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-66.d
rename to ld/testsuite/ld-cris/tls-e-66.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-80.d b/ld/testsuite/ld-cris/tls-e-80.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-80.d
rename to ld/testsuite/ld-cris/tls-e-80.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-dtpoffd1.d b/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-dtpoffd1.d
rename to ld/testsuite/ld-cris/tls-e-dtpoffd1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-dtpoffd3.d b/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-dtpoffd3.d
rename to ld/testsuite/ld-cris/tls-e-dtpoffd3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d b/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
rename to ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-tpoffcomm1.s b/ld/testsuite/ld-cris/tls-e-tpoffcomm1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-e-tpoffcomm1.s
rename to ld/testsuite/ld-cris/tls-e-tpoffcomm1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-20x.d b/ld/testsuite/ld-cris/tls-err-20x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-20x.d
rename to ld/testsuite/ld-cris/tls-err-20x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-24.d b/ld/testsuite/ld-cris/tls-err-24.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-24.d
rename to ld/testsuite/ld-cris/tls-err-24.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-25.d b/ld/testsuite/ld-cris/tls-err-25.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-25.d
rename to ld/testsuite/ld-cris/tls-err-25.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-26.d b/ld/testsuite/ld-cris/tls-err-26.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-26.d
rename to ld/testsuite/ld-cris/tls-err-26.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-27.d b/ld/testsuite/ld-cris/tls-err-27.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-27.d
rename to ld/testsuite/ld-cris/tls-err-27.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-28.d b/ld/testsuite/ld-cris/tls-err-28.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-28.d
rename to ld/testsuite/ld-cris/tls-err-28.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-29.d b/ld/testsuite/ld-cris/tls-err-29.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-29.d
rename to ld/testsuite/ld-cris/tls-err-29.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-31.d b/ld/testsuite/ld-cris/tls-err-31.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-31.d
rename to ld/testsuite/ld-cris/tls-err-31.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-33.d b/ld/testsuite/ld-cris/tls-err-33.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-33.d
rename to ld/testsuite/ld-cris/tls-err-33.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-35.d b/ld/testsuite/ld-cris/tls-err-35.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-35.d
rename to ld/testsuite/ld-cris/tls-err-35.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-37.d b/ld/testsuite/ld-cris/tls-err-37.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-37.d
rename to ld/testsuite/ld-cris/tls-err-37.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-39.d b/ld/testsuite/ld-cris/tls-err-39.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-39.d
rename to ld/testsuite/ld-cris/tls-err-39.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-40.d b/ld/testsuite/ld-cris/tls-err-40.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-40.d
rename to ld/testsuite/ld-cris/tls-err-40.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-41.d b/ld/testsuite/ld-cris/tls-err-41.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-41.d
rename to ld/testsuite/ld-cris/tls-err-41.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-43.d b/ld/testsuite/ld-cris/tls-err-43.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-43.d
rename to ld/testsuite/ld-cris/tls-err-43.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-44.d b/ld/testsuite/ld-cris/tls-err-44.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-44.d
rename to ld/testsuite/ld-cris/tls-err-44.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-45.d b/ld/testsuite/ld-cris/tls-err-45.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-45.d
rename to ld/testsuite/ld-cris/tls-err-45.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-47.d b/ld/testsuite/ld-cris/tls-err-47.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-47.d
rename to ld/testsuite/ld-cris/tls-err-47.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-48.d b/ld/testsuite/ld-cris/tls-err-48.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-48.d
rename to ld/testsuite/ld-cris/tls-err-48.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-49.d b/ld/testsuite/ld-cris/tls-err-49.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-49.d
rename to ld/testsuite/ld-cris/tls-err-49.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-51.d b/ld/testsuite/ld-cris/tls-err-51.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-51.d
rename to ld/testsuite/ld-cris/tls-err-51.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-52.d b/ld/testsuite/ld-cris/tls-err-52.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-52.d
rename to ld/testsuite/ld-cris/tls-err-52.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-53.d b/ld/testsuite/ld-cris/tls-err-53.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-53.d
rename to ld/testsuite/ld-cris/tls-err-53.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-55.d b/ld/testsuite/ld-cris/tls-err-55.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-55.d
rename to ld/testsuite/ld-cris/tls-err-55.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-55.s b/ld/testsuite/ld-cris/tls-err-55.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-55.s
rename to ld/testsuite/ld-cris/tls-err-55.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-56.d b/ld/testsuite/ld-cris/tls-err-56.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-56.d
rename to ld/testsuite/ld-cris/tls-err-56.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-56.s b/ld/testsuite/ld-cris/tls-err-56.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-56.s
rename to ld/testsuite/ld-cris/tls-err-56.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-62.d b/ld/testsuite/ld-cris/tls-err-62.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-62.d
rename to ld/testsuite/ld-cris/tls-err-62.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-62.s b/ld/testsuite/ld-cris/tls-err-62.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-62.s
rename to ld/testsuite/ld-cris/tls-err-62.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-65.d b/ld/testsuite/ld-cris/tls-err-65.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-65.d
rename to ld/testsuite/ld-cris/tls-err-65.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-67.d b/ld/testsuite/ld-cris/tls-err-67.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-67.d
rename to ld/testsuite/ld-cris/tls-err-67.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-77.d b/ld/testsuite/ld-cris/tls-err-77.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-err-77.d
rename to ld/testsuite/ld-cris/tls-err-77.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-68.d b/ld/testsuite/ld-cris/tls-gc-68.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-68.d
rename to ld/testsuite/ld-cris/tls-gc-68.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-69.d b/ld/testsuite/ld-cris/tls-gc-69.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-69.d
rename to ld/testsuite/ld-cris/tls-gc-69.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-70.d b/ld/testsuite/ld-cris/tls-gc-70.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-70.d
rename to ld/testsuite/ld-cris/tls-gc-70.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-71.d b/ld/testsuite/ld-cris/tls-gc-71.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-71.d
rename to ld/testsuite/ld-cris/tls-gc-71.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-71.s b/ld/testsuite/ld-cris/tls-gc-71.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-71.s
rename to ld/testsuite/ld-cris/tls-gc-71.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-75.d b/ld/testsuite/ld-cris/tls-gc-75.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-75.d
rename to ld/testsuite/ld-cris/tls-gc-75.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-76.d b/ld/testsuite/ld-cris/tls-gc-76.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-76.d
rename to ld/testsuite/ld-cris/tls-gc-76.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-76.s b/ld/testsuite/ld-cris/tls-gc-76.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-76.s
rename to ld/testsuite/ld-cris/tls-gc-76.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-79.d b/ld/testsuite/ld-cris/tls-gc-79.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gc-79.d
rename to ld/testsuite/ld-cris/tls-gc-79.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-1.d b/ld/testsuite/ld-cris/tls-gd-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-1.d
rename to ld/testsuite/ld-cris/tls-gd-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-1.s b/ld/testsuite/ld-cris/tls-gd-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-1.s
rename to ld/testsuite/ld-cris/tls-gd-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-1h.d b/ld/testsuite/ld-cris/tls-gd-1h.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-1h.d
rename to ld/testsuite/ld-cris/tls-gd-1h.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-2.d b/ld/testsuite/ld-cris/tls-gd-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-2.d
rename to ld/testsuite/ld-cris/tls-gd-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-2.s b/ld/testsuite/ld-cris/tls-gd-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-2.s
rename to ld/testsuite/ld-cris/tls-gd-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-2h.d b/ld/testsuite/ld-cris/tls-gd-2h.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-2h.d
rename to ld/testsuite/ld-cris/tls-gd-2h.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-3.d b/ld/testsuite/ld-cris/tls-gd-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-3.d
rename to ld/testsuite/ld-cris/tls-gd-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-3.s b/ld/testsuite/ld-cris/tls-gd-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-3.s
rename to ld/testsuite/ld-cris/tls-gd-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-3h.d b/ld/testsuite/ld-cris/tls-gd-3h.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gd-3h.d
rename to ld/testsuite/ld-cris/tls-gd-3h.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gdgotrelm.s b/ld/testsuite/ld-cris/tls-gdgotrelm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gdgotrelm.s
rename to ld/testsuite/ld-cris/tls-gdgotrelm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-global-74.d b/ld/testsuite/ld-cris/tls-global-74.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-global-74.d
rename to ld/testsuite/ld-cris/tls-global-74.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gottprelm.s b/ld/testsuite/ld-cris/tls-gottprelm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-gottprelm.s
rename to ld/testsuite/ld-cris/tls-gottprelm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-hx.s b/ld/testsuite/ld-cris/tls-hx.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-hx.s
rename to ld/testsuite/ld-cris/tls-hx.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-hx1x2.s b/ld/testsuite/ld-cris/tls-hx1x2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-hx1x2.s
rename to ld/testsuite/ld-cris/tls-hx1x2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-10.d b/ld/testsuite/ld-cris/tls-ie-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-10.d
rename to ld/testsuite/ld-cris/tls-ie-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-10.s b/ld/testsuite/ld-cris/tls-ie-10.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-10.s
rename to ld/testsuite/ld-cris/tls-ie-10.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-11.d b/ld/testsuite/ld-cris/tls-ie-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-11.d
rename to ld/testsuite/ld-cris/tls-ie-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-11.s b/ld/testsuite/ld-cris/tls-ie-11.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-11.s
rename to ld/testsuite/ld-cris/tls-ie-11.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-78.d b/ld/testsuite/ld-cris/tls-ie-78.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-78.d
rename to ld/testsuite/ld-cris/tls-ie-78.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8.d b/ld/testsuite/ld-cris/tls-ie-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8.d
rename to ld/testsuite/ld-cris/tls-ie-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8.s b/ld/testsuite/ld-cris/tls-ie-8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8.s
rename to ld/testsuite/ld-cris/tls-ie-8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8e.s b/ld/testsuite/ld-cris/tls-ie-8e.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8e.s
rename to ld/testsuite/ld-cris/tls-ie-8e.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8e1.d b/ld/testsuite/ld-cris/tls-ie-8e1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-8e1.d
rename to ld/testsuite/ld-cris/tls-ie-8e1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-9.d b/ld/testsuite/ld-cris/tls-ie-9.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-9.d
rename to ld/testsuite/ld-cris/tls-ie-9.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-9.s b/ld/testsuite/ld-cris/tls-ie-9.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ie-9.s
rename to ld/testsuite/ld-cris/tls-ie-9.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-js1.d b/ld/testsuite/ld-cris/tls-js1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-js1.d
rename to ld/testsuite/ld-cris/tls-js1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-4.d b/ld/testsuite/ld-cris/tls-ld-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-4.d
rename to ld/testsuite/ld-cris/tls-ld-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-4.s b/ld/testsuite/ld-cris/tls-ld-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-4.s
rename to ld/testsuite/ld-cris/tls-ld-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-5.d b/ld/testsuite/ld-cris/tls-ld-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-5.d
rename to ld/testsuite/ld-cris/tls-ld-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-5.s b/ld/testsuite/ld-cris/tls-ld-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-5.s
rename to ld/testsuite/ld-cris/tls-ld-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-6.d b/ld/testsuite/ld-cris/tls-ld-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-6.d
rename to ld/testsuite/ld-cris/tls-ld-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-6.s b/ld/testsuite/ld-cris/tls-ld-6.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-6.s
rename to ld/testsuite/ld-cris/tls-ld-6.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-7.d b/ld/testsuite/ld-cris/tls-ld-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-7.d
rename to ld/testsuite/ld-cris/tls-ld-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-7.s b/ld/testsuite/ld-cris/tls-ld-7.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ld-7.s
rename to ld/testsuite/ld-cris/tls-ld-7.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-14.d b/ld/testsuite/ld-cris/tls-ldgd-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-14.d
rename to ld/testsuite/ld-cris/tls-ldgd-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-14.s b/ld/testsuite/ld-cris/tls-ldgd-14.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-14.s
rename to ld/testsuite/ld-cris/tls-ldgd-14.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-15.d b/ld/testsuite/ld-cris/tls-ldgd-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-15.d
rename to ld/testsuite/ld-cris/tls-ldgd-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-15.s b/ld/testsuite/ld-cris/tls-ldgd-15.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgd-15.s
rename to ld/testsuite/ld-cris/tls-ldgd-15.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgde-14.d b/ld/testsuite/ld-cris/tls-ldgde-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgde-14.d
rename to ld/testsuite/ld-cris/tls-ldgde-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgde-15.d b/ld/testsuite/ld-cris/tls-ldgde-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgde-15.d
rename to ld/testsuite/ld-cris/tls-ldgde-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdex-14.d b/ld/testsuite/ld-cris/tls-ldgdex-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdex-14.d
rename to ld/testsuite/ld-cris/tls-ldgdex-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdex-15.d b/ld/testsuite/ld-cris/tls-ldgdex-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdex-15.d
rename to ld/testsuite/ld-cris/tls-ldgdex-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdx-14.d b/ld/testsuite/ld-cris/tls-ldgdx-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdx-14.d
rename to ld/testsuite/ld-cris/tls-ldgdx-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdx-15.d b/ld/testsuite/ld-cris/tls-ldgdx-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ldgdx-15.d
rename to ld/testsuite/ld-cris/tls-ldgdx-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12.d b/ld/testsuite/ld-cris/tls-le-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12.d
rename to ld/testsuite/ld-cris/tls-le-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12.s b/ld/testsuite/ld-cris/tls-le-12.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12.s
rename to ld/testsuite/ld-cris/tls-le-12.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12s.d b/ld/testsuite/ld-cris/tls-le-12s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12s.d
rename to ld/testsuite/ld-cris/tls-le-12s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12s.s b/ld/testsuite/ld-cris/tls-le-12s.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-12s.s
rename to ld/testsuite/ld-cris/tls-le-12s.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13.d b/ld/testsuite/ld-cris/tls-le-13.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13.d
rename to ld/testsuite/ld-cris/tls-le-13.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13.s b/ld/testsuite/ld-cris/tls-le-13.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13.s
rename to ld/testsuite/ld-cris/tls-le-13.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13s.d b/ld/testsuite/ld-cris/tls-le-13s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13s.d
rename to ld/testsuite/ld-cris/tls-le-13s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13s.s b/ld/testsuite/ld-cris/tls-le-13s.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-le-13s.s
rename to ld/testsuite/ld-cris/tls-le-13s.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legd-16.d b/ld/testsuite/ld-cris/tls-legd-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legd-16.d
rename to ld/testsuite/ld-cris/tls-legd-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legd-16.s b/ld/testsuite/ld-cris/tls-legd-16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legd-16.s
rename to ld/testsuite/ld-cris/tls-legd-16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legd-17.d b/ld/testsuite/ld-cris/tls-legd-17.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legd-17.d
rename to ld/testsuite/ld-cris/tls-legd-17.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legdx-16.d b/ld/testsuite/ld-cris/tls-legdx-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legdx-16.d
rename to ld/testsuite/ld-cris/tls-legdx-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legdx-17.d b/ld/testsuite/ld-cris/tls-legdx-17.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-legdx-17.d
rename to ld/testsuite/ld-cris/tls-legdx-17.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-leie-18.d b/ld/testsuite/ld-cris/tls-leie-18.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-leie-18.d
rename to ld/testsuite/ld-cris/tls-leie-18.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-leie-19.d b/ld/testsuite/ld-cris/tls-leie-19.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-leie-19.d
rename to ld/testsuite/ld-cris/tls-leie-19.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-leie-19.s b/ld/testsuite/ld-cris/tls-leie-19.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-leie-19.s
rename to ld/testsuite/ld-cris/tls-leie-19.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-54.d b/ld/testsuite/ld-cris/tls-local-54.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-54.d
rename to ld/testsuite/ld-cris/tls-local-54.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-54.s b/ld/testsuite/ld-cris/tls-local-54.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-54.s
rename to ld/testsuite/ld-cris/tls-local-54.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-57.d b/ld/testsuite/ld-cris/tls-local-57.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-57.d
rename to ld/testsuite/ld-cris/tls-local-57.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-57.s b/ld/testsuite/ld-cris/tls-local-57.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-57.s
rename to ld/testsuite/ld-cris/tls-local-57.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-58.d b/ld/testsuite/ld-cris/tls-local-58.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-58.d
rename to ld/testsuite/ld-cris/tls-local-58.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-58.s b/ld/testsuite/ld-cris/tls-local-58.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-58.s
rename to ld/testsuite/ld-cris/tls-local-58.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-59.d b/ld/testsuite/ld-cris/tls-local-59.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-59.d
rename to ld/testsuite/ld-cris/tls-local-59.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-59.s b/ld/testsuite/ld-cris/tls-local-59.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-59.s
rename to ld/testsuite/ld-cris/tls-local-59.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-60.d b/ld/testsuite/ld-cris/tls-local-60.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-60.d
rename to ld/testsuite/ld-cris/tls-local-60.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-61.d b/ld/testsuite/ld-cris/tls-local-61.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-61.d
rename to ld/testsuite/ld-cris/tls-local-61.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-63.d b/ld/testsuite/ld-cris/tls-local-63.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-63.d
rename to ld/testsuite/ld-cris/tls-local-63.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-local-64.d
rename to ld/testsuite/ld-cris/tls-local-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-30.d b/ld/testsuite/ld-cris/tls-ok-30.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-30.d
rename to ld/testsuite/ld-cris/tls-ok-30.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-32.d b/ld/testsuite/ld-cris/tls-ok-32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-32.d
rename to ld/testsuite/ld-cris/tls-ok-32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-34.d b/ld/testsuite/ld-cris/tls-ok-34.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-34.d
rename to ld/testsuite/ld-cris/tls-ok-34.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-36.d b/ld/testsuite/ld-cris/tls-ok-36.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-ok-36.d
rename to ld/testsuite/ld-cris/tls-ok-36.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-tbss64.s b/ld/testsuite/ld-cris/tls-tbss64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-tbss64.s
rename to ld/testsuite/ld-cris/tls-tbss64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-tprelm.s b/ld/testsuite/ld-cris/tls-tprelm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-tprelm.s
rename to ld/testsuite/ld-cris/tls-tprelm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-38.d b/ld/testsuite/ld-cris/tls-und-38.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-38.d
rename to ld/testsuite/ld-cris/tls-und-38.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-42.d b/ld/testsuite/ld-cris/tls-und-42.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-42.d
rename to ld/testsuite/ld-cris/tls-und-42.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-46.d b/ld/testsuite/ld-cris/tls-und-46.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-46.d
rename to ld/testsuite/ld-cris/tls-und-46.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-50.d b/ld/testsuite/ld-cris/tls-und-50.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-und-50.d
rename to ld/testsuite/ld-cris/tls-und-50.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-x.s b/ld/testsuite/ld-cris/tls-x.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-x.s
rename to ld/testsuite/ld-cris/tls-x.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-x1x2.s b/ld/testsuite/ld-cris/tls-x1x2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-x1x2.s
rename to ld/testsuite/ld-cris/tls-x1x2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls-z.s b/ld/testsuite/ld-cris/tls-z.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls-z.s
rename to ld/testsuite/ld-cris/tls-z.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls128.s b/ld/testsuite/ld-cris/tls128.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls128.s
rename to ld/testsuite/ld-cris/tls128.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/tls128g.s b/ld/testsuite/ld-cris/tls128g.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/tls128g.s
rename to ld/testsuite/ld-cris/tls128g.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/undef1.d b/ld/testsuite/ld-cris/undef1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/undef1.d
rename to ld/testsuite/ld-cris/undef1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/undef2.d b/ld/testsuite/ld-cris/undef2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/undef2.d
rename to ld/testsuite/ld-cris/undef2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/undef3.d b/ld/testsuite/ld-cris/undef3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/undef3.d
rename to ld/testsuite/ld-cris/undef3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v10-v32.d b/ld/testsuite/ld-cris/v10-v32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v10-v32.d
rename to ld/testsuite/ld-cris/v10-v32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v10-va.d b/ld/testsuite/ld-cris/v10-va.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v10-va.d
rename to ld/testsuite/ld-cris/v10-va.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v32-ba-1.d b/ld/testsuite/ld-cris/v32-ba-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v32-ba-1.d
rename to ld/testsuite/ld-cris/v32-ba-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v32-ba-1.s b/ld/testsuite/ld-cris/v32-ba-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v32-ba-1.s
rename to ld/testsuite/ld-cris/v32-ba-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v32-bin-1.d b/ld/testsuite/ld-cris/v32-bin-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v32-bin-1.d
rename to ld/testsuite/ld-cris/v32-bin-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v32-bin-1.s b/ld/testsuite/ld-cris/v32-bin-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v32-bin-1.s
rename to ld/testsuite/ld-cris/v32-bin-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v32-v10.d b/ld/testsuite/ld-cris/v32-v10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v32-v10.d
rename to ld/testsuite/ld-cris/v32-v10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/v32-va.d b/ld/testsuite/ld-cris/v32-va.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/v32-va.d
rename to ld/testsuite/ld-cris/v32-va.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/va-v10.d b/ld/testsuite/ld-cris/va-v10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/va-v10.d
rename to ld/testsuite/ld-cris/va-v10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/va-v32.d b/ld/testsuite/ld-cris/va-v32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/va-v32.d
rename to ld/testsuite/ld-cris/va-v32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/warn1.d b/ld/testsuite/ld-cris/warn1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/warn1.d
rename to ld/testsuite/ld-cris/warn1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/warn2.d b/ld/testsuite/ld-cris/warn2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/warn2.d
rename to ld/testsuite/ld-cris/warn2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/warn3.d b/ld/testsuite/ld-cris/warn3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/warn3.d
rename to ld/testsuite/ld-cris/warn3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/warn4.d b/ld/testsuite/ld-cris/warn4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/warn4.d
rename to ld/testsuite/ld-cris/warn4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/weakhid.s b/ld/testsuite/ld-cris/weakhid.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/weakhid.s
rename to ld/testsuite/ld-cris/weakhid.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/weakhiddso.d b/ld/testsuite/ld-cris/weakhiddso.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/weakhiddso.d
rename to ld/testsuite/ld-cris/weakhiddso.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/weakref1.d b/ld/testsuite/ld-cris/weakref1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/weakref1.d
rename to ld/testsuite/ld-cris/weakref1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/weakref2.d b/ld/testsuite/ld-cris/weakref2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/weakref2.d
rename to ld/testsuite/ld-cris/weakref2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/weakref3.d b/ld/testsuite/ld-cris/weakref3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/weakref3.d
rename to ld/testsuite/ld-cris/weakref3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cris/weakref4.d b/ld/testsuite/ld-cris/weakref4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cris/weakref4.d
rename to ld/testsuite/ld-cris/weakref4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/crx.exp b/ld/testsuite/ld-crx/crx.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/crx.exp
rename to ld/testsuite/ld-crx/crx.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/crx.ld b/ld/testsuite/ld-crx/crx.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/crx.ld
rename to ld/testsuite/ld-crx/crx.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-abs32.d b/ld/testsuite/ld-crx/reloc-abs32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-abs32.d
rename to ld/testsuite/ld-crx/reloc-abs32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-abs32.s b/ld/testsuite/ld-crx/reloc-abs32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-abs32.s
rename to ld/testsuite/ld-crx/reloc-abs32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm16.d b/ld/testsuite/ld-crx/reloc-imm16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm16.d
rename to ld/testsuite/ld-crx/reloc-imm16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm16.s b/ld/testsuite/ld-crx/reloc-imm16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm16.s
rename to ld/testsuite/ld-crx/reloc-imm16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm32.d b/ld/testsuite/ld-crx/reloc-imm32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm32.d
rename to ld/testsuite/ld-crx/reloc-imm32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm32.s b/ld/testsuite/ld-crx/reloc-imm32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-imm32.s
rename to ld/testsuite/ld-crx/reloc-imm32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num16.d b/ld/testsuite/ld-crx/reloc-num16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num16.d
rename to ld/testsuite/ld-crx/reloc-num16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num16.s b/ld/testsuite/ld-crx/reloc-num16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num16.s
rename to ld/testsuite/ld-crx/reloc-num16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num32.d b/ld/testsuite/ld-crx/reloc-num32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num32.d
rename to ld/testsuite/ld-crx/reloc-num32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num32.s b/ld/testsuite/ld-crx/reloc-num32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num32.s
rename to ld/testsuite/ld-crx/reloc-num32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num8.d b/ld/testsuite/ld-crx/reloc-num8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num8.d
rename to ld/testsuite/ld-crx/reloc-num8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num8.s b/ld/testsuite/ld-crx/reloc-num8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-num8.s
rename to ld/testsuite/ld-crx/reloc-num8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel12.d b/ld/testsuite/ld-crx/reloc-regrel12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel12.d
rename to ld/testsuite/ld-crx/reloc-regrel12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel12.s b/ld/testsuite/ld-crx/reloc-regrel12.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel12.s
rename to ld/testsuite/ld-crx/reloc-regrel12.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel22.d b/ld/testsuite/ld-crx/reloc-regrel22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel22.d
rename to ld/testsuite/ld-crx/reloc-regrel22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel22.s b/ld/testsuite/ld-crx/reloc-regrel22.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel22.s
rename to ld/testsuite/ld-crx/reloc-regrel22.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel28.d b/ld/testsuite/ld-crx/reloc-regrel28.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel28.d
rename to ld/testsuite/ld-crx/reloc-regrel28.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel28.s b/ld/testsuite/ld-crx/reloc-regrel28.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel28.s
rename to ld/testsuite/ld-crx/reloc-regrel28.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel32.d b/ld/testsuite/ld-crx/reloc-regrel32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel32.d
rename to ld/testsuite/ld-crx/reloc-regrel32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel32.s b/ld/testsuite/ld-crx/reloc-regrel32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-regrel32.s
rename to ld/testsuite/ld-crx/reloc-regrel32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel16.d b/ld/testsuite/ld-crx/reloc-rel16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel16.d
rename to ld/testsuite/ld-crx/reloc-rel16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel16.s b/ld/testsuite/ld-crx/reloc-rel16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel16.s
rename to ld/testsuite/ld-crx/reloc-rel16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel24.d b/ld/testsuite/ld-crx/reloc-rel24.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel24.d
rename to ld/testsuite/ld-crx/reloc-rel24.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel24.s b/ld/testsuite/ld-crx/reloc-rel24.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel24.s
rename to ld/testsuite/ld-crx/reloc-rel24.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel32.d b/ld/testsuite/ld-crx/reloc-rel32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel32.d
rename to ld/testsuite/ld-crx/reloc-rel32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel32.s b/ld/testsuite/ld-crx/reloc-rel32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel32.s
rename to ld/testsuite/ld-crx/reloc-rel32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel4.d b/ld/testsuite/ld-crx/reloc-rel4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel4.d
rename to ld/testsuite/ld-crx/reloc-rel4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel4.s b/ld/testsuite/ld-crx/reloc-rel4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel4.s
rename to ld/testsuite/ld-crx/reloc-rel4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8-cmp.d b/ld/testsuite/ld-crx/reloc-rel8-cmp.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8-cmp.d
rename to ld/testsuite/ld-crx/reloc-rel8-cmp.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8-cmp.s b/ld/testsuite/ld-crx/reloc-rel8-cmp.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8-cmp.s
rename to ld/testsuite/ld-crx/reloc-rel8-cmp.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8.d b/ld/testsuite/ld-crx/reloc-rel8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8.d
rename to ld/testsuite/ld-crx/reloc-rel8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8.s b/ld/testsuite/ld-crx/reloc-rel8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-crx/reloc-rel8.s
rename to ld/testsuite/ld-crx/reloc-rel8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cygwin/exe-export.exp b/ld/testsuite/ld-cygwin/exe-export.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cygwin/exe-export.exp
rename to ld/testsuite/ld-cygwin/exe-export.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cygwin/testdll.c b/ld/testsuite/ld-cygwin/testdll.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cygwin/testdll.c
rename to ld/testsuite/ld-cygwin/testdll.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cygwin/testdll.def b/ld/testsuite/ld-cygwin/testdll.def
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cygwin/testdll.def
rename to ld/testsuite/ld-cygwin/testdll.def
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cygwin/testexe.c b/ld/testsuite/ld-cygwin/testexe.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cygwin/testexe.c
rename to ld/testsuite/ld-cygwin/testexe.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-cygwin/testexe.def b/ld/testsuite/ld-cygwin/testexe.def
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-cygwin/testexe.def
rename to ld/testsuite/ld-cygwin/testexe.def
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/d10v.exp b/ld/testsuite/ld-d10v/d10v.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/d10v.exp
rename to ld/testsuite/ld-d10v/d10v.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/default_layout.d b/ld/testsuite/ld-d10v/default_layout.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/default_layout.d
rename to ld/testsuite/ld-d10v/default_layout.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/linktest-001.s b/ld/testsuite/ld-d10v/linktest-001.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/linktest-001.s
rename to ld/testsuite/ld-d10v/linktest-001.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/linktest-002.lt b/ld/testsuite/ld-d10v/linktest-002.lt
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/linktest-002.lt
rename to ld/testsuite/ld-d10v/linktest-002.lt
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/linktest-002.s b/ld/testsuite/ld-d10v/linktest-002.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/linktest-002.s
rename to ld/testsuite/ld-d10v/linktest-002.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/regression-001.lt b/ld/testsuite/ld-d10v/regression-001.lt
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/regression-001.lt
rename to ld/testsuite/ld-d10v/regression-001.lt
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/regression-001.s b/ld/testsuite/ld-d10v/regression-001.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/regression-001.s
rename to ld/testsuite/ld-d10v/regression-001.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-001.d b/ld/testsuite/ld-d10v/reloc-001.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-001.d
rename to ld/testsuite/ld-d10v/reloc-001.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-001.ld b/ld/testsuite/ld-d10v/reloc-001.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-001.ld
rename to ld/testsuite/ld-d10v/reloc-001.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-001.s b/ld/testsuite/ld-d10v/reloc-001.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-001.s
rename to ld/testsuite/ld-d10v/reloc-001.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-002.d b/ld/testsuite/ld-d10v/reloc-002.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-002.d
rename to ld/testsuite/ld-d10v/reloc-002.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-002.ld b/ld/testsuite/ld-d10v/reloc-002.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-002.ld
rename to ld/testsuite/ld-d10v/reloc-002.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-003.d b/ld/testsuite/ld-d10v/reloc-003.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-003.d
rename to ld/testsuite/ld-d10v/reloc-003.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-003.ld b/ld/testsuite/ld-d10v/reloc-003.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-003.ld
rename to ld/testsuite/ld-d10v/reloc-003.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-004.d b/ld/testsuite/ld-d10v/reloc-004.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-004.d
rename to ld/testsuite/ld-d10v/reloc-004.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-004.ld b/ld/testsuite/ld-d10v/reloc-004.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-004.ld
rename to ld/testsuite/ld-d10v/reloc-004.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-005.d b/ld/testsuite/ld-d10v/reloc-005.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-005.d
rename to ld/testsuite/ld-d10v/reloc-005.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-005.ld b/ld/testsuite/ld-d10v/reloc-005.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-005.ld
rename to ld/testsuite/ld-d10v/reloc-005.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-005.s b/ld/testsuite/ld-d10v/reloc-005.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-005.s
rename to ld/testsuite/ld-d10v/reloc-005.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-006.d b/ld/testsuite/ld-d10v/reloc-006.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-006.d
rename to ld/testsuite/ld-d10v/reloc-006.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-006.ld b/ld/testsuite/ld-d10v/reloc-006.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-006.ld
rename to ld/testsuite/ld-d10v/reloc-006.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-007.d b/ld/testsuite/ld-d10v/reloc-007.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-007.d
rename to ld/testsuite/ld-d10v/reloc-007.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-007.ld b/ld/testsuite/ld-d10v/reloc-007.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-007.ld
rename to ld/testsuite/ld-d10v/reloc-007.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-008.d b/ld/testsuite/ld-d10v/reloc-008.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-008.d
rename to ld/testsuite/ld-d10v/reloc-008.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-008.ld b/ld/testsuite/ld-d10v/reloc-008.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-008.ld
rename to ld/testsuite/ld-d10v/reloc-008.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-009.d b/ld/testsuite/ld-d10v/reloc-009.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-009.d
rename to ld/testsuite/ld-d10v/reloc-009.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-009.ld b/ld/testsuite/ld-d10v/reloc-009.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-009.ld
rename to ld/testsuite/ld-d10v/reloc-009.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-009.s b/ld/testsuite/ld-d10v/reloc-009.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-009.s
rename to ld/testsuite/ld-d10v/reloc-009.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-010.d b/ld/testsuite/ld-d10v/reloc-010.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-010.d
rename to ld/testsuite/ld-d10v/reloc-010.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-010.ld b/ld/testsuite/ld-d10v/reloc-010.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-010.ld
rename to ld/testsuite/ld-d10v/reloc-010.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-011.d b/ld/testsuite/ld-d10v/reloc-011.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-011.d
rename to ld/testsuite/ld-d10v/reloc-011.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-011.ld b/ld/testsuite/ld-d10v/reloc-011.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-011.ld
rename to ld/testsuite/ld-d10v/reloc-011.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-012.d b/ld/testsuite/ld-d10v/reloc-012.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-012.d
rename to ld/testsuite/ld-d10v/reloc-012.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-012.ld b/ld/testsuite/ld-d10v/reloc-012.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-012.ld
rename to ld/testsuite/ld-d10v/reloc-012.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-013.d b/ld/testsuite/ld-d10v/reloc-013.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-013.d
rename to ld/testsuite/ld-d10v/reloc-013.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-013.ld b/ld/testsuite/ld-d10v/reloc-013.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-013.ld
rename to ld/testsuite/ld-d10v/reloc-013.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-014.d b/ld/testsuite/ld-d10v/reloc-014.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-014.d
rename to ld/testsuite/ld-d10v/reloc-014.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-014.ld b/ld/testsuite/ld-d10v/reloc-014.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-014.ld
rename to ld/testsuite/ld-d10v/reloc-014.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-015.d b/ld/testsuite/ld-d10v/reloc-015.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-015.d
rename to ld/testsuite/ld-d10v/reloc-015.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-015.ld b/ld/testsuite/ld-d10v/reloc-015.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-015.ld
rename to ld/testsuite/ld-d10v/reloc-015.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-016.d b/ld/testsuite/ld-d10v/reloc-016.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-016.d
rename to ld/testsuite/ld-d10v/reloc-016.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-016.ld b/ld/testsuite/ld-d10v/reloc-016.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/reloc-016.ld
rename to ld/testsuite/ld-d10v/reloc-016.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-d10v/simple.s b/ld/testsuite/ld-d10v/simple.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-d10v/simple.s
rename to ld/testsuite/ld-d10v/simple.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/discard.exp b/ld/testsuite/ld-discard/discard.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/discard.exp
rename to ld/testsuite/ld-discard/discard.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/discard.ld b/ld/testsuite/ld-discard/discard.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/discard.ld
rename to ld/testsuite/ld-discard/discard.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/exit.s b/ld/testsuite/ld-discard/exit.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/exit.s
rename to ld/testsuite/ld-discard/exit.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/extern.d b/ld/testsuite/ld-discard/extern.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/extern.d
rename to ld/testsuite/ld-discard/extern.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/extern.s b/ld/testsuite/ld-discard/extern.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/extern.s
rename to ld/testsuite/ld-discard/extern.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/start.d b/ld/testsuite/ld-discard/start.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/start.d
rename to ld/testsuite/ld-discard/start.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/start.s b/ld/testsuite/ld-discard/start.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/start.s
rename to ld/testsuite/ld-discard/start.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/static.d b/ld/testsuite/ld-discard/static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/static.d
rename to ld/testsuite/ld-discard/static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/static.s b/ld/testsuite/ld-discard/static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/static.s
rename to ld/testsuite/ld-discard/static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/zero-range.d b/ld/testsuite/ld-discard/zero-range.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/zero-range.d
rename to ld/testsuite/ld-discard/zero-range.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/zero-range.s b/ld/testsuite/ld-discard/zero-range.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/zero-range.s
rename to ld/testsuite/ld-discard/zero-range.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/zero-rel.d b/ld/testsuite/ld-discard/zero-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/zero-rel.d
rename to ld/testsuite/ld-discard/zero-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-discard/zero-rel.s b/ld/testsuite/ld-discard/zero-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-discard/zero-rel.s
rename to ld/testsuite/ld-discard/zero-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/audit.exp b/ld/testsuite/ld-elf/audit.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/audit.exp
rename to ld/testsuite/ld-elf/audit.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/audit.rd b/ld/testsuite/ld-elf/audit.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/audit.rd
rename to ld/testsuite/ld-elf/audit.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/begin.c b/ld/testsuite/ld-elf/begin.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/begin.c
rename to ld/testsuite/ld-elf/begin.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/beginwarn.c b/ld/testsuite/ld-elf/beginwarn.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/beginwarn.c
rename to ld/testsuite/ld-elf/beginwarn.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/binutils.exp
rename to ld/testsuite/ld-elf/binutils.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/comm1.c b/ld/testsuite/ld-elf/comm1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/comm1.c
rename to ld/testsuite/ld-elf/comm1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/commonpage1.d b/ld/testsuite/ld-elf/commonpage1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/commonpage1.d
rename to ld/testsuite/ld-elf/commonpage1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/commonpage2.d b/ld/testsuite/ld-elf/commonpage2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/commonpage2.d
rename to ld/testsuite/ld-elf/commonpage2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/compress.exp b/ld/testsuite/ld-elf/compress.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/compress.exp
rename to ld/testsuite/ld-elf/compress.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/compress1.s b/ld/testsuite/ld-elf/compress1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/compress1.s
rename to ld/testsuite/ld-elf/compress1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/compress1a.d b/ld/testsuite/ld-elf/compress1a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/compress1a.d
rename to ld/testsuite/ld-elf/compress1a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/compress1b.d b/ld/testsuite/ld-elf/compress1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/compress1b.d
rename to ld/testsuite/ld-elf/compress1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/compress1c.d b/ld/testsuite/ld-elf/compress1c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/compress1c.d
rename to ld/testsuite/ld-elf/compress1c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/data1.c b/ld/testsuite/ld-elf/data1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/data1.c
rename to ld/testsuite/ld-elf/data1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/data1.h b/ld/testsuite/ld-elf/data1.h
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/data1.h
rename to ld/testsuite/ld-elf/data1.h
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/del.cc b/ld/testsuite/ld-elf/del.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/del.cc
rename to ld/testsuite/ld-elf/del.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/depaudit.rd b/ld/testsuite/ld-elf/depaudit.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/depaudit.rd
rename to ld/testsuite/ld-elf/depaudit.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/depaudit2.rd b/ld/testsuite/ld-elf/depaudit2.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/depaudit2.rd
rename to ld/testsuite/ld-elf/depaudit2.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/discard.ld b/ld/testsuite/ld-elf/discard.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/discard.ld
rename to ld/testsuite/ld-elf/discard.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/discard1.d b/ld/testsuite/ld-elf/discard1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/discard1.d
rename to ld/testsuite/ld-elf/discard1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/discard1.s b/ld/testsuite/ld-elf/discard1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/discard1.s
rename to ld/testsuite/ld-elf/discard1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/discard2.d b/ld/testsuite/ld-elf/discard2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/discard2.d
rename to ld/testsuite/ld-elf/discard2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/discard2.s b/ld/testsuite/ld-elf/discard2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/discard2.s
rename to ld/testsuite/ld-elf/discard2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/discard3.d b/ld/testsuite/ld-elf/discard3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/discard3.d
rename to ld/testsuite/ld-elf/discard3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl1.c b/ld/testsuite/ld-elf/dl1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl1.c
rename to ld/testsuite/ld-elf/dl1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl1.list b/ld/testsuite/ld-elf/dl1.list
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl1.list
rename to ld/testsuite/ld-elf/dl1.list
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl1.out b/ld/testsuite/ld-elf/dl1.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl1.out
rename to ld/testsuite/ld-elf/dl1.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl1main.c b/ld/testsuite/ld-elf/dl1main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl1main.c
rename to ld/testsuite/ld-elf/dl1main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2.c b/ld/testsuite/ld-elf/dl2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2.c
rename to ld/testsuite/ld-elf/dl2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2.list b/ld/testsuite/ld-elf/dl2.list
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2.list
rename to ld/testsuite/ld-elf/dl2.list
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2a.list b/ld/testsuite/ld-elf/dl2a.list
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2a.list
rename to ld/testsuite/ld-elf/dl2a.list
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2a.out b/ld/testsuite/ld-elf/dl2a.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2a.out
rename to ld/testsuite/ld-elf/dl2a.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2b.out b/ld/testsuite/ld-elf/dl2b.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2b.out
rename to ld/testsuite/ld-elf/dl2b.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2main.c b/ld/testsuite/ld-elf/dl2main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2main.c
rename to ld/testsuite/ld-elf/dl2main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2xxx.c b/ld/testsuite/ld-elf/dl2xxx.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2xxx.c
rename to ld/testsuite/ld-elf/dl2xxx.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl2xxx.list b/ld/testsuite/ld-elf/dl2xxx.list
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl2xxx.list
rename to ld/testsuite/ld-elf/dl2xxx.list
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl3.cc b/ld/testsuite/ld-elf/dl3.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl3.cc
rename to ld/testsuite/ld-elf/dl3.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl3.list b/ld/testsuite/ld-elf/dl3.list
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl3.list
rename to ld/testsuite/ld-elf/dl3.list
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl3a.out b/ld/testsuite/ld-elf/dl3a.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl3a.out
rename to ld/testsuite/ld-elf/dl3a.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl3b.out b/ld/testsuite/ld-elf/dl3b.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl3b.out
rename to ld/testsuite/ld-elf/dl3b.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl3header.h b/ld/testsuite/ld-elf/dl3header.h
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl3header.h
rename to ld/testsuite/ld-elf/dl3header.h
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl3main.cc b/ld/testsuite/ld-elf/dl3main.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl3main.cc
rename to ld/testsuite/ld-elf/dl3main.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl4.c b/ld/testsuite/ld-elf/dl4.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl4.c
rename to ld/testsuite/ld-elf/dl4.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl4.list b/ld/testsuite/ld-elf/dl4.list
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl4.list
rename to ld/testsuite/ld-elf/dl4.list
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl4a.out b/ld/testsuite/ld-elf/dl4a.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl4a.out
rename to ld/testsuite/ld-elf/dl4a.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl4b.out b/ld/testsuite/ld-elf/dl4b.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl4b.out
rename to ld/testsuite/ld-elf/dl4b.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl4main.c b/ld/testsuite/ld-elf/dl4main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl4main.c
rename to ld/testsuite/ld-elf/dl4main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl4xxx.c b/ld/testsuite/ld-elf/dl4xxx.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl4xxx.c
rename to ld/testsuite/ld-elf/dl4xxx.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl4xxx.list b/ld/testsuite/ld-elf/dl4xxx.list
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl4xxx.list
rename to ld/testsuite/ld-elf/dl4xxx.list
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl5.cc b/ld/testsuite/ld-elf/dl5.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl5.cc
rename to ld/testsuite/ld-elf/dl5.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl5.out b/ld/testsuite/ld-elf/dl5.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl5.out
rename to ld/testsuite/ld-elf/dl5.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl6.c b/ld/testsuite/ld-elf/dl6.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl6.c
rename to ld/testsuite/ld-elf/dl6.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl6a.out b/ld/testsuite/ld-elf/dl6a.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl6a.out
rename to ld/testsuite/ld-elf/dl6a.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl6amain.c b/ld/testsuite/ld-elf/dl6amain.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl6amain.c
rename to ld/testsuite/ld-elf/dl6amain.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl6b.out b/ld/testsuite/ld-elf/dl6b.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl6b.out
rename to ld/testsuite/ld-elf/dl6b.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl6bmain.c b/ld/testsuite/ld-elf/dl6bmain.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl6bmain.c
rename to ld/testsuite/ld-elf/dl6bmain.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl6cmain.c b/ld/testsuite/ld-elf/dl6cmain.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl6cmain.c
rename to ld/testsuite/ld-elf/dl6cmain.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dl6dmain.c b/ld/testsuite/ld-elf/dl6dmain.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dl6dmain.c
rename to ld/testsuite/ld-elf/dl6dmain.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dummy.c b/ld/testsuite/ld-elf/dummy.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dummy.c
rename to ld/testsuite/ld-elf/dummy.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf.exp b/ld/testsuite/ld-elf/dwarf.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf.exp
rename to ld/testsuite/ld-elf/dwarf.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1.c b/ld/testsuite/ld-elf/dwarf1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1.c
rename to ld/testsuite/ld-elf/dwarf1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1.h b/ld/testsuite/ld-elf/dwarf1.h
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1.h
rename to ld/testsuite/ld-elf/dwarf1.h
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1.out b/ld/testsuite/ld-elf/dwarf1.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1.out
rename to ld/testsuite/ld-elf/dwarf1.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1main.c b/ld/testsuite/ld-elf/dwarf1main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dwarf1main.c
rename to ld/testsuite/ld-elf/dwarf1main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dynbss1.c b/ld/testsuite/ld-elf/dynbss1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dynbss1.c
rename to ld/testsuite/ld-elf/dynbss1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/dynsym1.d b/ld/testsuite/ld-elf/dynsym1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/dynsym1.d
rename to ld/testsuite/ld-elf/dynsym1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh-frame-hdr.d b/ld/testsuite/ld-elf/eh-frame-hdr.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh-frame-hdr.d
rename to ld/testsuite/ld-elf/eh-frame-hdr.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh-frame-hdr.s b/ld/testsuite/ld-elf/eh-frame-hdr.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh-frame-hdr.s
rename to ld/testsuite/ld-elf/eh-frame-hdr.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh-group.exp b/ld/testsuite/ld-elf/eh-group.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh-group.exp
rename to ld/testsuite/ld-elf/eh-group.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh-group1.s b/ld/testsuite/ld-elf/eh-group1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh-group1.s
rename to ld/testsuite/ld-elf/eh-group1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh-group2.s b/ld/testsuite/ld-elf/eh-group2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh-group2.s
rename to ld/testsuite/ld-elf/eh-group2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh1.d b/ld/testsuite/ld-elf/eh1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh1.d
rename to ld/testsuite/ld-elf/eh1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh1.s b/ld/testsuite/ld-elf/eh1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh1.s
rename to ld/testsuite/ld-elf/eh1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh1a.s b/ld/testsuite/ld-elf/eh1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh1a.s
rename to ld/testsuite/ld-elf/eh1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh2.d b/ld/testsuite/ld-elf/eh2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh2.d
rename to ld/testsuite/ld-elf/eh2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh2a.s b/ld/testsuite/ld-elf/eh2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh2a.s
rename to ld/testsuite/ld-elf/eh2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh3.d b/ld/testsuite/ld-elf/eh3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh3.d
rename to ld/testsuite/ld-elf/eh3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh3.s b/ld/testsuite/ld-elf/eh3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh3.s
rename to ld/testsuite/ld-elf/eh3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh3a.s b/ld/testsuite/ld-elf/eh3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh3a.s
rename to ld/testsuite/ld-elf/eh3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh4.d b/ld/testsuite/ld-elf/eh4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh4.d
rename to ld/testsuite/ld-elf/eh4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh4.s b/ld/testsuite/ld-elf/eh4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh4.s
rename to ld/testsuite/ld-elf/eh4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh4a.s b/ld/testsuite/ld-elf/eh4a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh4a.s
rename to ld/testsuite/ld-elf/eh4a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh5.d b/ld/testsuite/ld-elf/eh5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh5.d
rename to ld/testsuite/ld-elf/eh5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh5.s b/ld/testsuite/ld-elf/eh5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh5.s
rename to ld/testsuite/ld-elf/eh5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh5a.s b/ld/testsuite/ld-elf/eh5a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh5a.s
rename to ld/testsuite/ld-elf/eh5a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh5b.s b/ld/testsuite/ld-elf/eh5b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh5b.s
rename to ld/testsuite/ld-elf/eh5b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh6.d b/ld/testsuite/ld-elf/eh6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh6.d
rename to ld/testsuite/ld-elf/eh6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/eh6.s b/ld/testsuite/ld-elf/eh6.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/eh6.s
rename to ld/testsuite/ld-elf/eh6.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/elf.exp
rename to ld/testsuite/ld-elf/elf.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/empty.d b/ld/testsuite/ld-elf/empty.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/empty.d
rename to ld/testsuite/ld-elf/empty.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/empty.s b/ld/testsuite/ld-elf/empty.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/empty.s
rename to ld/testsuite/ld-elf/empty.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/empty2.d b/ld/testsuite/ld-elf/empty2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/empty2.d
rename to ld/testsuite/ld-elf/empty2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/empty2.s b/ld/testsuite/ld-elf/empty2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/empty2.s
rename to ld/testsuite/ld-elf/empty2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/end.c b/ld/testsuite/ld-elf/end.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/end.c
rename to ld/testsuite/ld-elf/end.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/endhidden.c b/ld/testsuite/ld-elf/endhidden.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/endhidden.c
rename to ld/testsuite/ld-elf/endhidden.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/endprotected.c b/ld/testsuite/ld-elf/endprotected.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/endprotected.c
rename to ld/testsuite/ld-elf/endprotected.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude.exp b/ld/testsuite/ld-elf/exclude.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude.exp
rename to ld/testsuite/ld-elf/exclude.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude1.s b/ld/testsuite/ld-elf/exclude1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude1.s
rename to ld/testsuite/ld-elf/exclude1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude2.s b/ld/testsuite/ld-elf/exclude2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude2.s
rename to ld/testsuite/ld-elf/exclude2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3.s b/ld/testsuite/ld-elf/exclude3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3.s
rename to ld/testsuite/ld-elf/exclude3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3a.d b/ld/testsuite/ld-elf/exclude3a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3a.d
rename to ld/testsuite/ld-elf/exclude3a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3b.d b/ld/testsuite/ld-elf/exclude3b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3b.d
rename to ld/testsuite/ld-elf/exclude3b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3c.d b/ld/testsuite/ld-elf/exclude3c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3c.d
rename to ld/testsuite/ld-elf/exclude3c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3d.d b/ld/testsuite/ld-elf/exclude3d.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/exclude3d.d
rename to ld/testsuite/ld-elf/exclude3d.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/expr1.d b/ld/testsuite/ld-elf/expr1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/expr1.d
rename to ld/testsuite/ld-elf/expr1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/expr1.s b/ld/testsuite/ld-elf/expr1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/expr1.s
rename to ld/testsuite/ld-elf/expr1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/expr1.t b/ld/testsuite/ld-elf/expr1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/expr1.t
rename to ld/testsuite/ld-elf/expr1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1.ld b/ld/testsuite/ld-elf/extract-symbol-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1.ld
rename to ld/testsuite/ld-elf/extract-symbol-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1.s b/ld/testsuite/ld-elf/extract-symbol-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1.s
rename to ld/testsuite/ld-elf/extract-symbol-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1sec.d b/ld/testsuite/ld-elf/extract-symbol-1sec.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1sec.d
rename to ld/testsuite/ld-elf/extract-symbol-1sec.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1sym.d b/ld/testsuite/ld-elf/extract-symbol-1sym.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/extract-symbol-1sym.d
rename to ld/testsuite/ld-elf/extract-symbol-1sym.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/fini.c b/ld/testsuite/ld-elf/fini.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/fini.c
rename to ld/testsuite/ld-elf/fini.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/fini.out b/ld/testsuite/ld-elf/fini.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/fini.out
rename to ld/testsuite/ld-elf/fini.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/flags1.d b/ld/testsuite/ld-elf/flags1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/flags1.d
rename to ld/testsuite/ld-elf/flags1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/flags1.ld b/ld/testsuite/ld-elf/flags1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/flags1.ld
rename to ld/testsuite/ld-elf/flags1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/flags1.s b/ld/testsuite/ld-elf/flags1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/flags1.s
rename to ld/testsuite/ld-elf/flags1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/foo.c b/ld/testsuite/ld-elf/foo.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/foo.c
rename to ld/testsuite/ld-elf/foo.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/foo.map b/ld/testsuite/ld-elf/foo.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/foo.map
rename to ld/testsuite/ld-elf/foo.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/frame.exp b/ld/testsuite/ld-elf/frame.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/frame.exp
rename to ld/testsuite/ld-elf/frame.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/frame.s b/ld/testsuite/ld-elf/frame.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/frame.s
rename to ld/testsuite/ld-elf/frame.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/func1.c b/ld/testsuite/ld-elf/func1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/func1.c
rename to ld/testsuite/ld-elf/func1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group.ld b/ld/testsuite/ld-elf/group.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group.ld
rename to ld/testsuite/ld-elf/group.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group1.d b/ld/testsuite/ld-elf/group1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group1.d
rename to ld/testsuite/ld-elf/group1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group10.d b/ld/testsuite/ld-elf/group10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group10.d
rename to ld/testsuite/ld-elf/group10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group10.s b/ld/testsuite/ld-elf/group10.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group10.s
rename to ld/testsuite/ld-elf/group10.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group1a.s b/ld/testsuite/ld-elf/group1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group1a.s
rename to ld/testsuite/ld-elf/group1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group1b.s b/ld/testsuite/ld-elf/group1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group1b.s
rename to ld/testsuite/ld-elf/group1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group2.d b/ld/testsuite/ld-elf/group2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group2.d
rename to ld/testsuite/ld-elf/group2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group3a.d b/ld/testsuite/ld-elf/group3a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group3a.d
rename to ld/testsuite/ld-elf/group3a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group3a.s b/ld/testsuite/ld-elf/group3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group3a.s
rename to ld/testsuite/ld-elf/group3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group3b.d b/ld/testsuite/ld-elf/group3b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group3b.d
rename to ld/testsuite/ld-elf/group3b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group3b.s b/ld/testsuite/ld-elf/group3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group3b.s
rename to ld/testsuite/ld-elf/group3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group4.d b/ld/testsuite/ld-elf/group4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group4.d
rename to ld/testsuite/ld-elf/group4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group5.d b/ld/testsuite/ld-elf/group5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group5.d
rename to ld/testsuite/ld-elf/group5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group6.d b/ld/testsuite/ld-elf/group6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group6.d
rename to ld/testsuite/ld-elf/group6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group7.d b/ld/testsuite/ld-elf/group7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group7.d
rename to ld/testsuite/ld-elf/group7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group8.s b/ld/testsuite/ld-elf/group8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group8.s
rename to ld/testsuite/ld-elf/group8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group8a.d b/ld/testsuite/ld-elf/group8a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group8a.d
rename to ld/testsuite/ld-elf/group8a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group8b.d b/ld/testsuite/ld-elf/group8b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group8b.d
rename to ld/testsuite/ld-elf/group8b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group9.s b/ld/testsuite/ld-elf/group9.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group9.s
rename to ld/testsuite/ld-elf/group9.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group9a.d b/ld/testsuite/ld-elf/group9a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group9a.d
rename to ld/testsuite/ld-elf/group9a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/group9b.d b/ld/testsuite/ld-elf/group9b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/group9b.d
rename to ld/testsuite/ld-elf/group9b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/hash.d b/ld/testsuite/ld-elf/hash.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/hash.d
rename to ld/testsuite/ld-elf/hash.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/header.d b/ld/testsuite/ld-elf/header.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/header.d
rename to ld/testsuite/ld-elf/header.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/header.s b/ld/testsuite/ld-elf/header.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/header.s
rename to ld/testsuite/ld-elf/header.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/header.t b/ld/testsuite/ld-elf/header.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/header.t
rename to ld/testsuite/ld-elf/header.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/hidden.out b/ld/testsuite/ld-elf/hidden.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/hidden.out
rename to ld/testsuite/ld-elf/hidden.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/init-fini-arrays.d b/ld/testsuite/ld-elf/init-fini-arrays.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/init-fini-arrays.d
rename to ld/testsuite/ld-elf/init-fini-arrays.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/init-fini-arrays.s b/ld/testsuite/ld-elf/init-fini-arrays.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/init-fini-arrays.s
rename to ld/testsuite/ld-elf/init-fini-arrays.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/init.c b/ld/testsuite/ld-elf/init.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/init.c
rename to ld/testsuite/ld-elf/init.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/init.out b/ld/testsuite/ld-elf/init.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/init.out
rename to ld/testsuite/ld-elf/init.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce1.d b/ld/testsuite/ld-elf/linkonce1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce1.d
rename to ld/testsuite/ld-elf/linkonce1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce1a.s b/ld/testsuite/ld-elf/linkonce1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce1a.s
rename to ld/testsuite/ld-elf/linkonce1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce1b.s b/ld/testsuite/ld-elf/linkonce1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce1b.s
rename to ld/testsuite/ld-elf/linkonce1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce2.d b/ld/testsuite/ld-elf/linkonce2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/linkonce2.d
rename to ld/testsuite/ld-elf/linkonce2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/linkoncerdiff.d b/ld/testsuite/ld-elf/linkoncerdiff.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/linkoncerdiff.d
rename to ld/testsuite/ld-elf/linkoncerdiff.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/linkoncerdiff1.s b/ld/testsuite/ld-elf/linkoncerdiff1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/linkoncerdiff1.s
rename to ld/testsuite/ld-elf/linkoncerdiff1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/linkoncerdiff2.s b/ld/testsuite/ld-elf/linkoncerdiff2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/linkoncerdiff2.s
rename to ld/testsuite/ld-elf/linkoncerdiff2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/lma.lnk b/ld/testsuite/ld-elf/lma.lnk
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/lma.lnk
rename to ld/testsuite/ld-elf/lma.lnk
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/lma.s b/ld/testsuite/ld-elf/lma.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/lma.s
rename to ld/testsuite/ld-elf/lma.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr.s b/ld/testsuite/ld-elf/loadaddr.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr.s
rename to ld/testsuite/ld-elf/loadaddr.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr.t b/ld/testsuite/ld-elf/loadaddr.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr.t
rename to ld/testsuite/ld-elf/loadaddr.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr1.d b/ld/testsuite/ld-elf/loadaddr1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr1.d
rename to ld/testsuite/ld-elf/loadaddr1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr1.t b/ld/testsuite/ld-elf/loadaddr1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr1.t
rename to ld/testsuite/ld-elf/loadaddr1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr2.d b/ld/testsuite/ld-elf/loadaddr2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr2.d
rename to ld/testsuite/ld-elf/loadaddr2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr2.t b/ld/testsuite/ld-elf/loadaddr2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr2.t
rename to ld/testsuite/ld-elf/loadaddr2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr3.t b/ld/testsuite/ld-elf/loadaddr3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr3.t
rename to ld/testsuite/ld-elf/loadaddr3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr3a.d b/ld/testsuite/ld-elf/loadaddr3a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr3a.d
rename to ld/testsuite/ld-elf/loadaddr3a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr3b.d b/ld/testsuite/ld-elf/loadaddr3b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/loadaddr3b.d
rename to ld/testsuite/ld-elf/loadaddr3b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/local1.d b/ld/testsuite/ld-elf/local1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/local1.d
rename to ld/testsuite/ld-elf/local1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/local1.map b/ld/testsuite/ld-elf/local1.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/local1.map
rename to ld/testsuite/ld-elf/local1.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/local1.s b/ld/testsuite/ld-elf/local1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/local1.s
rename to ld/testsuite/ld-elf/local1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/main.c b/ld/testsuite/ld-elf/main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/main.c
rename to ld/testsuite/ld-elf/main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage1.d b/ld/testsuite/ld-elf/maxpage1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage1.d
rename to ld/testsuite/ld-elf/maxpage1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage1.s b/ld/testsuite/ld-elf/maxpage1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage1.s
rename to ld/testsuite/ld-elf/maxpage1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage2.d b/ld/testsuite/ld-elf/maxpage2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage2.d
rename to ld/testsuite/ld-elf/maxpage2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3.t b/ld/testsuite/ld-elf/maxpage3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3.t
rename to ld/testsuite/ld-elf/maxpage3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3a.d b/ld/testsuite/ld-elf/maxpage3a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3a.d
rename to ld/testsuite/ld-elf/maxpage3a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3b.d b/ld/testsuite/ld-elf/maxpage3b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3b.d
rename to ld/testsuite/ld-elf/maxpage3b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3c.d b/ld/testsuite/ld-elf/maxpage3c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage3c.d
rename to ld/testsuite/ld-elf/maxpage3c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage4.d b/ld/testsuite/ld-elf/maxpage4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage4.d
rename to ld/testsuite/ld-elf/maxpage4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage4.t b/ld/testsuite/ld-elf/maxpage4.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/maxpage4.t
rename to ld/testsuite/ld-elf/maxpage4.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/merge.d b/ld/testsuite/ld-elf/merge.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/merge.d
rename to ld/testsuite/ld-elf/merge.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/merge.ld b/ld/testsuite/ld-elf/merge.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/merge.ld
rename to ld/testsuite/ld-elf/merge.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/merge.s b/ld/testsuite/ld-elf/merge.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/merge.s
rename to ld/testsuite/ld-elf/merge.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/merge2.d b/ld/testsuite/ld-elf/merge2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/merge2.d
rename to ld/testsuite/ld-elf/merge2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/merge2.s b/ld/testsuite/ld-elf/merge2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/merge2.s
rename to ld/testsuite/ld-elf/merge2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/multibss1.d b/ld/testsuite/ld-elf/multibss1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/multibss1.d
rename to ld/testsuite/ld-elf/multibss1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/multibss1.s b/ld/testsuite/ld-elf/multibss1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/multibss1.s
rename to ld/testsuite/ld-elf/multibss1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/new.cc b/ld/testsuite/ld-elf/new.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/new.cc
rename to ld/testsuite/ld-elf/new.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/nobits-1.d b/ld/testsuite/ld-elf/nobits-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/nobits-1.d
rename to ld/testsuite/ld-elf/nobits-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/nobits-1.s b/ld/testsuite/ld-elf/nobits-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/nobits-1.s
rename to ld/testsuite/ld-elf/nobits-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/nobits-1.t b/ld/testsuite/ld-elf/nobits-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/nobits-1.t
rename to ld/testsuite/ld-elf/nobits-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/noload-1.d b/ld/testsuite/ld-elf/noload-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/noload-1.d
rename to ld/testsuite/ld-elf/noload-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/noload-1.s b/ld/testsuite/ld-elf/noload-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/noload-1.s
rename to ld/testsuite/ld-elf/noload-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/noload-1.t b/ld/testsuite/ld-elf/noload-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/noload-1.t
rename to ld/testsuite/ld-elf/noload-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/noload-2.d b/ld/testsuite/ld-elf/noload-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/noload-2.d
rename to ld/testsuite/ld-elf/noload-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/noload-3.d b/ld/testsuite/ld-elf/noload-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/noload-3.d
rename to ld/testsuite/ld-elf/noload-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/noload-3.s b/ld/testsuite/ld-elf/noload-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/noload-3.s
rename to ld/testsuite/ld-elf/noload-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/noload-3.t b/ld/testsuite/ld-elf/noload-3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/noload-3.t
rename to ld/testsuite/ld-elf/noload-3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/normal.out b/ld/testsuite/ld-elf/normal.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/normal.out
rename to ld/testsuite/ld-elf/normal.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/note-1.d b/ld/testsuite/ld-elf/note-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/note-1.d
rename to ld/testsuite/ld-elf/note-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/note-1.s b/ld/testsuite/ld-elf/note-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/note-1.s
rename to ld/testsuite/ld-elf/note-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/note-1.t b/ld/testsuite/ld-elf/note-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/note-1.t
rename to ld/testsuite/ld-elf/note-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/note-2.d b/ld/testsuite/ld-elf/note-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/note-2.d
rename to ld/testsuite/ld-elf/note-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/note-2.s b/ld/testsuite/ld-elf/note-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/note-2.s
rename to ld/testsuite/ld-elf/note-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/note-2.t b/ld/testsuite/ld-elf/note-2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/note-2.t
rename to ld/testsuite/ld-elf/note-2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan-region.d b/ld/testsuite/ld-elf/orphan-region.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan-region.d
rename to ld/testsuite/ld-elf/orphan-region.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan-region.ld b/ld/testsuite/ld-elf/orphan-region.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan-region.ld
rename to ld/testsuite/ld-elf/orphan-region.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan-region.s b/ld/testsuite/ld-elf/orphan-region.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan-region.s
rename to ld/testsuite/ld-elf/orphan-region.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan.d b/ld/testsuite/ld-elf/orphan.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan.d
rename to ld/testsuite/ld-elf/orphan.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan.ld b/ld/testsuite/ld-elf/orphan.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan.ld
rename to ld/testsuite/ld-elf/orphan.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan.s b/ld/testsuite/ld-elf/orphan.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan.s
rename to ld/testsuite/ld-elf/orphan.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan2.d b/ld/testsuite/ld-elf/orphan2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan2.d
rename to ld/testsuite/ld-elf/orphan2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan2.s b/ld/testsuite/ld-elf/orphan2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan2.s
rename to ld/testsuite/ld-elf/orphan2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3.d b/ld/testsuite/ld-elf/orphan3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3.d
rename to ld/testsuite/ld-elf/orphan3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3a.s b/ld/testsuite/ld-elf/orphan3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3a.s
rename to ld/testsuite/ld-elf/orphan3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3b.s b/ld/testsuite/ld-elf/orphan3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3b.s
rename to ld/testsuite/ld-elf/orphan3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3c.s b/ld/testsuite/ld-elf/orphan3c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3c.s
rename to ld/testsuite/ld-elf/orphan3c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3d.s b/ld/testsuite/ld-elf/orphan3d.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3d.s
rename to ld/testsuite/ld-elf/orphan3d.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3e.s b/ld/testsuite/ld-elf/orphan3e.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3e.s
rename to ld/testsuite/ld-elf/orphan3e.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3f.s b/ld/testsuite/ld-elf/orphan3f.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan3f.s
rename to ld/testsuite/ld-elf/orphan3f.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan4.d b/ld/testsuite/ld-elf/orphan4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan4.d
rename to ld/testsuite/ld-elf/orphan4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan4.ld b/ld/testsuite/ld-elf/orphan4.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan4.ld
rename to ld/testsuite/ld-elf/orphan4.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/orphan4.s b/ld/testsuite/ld-elf/orphan4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/orphan4.s
rename to ld/testsuite/ld-elf/orphan4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/overlay.d b/ld/testsuite/ld-elf/overlay.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/overlay.d
rename to ld/testsuite/ld-elf/overlay.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/overlay.s b/ld/testsuite/ld-elf/overlay.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/overlay.s
rename to ld/testsuite/ld-elf/overlay.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/overlay.t b/ld/testsuite/ld-elf/overlay.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/overlay.t
rename to ld/testsuite/ld-elf/overlay.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pass.out b/ld/testsuite/ld-elf/pass.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pass.out
rename to ld/testsuite/ld-elf/pass.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-1.c b/ld/testsuite/ld-elf/pr11138-1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-1.c
rename to ld/testsuite/ld-elf/pr11138-1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-1.map b/ld/testsuite/ld-elf/pr11138-1.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-1.map
rename to ld/testsuite/ld-elf/pr11138-1.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-2.c b/ld/testsuite/ld-elf/pr11138-2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-2.c
rename to ld/testsuite/ld-elf/pr11138-2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-2.map b/ld/testsuite/ld-elf/pr11138-2.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138-2.map
rename to ld/testsuite/ld-elf/pr11138-2.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138.out b/ld/testsuite/ld-elf/pr11138.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11138.out
rename to ld/testsuite/ld-elf/pr11138.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11304.d b/ld/testsuite/ld-elf/pr11304.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11304.d
rename to ld/testsuite/ld-elf/pr11304.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11304a.s b/ld/testsuite/ld-elf/pr11304a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11304a.s
rename to ld/testsuite/ld-elf/pr11304a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr11304b.s b/ld/testsuite/ld-elf/pr11304b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr11304b.s
rename to ld/testsuite/ld-elf/pr11304b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr13177.d b/ld/testsuite/ld-elf/pr13177.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr13177.d
rename to ld/testsuite/ld-elf/pr13177.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr13177.s b/ld/testsuite/ld-elf/pr13177.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr13177.s
rename to ld/testsuite/ld-elf/pr13177.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr349-1.s b/ld/testsuite/ld-elf/pr349-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr349-1.s
rename to ld/testsuite/ld-elf/pr349-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr349-2.s b/ld/testsuite/ld-elf/pr349-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr349-2.s
rename to ld/testsuite/ld-elf/pr349-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr349.d b/ld/testsuite/ld-elf/pr349.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr349.d
rename to ld/testsuite/ld-elf/pr349.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-1.c b/ld/testsuite/ld-elf/pr9676-1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-1.c
rename to ld/testsuite/ld-elf/pr9676-1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-2.c b/ld/testsuite/ld-elf/pr9676-2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-2.c
rename to ld/testsuite/ld-elf/pr9676-2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-3.c b/ld/testsuite/ld-elf/pr9676-3.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-3.c
rename to ld/testsuite/ld-elf/pr9676-3.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-4.c b/ld/testsuite/ld-elf/pr9676-4.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676-4.c
rename to ld/testsuite/ld-elf/pr9676-4.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676.rd b/ld/testsuite/ld-elf/pr9676.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9676.rd
rename to ld/testsuite/ld-elf/pr9676.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9679-1.c b/ld/testsuite/ld-elf/pr9679-1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9679-1.c
rename to ld/testsuite/ld-elf/pr9679-1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9679-2.c b/ld/testsuite/ld-elf/pr9679-2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9679-2.c
rename to ld/testsuite/ld-elf/pr9679-2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/pr9679.rd b/ld/testsuite/ld-elf/pr9679.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/pr9679.rd
rename to ld/testsuite/ld-elf/pr9679.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/preinit.c b/ld/testsuite/ld-elf/preinit.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/preinit.c
rename to ld/testsuite/ld-elf/preinit.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/preinit.out b/ld/testsuite/ld-elf/preinit.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/preinit.out
rename to ld/testsuite/ld-elf/preinit.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/relocatable.d b/ld/testsuite/ld-elf/relocatable.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/relocatable.d
rename to ld/testsuite/ld-elf/relocatable.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/relocatable.t b/ld/testsuite/ld-elf/relocatable.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/relocatable.t
rename to ld/testsuite/ld-elf/relocatable.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/relro1.s b/ld/testsuite/ld-elf/relro1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/relro1.s
rename to ld/testsuite/ld-elf/relro1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/relro2.s b/ld/testsuite/ld-elf/relro2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/relro2.s
rename to ld/testsuite/ld-elf/relro2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg-script-adjoining-pages.t b/ld/testsuite/ld-elf/sec-to-seg-script-adjoining-pages.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg-script-adjoining-pages.t
rename to ld/testsuite/ld-elf/sec-to-seg-script-adjoining-pages.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg-script-disjoint-pages.t b/ld/testsuite/ld-elf/sec-to-seg-script-disjoint-pages.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg-script-disjoint-pages.t
rename to ld/testsuite/ld-elf/sec-to-seg-script-disjoint-pages.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg-script-same-page.t b/ld/testsuite/ld-elf/sec-to-seg-script-same-page.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg-script-same-page.t
rename to ld/testsuite/ld-elf/sec-to-seg-script-same-page.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg.exp b/ld/testsuite/ld-elf/sec-to-seg.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg.exp
rename to ld/testsuite/ld-elf/sec-to-seg.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg1.s b/ld/testsuite/ld-elf/sec-to-seg1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg1.s
rename to ld/testsuite/ld-elf/sec-to-seg1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg2.s b/ld/testsuite/ld-elf/sec-to-seg2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/sec-to-seg2.s
rename to ld/testsuite/ld-elf/sec-to-seg2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/sec64k.exp
rename to ld/testsuite/ld-elf/sec64k.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/seg.d b/ld/testsuite/ld-elf/seg.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/seg.d
rename to ld/testsuite/ld-elf/seg.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/seg.s b/ld/testsuite/ld-elf/seg.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/seg.s
rename to ld/testsuite/ld-elf/seg.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/seg.t b/ld/testsuite/ld-elf/seg.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/seg.t
rename to ld/testsuite/ld-elf/seg.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/shared.exp
rename to ld/testsuite/ld-elf/shared.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/simple.s b/ld/testsuite/ld-elf/simple.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/simple.s
rename to ld/testsuite/ld-elf/simple.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/stab.d b/ld/testsuite/ld-elf/stab.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/stab.d
rename to ld/testsuite/ld-elf/stab.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/start.s b/ld/testsuite/ld-elf/start.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/start.s
rename to ld/testsuite/ld-elf/start.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/symbol1ref.s b/ld/testsuite/ld-elf/symbol1ref.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/symbol1ref.s
rename to ld/testsuite/ld-elf/symbol1ref.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/symbol1w.s b/ld/testsuite/ld-elf/symbol1w.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/symbol1w.s
rename to ld/testsuite/ld-elf/symbol1w.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/symbol2ref.s b/ld/testsuite/ld-elf/symbol2ref.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/symbol2ref.s
rename to ld/testsuite/ld-elf/symbol2ref.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/symbol2w.s b/ld/testsuite/ld-elf/symbol2w.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/symbol2w.s
rename to ld/testsuite/ld-elf/symbol2w.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/table.s b/ld/testsuite/ld-elf/table.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/table.s
rename to ld/testsuite/ld-elf/table.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tbss.s b/ld/testsuite/ld-elf/tbss.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tbss.s
rename to ld/testsuite/ld-elf/tbss.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tbss1.s b/ld/testsuite/ld-elf/tbss1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tbss1.s
rename to ld/testsuite/ld-elf/tbss1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tbss2.s b/ld/testsuite/ld-elf/tbss2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tbss2.s
rename to ld/testsuite/ld-elf/tbss2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tdata1.s b/ld/testsuite/ld-elf/tdata1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tdata1.s
rename to ld/testsuite/ld-elf/tdata1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tdata2.s b/ld/testsuite/ld-elf/tdata2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tdata2.s
rename to ld/testsuite/ld-elf/tdata2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr1.d b/ld/testsuite/ld-elf/textaddr1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr1.d
rename to ld/testsuite/ld-elf/textaddr1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr2.d b/ld/testsuite/ld-elf/textaddr2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr2.d
rename to ld/testsuite/ld-elf/textaddr2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr3.d b/ld/testsuite/ld-elf/textaddr3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr3.d
rename to ld/testsuite/ld-elf/textaddr3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr4.d b/ld/testsuite/ld-elf/textaddr4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr4.d
rename to ld/testsuite/ld-elf/textaddr4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr5.d b/ld/testsuite/ld-elf/textaddr5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr5.d
rename to ld/testsuite/ld-elf/textaddr5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr6.d b/ld/testsuite/ld-elf/textaddr6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr6.d
rename to ld/testsuite/ld-elf/textaddr6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr7.d b/ld/testsuite/ld-elf/textaddr7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/textaddr7.d
rename to ld/testsuite/ld-elf/textaddr7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tls_common.exp b/ld/testsuite/ld-elf/tls_common.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tls_common.exp
rename to ld/testsuite/ld-elf/tls_common.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tls_common.s b/ld/testsuite/ld-elf/tls_common.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tls_common.s
rename to ld/testsuite/ld-elf/tls_common.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/tls_gc.s b/ld/testsuite/ld-elf/tls_gc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/tls_gc.s
rename to ld/testsuite/ld-elf/tls_gc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/unknown.d b/ld/testsuite/ld-elf/unknown.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/unknown.d
rename to ld/testsuite/ld-elf/unknown.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/unknown2.d b/ld/testsuite/ld-elf/unknown2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/unknown2.d
rename to ld/testsuite/ld-elf/unknown2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/unknown2.s b/ld/testsuite/ld-elf/unknown2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/unknown2.s
rename to ld/testsuite/ld-elf/unknown2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/warn.out b/ld/testsuite/ld-elf/warn.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/warn.out
rename to ld/testsuite/ld-elf/warn.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/warn1.d b/ld/testsuite/ld-elf/warn1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/warn1.d
rename to ld/testsuite/ld-elf/warn1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/warn2.d b/ld/testsuite/ld-elf/warn2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/warn2.d
rename to ld/testsuite/ld-elf/warn2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1.ld b/ld/testsuite/ld-elf/weak-dyn-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1.ld
rename to ld/testsuite/ld-elf/weak-dyn-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1.rd b/ld/testsuite/ld-elf/weak-dyn-1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1.rd
rename to ld/testsuite/ld-elf/weak-dyn-1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1a.s b/ld/testsuite/ld-elf/weak-dyn-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1a.s
rename to ld/testsuite/ld-elf/weak-dyn-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1b.s b/ld/testsuite/ld-elf/weak-dyn-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/weak-dyn-1b.s
rename to ld/testsuite/ld-elf/weak-dyn-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/wrap.exp b/ld/testsuite/ld-elf/wrap.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/wrap.exp
rename to ld/testsuite/ld-elf/wrap.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1.c b/ld/testsuite/ld-elf/wrap1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1.c
rename to ld/testsuite/ld-elf/wrap1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1.out b/ld/testsuite/ld-elf/wrap1.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1.out
rename to ld/testsuite/ld-elf/wrap1.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1a.c b/ld/testsuite/ld-elf/wrap1a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1a.c
rename to ld/testsuite/ld-elf/wrap1a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1b.c b/ld/testsuite/ld-elf/wrap1b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elf/wrap1b.c
rename to ld/testsuite/ld-elf/wrap1b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfcomm/common1a.c b/ld/testsuite/ld-elfcomm/common1a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfcomm/common1a.c
rename to ld/testsuite/ld-elfcomm/common1a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfcomm/common1b.c b/ld/testsuite/ld-elfcomm/common1b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfcomm/common1b.c
rename to ld/testsuite/ld-elfcomm/common1b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfcomm/elfcomm.exp
rename to ld/testsuite/ld-elfcomm/elfcomm.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfcomm/sort-common.s b/ld/testsuite/ld-elfcomm/sort-common.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfcomm/sort-common.s
rename to ld/testsuite/ld-elfcomm/sort-common.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers.exp
rename to ld/testsuite/ld-elfvers/vers.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.c b/ld/testsuite/ld-elfvers/vers1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.c
rename to ld/testsuite/ld-elfvers/vers1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.dsym b/ld/testsuite/ld-elfvers/vers1.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.dsym
rename to ld/testsuite/ld-elfvers/vers1.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.map b/ld/testsuite/ld-elfvers/vers1.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.map
rename to ld/testsuite/ld-elfvers/vers1.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.sym b/ld/testsuite/ld-elfvers/vers1.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.sym
rename to ld/testsuite/ld-elfvers/vers1.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.ver b/ld/testsuite/ld-elfvers/vers1.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers1.ver
rename to ld/testsuite/ld-elfvers/vers1.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers13.asym b/ld/testsuite/ld-elfvers/vers13.asym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers13.asym
rename to ld/testsuite/ld-elfvers/vers13.asym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.c b/ld/testsuite/ld-elfvers/vers15.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.c
rename to ld/testsuite/ld-elfvers/vers15.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.dsym b/ld/testsuite/ld-elfvers/vers15.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.dsym
rename to ld/testsuite/ld-elfvers/vers15.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.sym b/ld/testsuite/ld-elfvers/vers15.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.sym
rename to ld/testsuite/ld-elfvers/vers15.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.ver b/ld/testsuite/ld-elfvers/vers15.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers15.ver
rename to ld/testsuite/ld-elfvers/vers15.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16.c b/ld/testsuite/ld-elfvers/vers16.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16.c
rename to ld/testsuite/ld-elfvers/vers16.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16.dsym b/ld/testsuite/ld-elfvers/vers16.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16.dsym
rename to ld/testsuite/ld-elfvers/vers16.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16.map b/ld/testsuite/ld-elfvers/vers16.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16.map
rename to ld/testsuite/ld-elfvers/vers16.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16a.c b/ld/testsuite/ld-elfvers/vers16a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16a.c
rename to ld/testsuite/ld-elfvers/vers16a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16a.dsym b/ld/testsuite/ld-elfvers/vers16a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16a.dsym
rename to ld/testsuite/ld-elfvers/vers16a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16a.ver b/ld/testsuite/ld-elfvers/vers16a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers16a.ver
rename to ld/testsuite/ld-elfvers/vers16a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.c b/ld/testsuite/ld-elfvers/vers17.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.c
rename to ld/testsuite/ld-elfvers/vers17.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.dsym b/ld/testsuite/ld-elfvers/vers17.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.dsym
rename to ld/testsuite/ld-elfvers/vers17.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.map b/ld/testsuite/ld-elfvers/vers17.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.map
rename to ld/testsuite/ld-elfvers/vers17.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.ver b/ld/testsuite/ld-elfvers/vers17.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers17.ver
rename to ld/testsuite/ld-elfvers/vers17.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.c b/ld/testsuite/ld-elfvers/vers18.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.c
rename to ld/testsuite/ld-elfvers/vers18.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.dsym b/ld/testsuite/ld-elfvers/vers18.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.dsym
rename to ld/testsuite/ld-elfvers/vers18.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.map b/ld/testsuite/ld-elfvers/vers18.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.map
rename to ld/testsuite/ld-elfvers/vers18.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.sym b/ld/testsuite/ld-elfvers/vers18.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.sym
rename to ld/testsuite/ld-elfvers/vers18.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.ver b/ld/testsuite/ld-elfvers/vers18.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers18.ver
rename to ld/testsuite/ld-elfvers/vers18.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers19.c b/ld/testsuite/ld-elfvers/vers19.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers19.c
rename to ld/testsuite/ld-elfvers/vers19.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers19.dsym b/ld/testsuite/ld-elfvers/vers19.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers19.dsym
rename to ld/testsuite/ld-elfvers/vers19.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers19.ver b/ld/testsuite/ld-elfvers/vers19.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers19.ver
rename to ld/testsuite/ld-elfvers/vers19.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.c b/ld/testsuite/ld-elfvers/vers2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.c
rename to ld/testsuite/ld-elfvers/vers2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.dsym b/ld/testsuite/ld-elfvers/vers2.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.dsym
rename to ld/testsuite/ld-elfvers/vers2.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.map b/ld/testsuite/ld-elfvers/vers2.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.map
rename to ld/testsuite/ld-elfvers/vers2.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.ver b/ld/testsuite/ld-elfvers/vers2.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers2.ver
rename to ld/testsuite/ld-elfvers/vers2.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.c b/ld/testsuite/ld-elfvers/vers20.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.c
rename to ld/testsuite/ld-elfvers/vers20.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.dsym b/ld/testsuite/ld-elfvers/vers20.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.dsym
rename to ld/testsuite/ld-elfvers/vers20.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.map b/ld/testsuite/ld-elfvers/vers20.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.map
rename to ld/testsuite/ld-elfvers/vers20.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.ver b/ld/testsuite/ld-elfvers/vers20.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20.ver
rename to ld/testsuite/ld-elfvers/vers20.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20a.ver b/ld/testsuite/ld-elfvers/vers20a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers20a.ver
rename to ld/testsuite/ld-elfvers/vers20a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.c b/ld/testsuite/ld-elfvers/vers21.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.c
rename to ld/testsuite/ld-elfvers/vers21.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.dsym b/ld/testsuite/ld-elfvers/vers21.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.dsym
rename to ld/testsuite/ld-elfvers/vers21.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.map b/ld/testsuite/ld-elfvers/vers21.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.map
rename to ld/testsuite/ld-elfvers/vers21.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.sym b/ld/testsuite/ld-elfvers/vers21.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.sym
rename to ld/testsuite/ld-elfvers/vers21.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.ver b/ld/testsuite/ld-elfvers/vers21.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers21.ver
rename to ld/testsuite/ld-elfvers/vers21.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.c b/ld/testsuite/ld-elfvers/vers22.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.c
rename to ld/testsuite/ld-elfvers/vers22.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.dsym b/ld/testsuite/ld-elfvers/vers22.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.dsym
rename to ld/testsuite/ld-elfvers/vers22.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.map b/ld/testsuite/ld-elfvers/vers22.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.map
rename to ld/testsuite/ld-elfvers/vers22.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.ver b/ld/testsuite/ld-elfvers/vers22.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22.ver
rename to ld/testsuite/ld-elfvers/vers22.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.c b/ld/testsuite/ld-elfvers/vers22a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.c
rename to ld/testsuite/ld-elfvers/vers22a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.dsym b/ld/testsuite/ld-elfvers/vers22a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.dsym
rename to ld/testsuite/ld-elfvers/vers22a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.sym b/ld/testsuite/ld-elfvers/vers22a.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.sym
rename to ld/testsuite/ld-elfvers/vers22a.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.ver b/ld/testsuite/ld-elfvers/vers22a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22a.ver
rename to ld/testsuite/ld-elfvers/vers22a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22b.c b/ld/testsuite/ld-elfvers/vers22b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22b.c
rename to ld/testsuite/ld-elfvers/vers22b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22b.dsym b/ld/testsuite/ld-elfvers/vers22b.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22b.dsym
rename to ld/testsuite/ld-elfvers/vers22b.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22b.ver b/ld/testsuite/ld-elfvers/vers22b.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers22b.ver
rename to ld/testsuite/ld-elfvers/vers22b.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23.c b/ld/testsuite/ld-elfvers/vers23.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23.c
rename to ld/testsuite/ld-elfvers/vers23.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23.dsym b/ld/testsuite/ld-elfvers/vers23.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23.dsym
rename to ld/testsuite/ld-elfvers/vers23.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23.ver b/ld/testsuite/ld-elfvers/vers23.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23.ver
rename to ld/testsuite/ld-elfvers/vers23.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.c b/ld/testsuite/ld-elfvers/vers23a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.c
rename to ld/testsuite/ld-elfvers/vers23a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.dsym b/ld/testsuite/ld-elfvers/vers23a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.dsym
rename to ld/testsuite/ld-elfvers/vers23a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.map b/ld/testsuite/ld-elfvers/vers23a.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.map
rename to ld/testsuite/ld-elfvers/vers23a.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.sym b/ld/testsuite/ld-elfvers/vers23a.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.sym
rename to ld/testsuite/ld-elfvers/vers23a.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.ver b/ld/testsuite/ld-elfvers/vers23a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23a.ver
rename to ld/testsuite/ld-elfvers/vers23a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.c b/ld/testsuite/ld-elfvers/vers23b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.c
rename to ld/testsuite/ld-elfvers/vers23b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.dsym b/ld/testsuite/ld-elfvers/vers23b.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.dsym
rename to ld/testsuite/ld-elfvers/vers23b.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.map b/ld/testsuite/ld-elfvers/vers23b.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.map
rename to ld/testsuite/ld-elfvers/vers23b.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.ver b/ld/testsuite/ld-elfvers/vers23b.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23b.ver
rename to ld/testsuite/ld-elfvers/vers23b.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23c.ver b/ld/testsuite/ld-elfvers/vers23c.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23c.ver
rename to ld/testsuite/ld-elfvers/vers23c.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23d.dsym b/ld/testsuite/ld-elfvers/vers23d.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers23d.dsym
rename to ld/testsuite/ld-elfvers/vers23d.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24.map b/ld/testsuite/ld-elfvers/vers24.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24.map
rename to ld/testsuite/ld-elfvers/vers24.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24.rd b/ld/testsuite/ld-elfvers/vers24.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24.rd
rename to ld/testsuite/ld-elfvers/vers24.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24a.c b/ld/testsuite/ld-elfvers/vers24a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24a.c
rename to ld/testsuite/ld-elfvers/vers24a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24b.c b/ld/testsuite/ld-elfvers/vers24b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24b.c
rename to ld/testsuite/ld-elfvers/vers24b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24c.c b/ld/testsuite/ld-elfvers/vers24c.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers24c.c
rename to ld/testsuite/ld-elfvers/vers24c.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.c b/ld/testsuite/ld-elfvers/vers25a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.c
rename to ld/testsuite/ld-elfvers/vers25a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.dsym b/ld/testsuite/ld-elfvers/vers25a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.dsym
rename to ld/testsuite/ld-elfvers/vers25a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.map b/ld/testsuite/ld-elfvers/vers25a.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.map
rename to ld/testsuite/ld-elfvers/vers25a.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.ver b/ld/testsuite/ld-elfvers/vers25a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25a.ver
rename to ld/testsuite/ld-elfvers/vers25a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25b.c b/ld/testsuite/ld-elfvers/vers25b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25b.c
rename to ld/testsuite/ld-elfvers/vers25b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25b.dsym b/ld/testsuite/ld-elfvers/vers25b.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25b.dsym
rename to ld/testsuite/ld-elfvers/vers25b.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25b.ver b/ld/testsuite/ld-elfvers/vers25b.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers25b.ver
rename to ld/testsuite/ld-elfvers/vers25b.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.c b/ld/testsuite/ld-elfvers/vers26a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.c
rename to ld/testsuite/ld-elfvers/vers26a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.dsym b/ld/testsuite/ld-elfvers/vers26a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.dsym
rename to ld/testsuite/ld-elfvers/vers26a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.map b/ld/testsuite/ld-elfvers/vers26a.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.map
rename to ld/testsuite/ld-elfvers/vers26a.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.ver b/ld/testsuite/ld-elfvers/vers26a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26a.ver
rename to ld/testsuite/ld-elfvers/vers26a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26b.c b/ld/testsuite/ld-elfvers/vers26b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26b.c
rename to ld/testsuite/ld-elfvers/vers26b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26b.dsym b/ld/testsuite/ld-elfvers/vers26b.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26b.dsym
rename to ld/testsuite/ld-elfvers/vers26b.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26b.ver b/ld/testsuite/ld-elfvers/vers26b.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers26b.ver
rename to ld/testsuite/ld-elfvers/vers26b.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.c b/ld/testsuite/ld-elfvers/vers27a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.c
rename to ld/testsuite/ld-elfvers/vers27a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.dsym b/ld/testsuite/ld-elfvers/vers27a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.dsym
rename to ld/testsuite/ld-elfvers/vers27a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.map b/ld/testsuite/ld-elfvers/vers27a.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.map
rename to ld/testsuite/ld-elfvers/vers27a.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.ver b/ld/testsuite/ld-elfvers/vers27a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27a.ver
rename to ld/testsuite/ld-elfvers/vers27a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27b.c b/ld/testsuite/ld-elfvers/vers27b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27b.c
rename to ld/testsuite/ld-elfvers/vers27b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27b.dsym b/ld/testsuite/ld-elfvers/vers27b.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27b.dsym
rename to ld/testsuite/ld-elfvers/vers27b.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27b.ver b/ld/testsuite/ld-elfvers/vers27b.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27b.ver
rename to ld/testsuite/ld-elfvers/vers27b.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27c.c b/ld/testsuite/ld-elfvers/vers27c.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27c.c
rename to ld/testsuite/ld-elfvers/vers27c.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27c.dsym b/ld/testsuite/ld-elfvers/vers27c.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27c.dsym
rename to ld/testsuite/ld-elfvers/vers27c.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27c.ver b/ld/testsuite/ld-elfvers/vers27c.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27c.ver
rename to ld/testsuite/ld-elfvers/vers27c.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d.dsym b/ld/testsuite/ld-elfvers/vers27d.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d.dsym
rename to ld/testsuite/ld-elfvers/vers27d.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d.sym b/ld/testsuite/ld-elfvers/vers27d.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d.sym
rename to ld/testsuite/ld-elfvers/vers27d.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d.ver b/ld/testsuite/ld-elfvers/vers27d.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d.ver
rename to ld/testsuite/ld-elfvers/vers27d.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d1.c b/ld/testsuite/ld-elfvers/vers27d1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d1.c
rename to ld/testsuite/ld-elfvers/vers27d1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d2.c b/ld/testsuite/ld-elfvers/vers27d2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d2.c
rename to ld/testsuite/ld-elfvers/vers27d2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d3.c b/ld/testsuite/ld-elfvers/vers27d3.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d3.c
rename to ld/testsuite/ld-elfvers/vers27d3.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d4.dsym b/ld/testsuite/ld-elfvers/vers27d4.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d4.dsym
rename to ld/testsuite/ld-elfvers/vers27d4.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d4.ver b/ld/testsuite/ld-elfvers/vers27d4.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers27d4.ver
rename to ld/testsuite/ld-elfvers/vers27d4.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28a.c b/ld/testsuite/ld-elfvers/vers28a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28a.c
rename to ld/testsuite/ld-elfvers/vers28a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28a.dsym b/ld/testsuite/ld-elfvers/vers28a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28a.dsym
rename to ld/testsuite/ld-elfvers/vers28a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28a.ver b/ld/testsuite/ld-elfvers/vers28a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28a.ver
rename to ld/testsuite/ld-elfvers/vers28a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.c b/ld/testsuite/ld-elfvers/vers28b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.c
rename to ld/testsuite/ld-elfvers/vers28b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.dsym b/ld/testsuite/ld-elfvers/vers28b.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.dsym
rename to ld/testsuite/ld-elfvers/vers28b.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.map b/ld/testsuite/ld-elfvers/vers28b.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.map
rename to ld/testsuite/ld-elfvers/vers28b.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.ver b/ld/testsuite/ld-elfvers/vers28b.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28b.ver
rename to ld/testsuite/ld-elfvers/vers28b.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28c.c b/ld/testsuite/ld-elfvers/vers28c.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28c.c
rename to ld/testsuite/ld-elfvers/vers28c.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28c.dsym b/ld/testsuite/ld-elfvers/vers28c.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28c.dsym
rename to ld/testsuite/ld-elfvers/vers28c.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28c.ver b/ld/testsuite/ld-elfvers/vers28c.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers28c.ver
rename to ld/testsuite/ld-elfvers/vers28c.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers29.c b/ld/testsuite/ld-elfvers/vers29.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers29.c
rename to ld/testsuite/ld-elfvers/vers29.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers29.dsym b/ld/testsuite/ld-elfvers/vers29.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers29.dsym
rename to ld/testsuite/ld-elfvers/vers29.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers29.ver b/ld/testsuite/ld-elfvers/vers29.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers29.ver
rename to ld/testsuite/ld-elfvers/vers29.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers3.c b/ld/testsuite/ld-elfvers/vers3.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers3.c
rename to ld/testsuite/ld-elfvers/vers3.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers3.dsym b/ld/testsuite/ld-elfvers/vers3.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers3.dsym
rename to ld/testsuite/ld-elfvers/vers3.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers3.ver b/ld/testsuite/ld-elfvers/vers3.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers3.ver
rename to ld/testsuite/ld-elfvers/vers3.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.c b/ld/testsuite/ld-elfvers/vers30.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.c
rename to ld/testsuite/ld-elfvers/vers30.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.dsym b/ld/testsuite/ld-elfvers/vers30.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.dsym
rename to ld/testsuite/ld-elfvers/vers30.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.map b/ld/testsuite/ld-elfvers/vers30.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.map
rename to ld/testsuite/ld-elfvers/vers30.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.ver b/ld/testsuite/ld-elfvers/vers30.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers30.ver
rename to ld/testsuite/ld-elfvers/vers30.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.c b/ld/testsuite/ld-elfvers/vers31.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.c
rename to ld/testsuite/ld-elfvers/vers31.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.dsym b/ld/testsuite/ld-elfvers/vers31.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.dsym
rename to ld/testsuite/ld-elfvers/vers31.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.map b/ld/testsuite/ld-elfvers/vers31.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.map
rename to ld/testsuite/ld-elfvers/vers31.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.ver b/ld/testsuite/ld-elfvers/vers31.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers31.ver
rename to ld/testsuite/ld-elfvers/vers31.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32.map b/ld/testsuite/ld-elfvers/vers32.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32.map
rename to ld/testsuite/ld-elfvers/vers32.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32a.c b/ld/testsuite/ld-elfvers/vers32a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32a.c
rename to ld/testsuite/ld-elfvers/vers32a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32a.dsym b/ld/testsuite/ld-elfvers/vers32a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32a.dsym
rename to ld/testsuite/ld-elfvers/vers32a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32a.ver b/ld/testsuite/ld-elfvers/vers32a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32a.ver
rename to ld/testsuite/ld-elfvers/vers32a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32b.c b/ld/testsuite/ld-elfvers/vers32b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32b.c
rename to ld/testsuite/ld-elfvers/vers32b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32b.dsym b/ld/testsuite/ld-elfvers/vers32b.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32b.dsym
rename to ld/testsuite/ld-elfvers/vers32b.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32b.ver b/ld/testsuite/ld-elfvers/vers32b.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers32b.ver
rename to ld/testsuite/ld-elfvers/vers32b.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4.c b/ld/testsuite/ld-elfvers/vers4.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4.c
rename to ld/testsuite/ld-elfvers/vers4.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4.sym b/ld/testsuite/ld-elfvers/vers4.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4.sym
rename to ld/testsuite/ld-elfvers/vers4.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4a.dsym b/ld/testsuite/ld-elfvers/vers4a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4a.dsym
rename to ld/testsuite/ld-elfvers/vers4a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4a.sym b/ld/testsuite/ld-elfvers/vers4a.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4a.sym
rename to ld/testsuite/ld-elfvers/vers4a.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4a.ver b/ld/testsuite/ld-elfvers/vers4a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers4a.ver
rename to ld/testsuite/ld-elfvers/vers4a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers5.c b/ld/testsuite/ld-elfvers/vers5.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers5.c
rename to ld/testsuite/ld-elfvers/vers5.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.c b/ld/testsuite/ld-elfvers/vers6.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.c
rename to ld/testsuite/ld-elfvers/vers6.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.dsym b/ld/testsuite/ld-elfvers/vers6.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.dsym
rename to ld/testsuite/ld-elfvers/vers6.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.sym b/ld/testsuite/ld-elfvers/vers6.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.sym
rename to ld/testsuite/ld-elfvers/vers6.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.ver b/ld/testsuite/ld-elfvers/vers6.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers6.ver
rename to ld/testsuite/ld-elfvers/vers6.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7.c b/ld/testsuite/ld-elfvers/vers7.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7.c
rename to ld/testsuite/ld-elfvers/vers7.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7.map b/ld/testsuite/ld-elfvers/vers7.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7.map
rename to ld/testsuite/ld-elfvers/vers7.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.c b/ld/testsuite/ld-elfvers/vers7a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.c
rename to ld/testsuite/ld-elfvers/vers7a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.dsym b/ld/testsuite/ld-elfvers/vers7a.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.dsym
rename to ld/testsuite/ld-elfvers/vers7a.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.sym b/ld/testsuite/ld-elfvers/vers7a.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.sym
rename to ld/testsuite/ld-elfvers/vers7a.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.ver b/ld/testsuite/ld-elfvers/vers7a.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers7a.ver
rename to ld/testsuite/ld-elfvers/vers7a.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers8.c b/ld/testsuite/ld-elfvers/vers8.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers8.c
rename to ld/testsuite/ld-elfvers/vers8.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers8.map b/ld/testsuite/ld-elfvers/vers8.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers8.map
rename to ld/testsuite/ld-elfvers/vers8.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers8.ver b/ld/testsuite/ld-elfvers/vers8.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers8.ver
rename to ld/testsuite/ld-elfvers/vers8.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.c b/ld/testsuite/ld-elfvers/vers9.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.c
rename to ld/testsuite/ld-elfvers/vers9.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.dsym b/ld/testsuite/ld-elfvers/vers9.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.dsym
rename to ld/testsuite/ld-elfvers/vers9.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.sym b/ld/testsuite/ld-elfvers/vers9.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.sym
rename to ld/testsuite/ld-elfvers/vers9.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.ver b/ld/testsuite/ld-elfvers/vers9.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvers/vers9.ver
rename to ld/testsuite/ld-elfvers/vers9.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/common.c b/ld/testsuite/ld-elfvsb/common.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/common.c
rename to ld/testsuite/ld-elfvsb/common.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/define.s b/ld/testsuite/ld-elfvsb/define.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/define.s
rename to ld/testsuite/ld-elfvsb/define.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/elf-offset.ld b/ld/testsuite/ld-elfvsb/elf-offset.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/elf-offset.ld
rename to ld/testsuite/ld-elfvsb/elf-offset.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/elfvsb.dat b/ld/testsuite/ld-elfvsb/elfvsb.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/elfvsb.dat
rename to ld/testsuite/ld-elfvsb/elfvsb.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/elfvsb.exp
rename to ld/testsuite/ld-elfvsb/elfvsb.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden0.d b/ld/testsuite/ld-elfvsb/hidden0.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden0.d
rename to ld/testsuite/ld-elfvsb/hidden0.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden1.d b/ld/testsuite/ld-elfvsb/hidden1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden1.d
rename to ld/testsuite/ld-elfvsb/hidden1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden2.d b/ld/testsuite/ld-elfvsb/hidden2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden2.d
rename to ld/testsuite/ld-elfvsb/hidden2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden2.ld b/ld/testsuite/ld-elfvsb/hidden2.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden2.ld
rename to ld/testsuite/ld-elfvsb/hidden2.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden2.s b/ld/testsuite/ld-elfvsb/hidden2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/hidden2.s
rename to ld/testsuite/ld-elfvsb/hidden2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/internal0.d b/ld/testsuite/ld-elfvsb/internal0.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/internal0.d
rename to ld/testsuite/ld-elfvsb/internal0.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/internal1.d b/ld/testsuite/ld-elfvsb/internal1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/internal1.d
rename to ld/testsuite/ld-elfvsb/internal1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/main.c b/ld/testsuite/ld-elfvsb/main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/main.c
rename to ld/testsuite/ld-elfvsb/main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/protected0.d b/ld/testsuite/ld-elfvsb/protected0.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/protected0.d
rename to ld/testsuite/ld-elfvsb/protected0.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/protected1.d b/ld/testsuite/ld-elfvsb/protected1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/protected1.d
rename to ld/testsuite/ld-elfvsb/protected1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/sh1.c b/ld/testsuite/ld-elfvsb/sh1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/sh1.c
rename to ld/testsuite/ld-elfvsb/sh1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/sh2.c b/ld/testsuite/ld-elfvsb/sh2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/sh2.c
rename to ld/testsuite/ld-elfvsb/sh2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/sh3.c b/ld/testsuite/ld-elfvsb/sh3.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/sh3.c
rename to ld/testsuite/ld-elfvsb/sh3.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/test.c b/ld/testsuite/ld-elfvsb/test.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/test.c
rename to ld/testsuite/ld-elfvsb/test.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfvsb/undef.s b/ld/testsuite/ld-elfvsb/undef.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfvsb/undef.s
rename to ld/testsuite/ld-elfvsb/undef.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar.c b/ld/testsuite/ld-elfweak/bar.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar.c
rename to ld/testsuite/ld-elfweak/bar.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar1a.c b/ld/testsuite/ld-elfweak/bar1a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar1a.c
rename to ld/testsuite/ld-elfweak/bar1a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar1b.c b/ld/testsuite/ld-elfweak/bar1b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar1b.c
rename to ld/testsuite/ld-elfweak/bar1b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar1c.c b/ld/testsuite/ld-elfweak/bar1c.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/bar1c.c
rename to ld/testsuite/ld-elfweak/bar1c.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/dso.dsym b/ld/testsuite/ld-elfweak/dso.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/dso.dsym
rename to ld/testsuite/ld-elfweak/dso.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/dsodata.dsym b/ld/testsuite/ld-elfweak/dsodata.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/dsodata.dsym
rename to ld/testsuite/ld-elfweak/dsodata.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/dsow.dsym b/ld/testsuite/ld-elfweak/dsow.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/dsow.dsym
rename to ld/testsuite/ld-elfweak/dsow.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/dsowdata.dsym b/ld/testsuite/ld-elfweak/dsowdata.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/dsowdata.dsym
rename to ld/testsuite/ld-elfweak/dsowdata.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/elfweak.exp
rename to ld/testsuite/ld-elfweak/elfweak.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/foo.c b/ld/testsuite/ld-elfweak/foo.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/foo.c
rename to ld/testsuite/ld-elfweak/foo.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/foo1a.c b/ld/testsuite/ld-elfweak/foo1a.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/foo1a.c
rename to ld/testsuite/ld-elfweak/foo1a.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/foo1b.c b/ld/testsuite/ld-elfweak/foo1b.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/foo1b.c
rename to ld/testsuite/ld-elfweak/foo1b.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/main.c b/ld/testsuite/ld-elfweak/main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/main.c
rename to ld/testsuite/ld-elfweak/main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/main1.c b/ld/testsuite/ld-elfweak/main1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/main1.c
rename to ld/testsuite/ld-elfweak/main1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/size.dat b/ld/testsuite/ld-elfweak/size.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/size.dat
rename to ld/testsuite/ld-elfweak/size.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/size2.d b/ld/testsuite/ld-elfweak/size2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/size2.d
rename to ld/testsuite/ld-elfweak/size2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/size2a.s b/ld/testsuite/ld-elfweak/size2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/size2a.s
rename to ld/testsuite/ld-elfweak/size2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/size2b.s b/ld/testsuite/ld-elfweak/size2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/size2b.s
rename to ld/testsuite/ld-elfweak/size2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/size_bar.c b/ld/testsuite/ld-elfweak/size_bar.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/size_bar.c
rename to ld/testsuite/ld-elfweak/size_bar.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/size_foo.c b/ld/testsuite/ld-elfweak/size_foo.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/size_foo.c
rename to ld/testsuite/ld-elfweak/size_foo.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/size_main.c b/ld/testsuite/ld-elfweak/size_main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/size_main.c
rename to ld/testsuite/ld-elfweak/size_main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/strong.dat b/ld/testsuite/ld-elfweak/strong.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/strong.dat
rename to ld/testsuite/ld-elfweak/strong.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/strong.sym b/ld/testsuite/ld-elfweak/strong.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/strong.sym
rename to ld/testsuite/ld-elfweak/strong.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/strongcomm.sym b/ld/testsuite/ld-elfweak/strongcomm.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/strongcomm.sym
rename to ld/testsuite/ld-elfweak/strongcomm.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/strongdata.dat b/ld/testsuite/ld-elfweak/strongdata.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/strongdata.dat
rename to ld/testsuite/ld-elfweak/strongdata.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/strongdata.sym b/ld/testsuite/ld-elfweak/strongdata.sym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/strongdata.sym
rename to ld/testsuite/ld-elfweak/strongdata.sym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/weak.dat b/ld/testsuite/ld-elfweak/weak.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/weak.dat
rename to ld/testsuite/ld-elfweak/weak.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/weak.dsym b/ld/testsuite/ld-elfweak/weak.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/weak.dsym
rename to ld/testsuite/ld-elfweak/weak.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/weakdata.dat b/ld/testsuite/ld-elfweak/weakdata.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/weakdata.dat
rename to ld/testsuite/ld-elfweak/weakdata.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-elfweak/weakdata.dsym b/ld/testsuite/ld-elfweak/weakdata.dsym
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-elfweak/weakdata.dsym
rename to ld/testsuite/ld-elfweak/weakdata.dsym
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-fastcall/export.s b/ld/testsuite/ld-fastcall/export.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-fastcall/export.s
rename to ld/testsuite/ld-fastcall/export.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-fastcall/fastcall.exp b/ld/testsuite/ld-fastcall/fastcall.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-fastcall/fastcall.exp
rename to ld/testsuite/ld-fastcall/fastcall.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-fastcall/import.s b/ld/testsuite/ld-fastcall/import.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-fastcall/import.s
rename to ld/testsuite/ld-fastcall/import.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-1.d b/ld/testsuite/ld-frv/fdpic-pie-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-1.d
rename to ld/testsuite/ld-frv/fdpic-pie-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-2.d b/ld/testsuite/ld-frv/fdpic-pie-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-2.d
rename to ld/testsuite/ld-frv/fdpic-pie-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-5.d b/ld/testsuite/ld-frv/fdpic-pie-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-5.d
rename to ld/testsuite/ld-frv/fdpic-pie-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-6-fail.d b/ld/testsuite/ld-frv/fdpic-pie-6-fail.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-6-fail.d
rename to ld/testsuite/ld-frv/fdpic-pie-6-fail.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-6.d b/ld/testsuite/ld-frv/fdpic-pie-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-6.d
rename to ld/testsuite/ld-frv/fdpic-pie-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-7.d b/ld/testsuite/ld-frv/fdpic-pie-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-7.d
rename to ld/testsuite/ld-frv/fdpic-pie-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-8.d b/ld/testsuite/ld-frv/fdpic-pie-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-pie-8.d
rename to ld/testsuite/ld-frv/fdpic-pie-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-1.d b/ld/testsuite/ld-frv/fdpic-shared-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-1.d
rename to ld/testsuite/ld-frv/fdpic-shared-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-2-fail.d b/ld/testsuite/ld-frv/fdpic-shared-2-fail.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-2-fail.d
rename to ld/testsuite/ld-frv/fdpic-shared-2-fail.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-2.d b/ld/testsuite/ld-frv/fdpic-shared-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-2.d
rename to ld/testsuite/ld-frv/fdpic-shared-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-3.d b/ld/testsuite/ld-frv/fdpic-shared-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-3.d
rename to ld/testsuite/ld-frv/fdpic-shared-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-4.d b/ld/testsuite/ld-frv/fdpic-shared-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-4.d
rename to ld/testsuite/ld-frv/fdpic-shared-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-5.d b/ld/testsuite/ld-frv/fdpic-shared-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-5.d
rename to ld/testsuite/ld-frv/fdpic-shared-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-6-fail.d b/ld/testsuite/ld-frv/fdpic-shared-6-fail.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-6-fail.d
rename to ld/testsuite/ld-frv/fdpic-shared-6-fail.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-6.d b/ld/testsuite/ld-frv/fdpic-shared-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-6.d
rename to ld/testsuite/ld-frv/fdpic-shared-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-7.d b/ld/testsuite/ld-frv/fdpic-shared-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-7.d
rename to ld/testsuite/ld-frv/fdpic-shared-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-8-fail.d b/ld/testsuite/ld-frv/fdpic-shared-8-fail.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-8-fail.d
rename to ld/testsuite/ld-frv/fdpic-shared-8-fail.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-8.d b/ld/testsuite/ld-frv/fdpic-shared-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-8.d
rename to ld/testsuite/ld-frv/fdpic-shared-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-local-2.d b/ld/testsuite/ld-frv/fdpic-shared-local-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-local-2.d
rename to ld/testsuite/ld-frv/fdpic-shared-local-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-local-8.d b/ld/testsuite/ld-frv/fdpic-shared-local-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-shared-local-8.d
rename to ld/testsuite/ld-frv/fdpic-shared-local-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-1.d b/ld/testsuite/ld-frv/fdpic-static-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-1.d
rename to ld/testsuite/ld-frv/fdpic-static-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-2.d b/ld/testsuite/ld-frv/fdpic-static-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-2.d
rename to ld/testsuite/ld-frv/fdpic-static-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-5.d b/ld/testsuite/ld-frv/fdpic-static-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-5.d
rename to ld/testsuite/ld-frv/fdpic-static-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-6.d b/ld/testsuite/ld-frv/fdpic-static-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-6.d
rename to ld/testsuite/ld-frv/fdpic-static-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-7.d b/ld/testsuite/ld-frv/fdpic-static-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-7.d
rename to ld/testsuite/ld-frv/fdpic-static-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-8.d b/ld/testsuite/ld-frv/fdpic-static-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic-static-8.d
rename to ld/testsuite/ld-frv/fdpic-static-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic.exp b/ld/testsuite/ld-frv/fdpic.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic.exp
rename to ld/testsuite/ld-frv/fdpic.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic1.s b/ld/testsuite/ld-frv/fdpic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic1.s
rename to ld/testsuite/ld-frv/fdpic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic2.ldv b/ld/testsuite/ld-frv/fdpic2.ldv
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic2.ldv
rename to ld/testsuite/ld-frv/fdpic2.ldv
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic2.s b/ld/testsuite/ld-frv/fdpic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic2.s
rename to ld/testsuite/ld-frv/fdpic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic2min.ldv b/ld/testsuite/ld-frv/fdpic2min.ldv
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic2min.ldv
rename to ld/testsuite/ld-frv/fdpic2min.ldv
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic3.s b/ld/testsuite/ld-frv/fdpic3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic3.s
rename to ld/testsuite/ld-frv/fdpic3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic4.s b/ld/testsuite/ld-frv/fdpic4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic4.s
rename to ld/testsuite/ld-frv/fdpic4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic5.s b/ld/testsuite/ld-frv/fdpic5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic5.s
rename to ld/testsuite/ld-frv/fdpic5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic6.ldv b/ld/testsuite/ld-frv/fdpic6.ldv
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic6.ldv
rename to ld/testsuite/ld-frv/fdpic6.ldv
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic6.s b/ld/testsuite/ld-frv/fdpic6.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic6.s
rename to ld/testsuite/ld-frv/fdpic6.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic7.s b/ld/testsuite/ld-frv/fdpic7.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic7.s
rename to ld/testsuite/ld-frv/fdpic7.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic8.ldv b/ld/testsuite/ld-frv/fdpic8.ldv
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic8.ldv
rename to ld/testsuite/ld-frv/fdpic8.ldv
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic8.s b/ld/testsuite/ld-frv/fdpic8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic8.s
rename to ld/testsuite/ld-frv/fdpic8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic8min.ldv b/ld/testsuite/ld-frv/fdpic8min.ldv
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fdpic8min.ldv
rename to ld/testsuite/ld-frv/fdpic8min.ldv
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-link.d b/ld/testsuite/ld-frv/fr450-link.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-link.d
rename to ld/testsuite/ld-frv/fr450-link.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-linka.s b/ld/testsuite/ld-frv/fr450-linka.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-linka.s
rename to ld/testsuite/ld-frv/fr450-linka.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-linkb.s b/ld/testsuite/ld-frv/fr450-linkb.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-linkb.s
rename to ld/testsuite/ld-frv/fr450-linkb.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-linkc.s b/ld/testsuite/ld-frv/fr450-linkc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/fr450-linkc.s
rename to ld/testsuite/ld-frv/fr450-linkc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/frv-elf.exp b/ld/testsuite/ld-frv/frv-elf.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/frv-elf.exp
rename to ld/testsuite/ld-frv/frv-elf.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-1-dep.s b/ld/testsuite/ld-frv/tls-1-dep.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-1-dep.s
rename to ld/testsuite/ld-frv/tls-1-dep.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-1-shared.lds b/ld/testsuite/ld-frv/tls-1-shared.lds
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-1-shared.lds
rename to ld/testsuite/ld-frv/tls-1-shared.lds
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-1.s b/ld/testsuite/ld-frv/tls-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-1.s
rename to ld/testsuite/ld-frv/tls-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-2.s b/ld/testsuite/ld-frv/tls-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-2.s
rename to ld/testsuite/ld-frv/tls-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-3.s b/ld/testsuite/ld-frv/tls-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-3.s
rename to ld/testsuite/ld-frv/tls-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-dynamic-1.d b/ld/testsuite/ld-frv/tls-dynamic-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-dynamic-1.d
rename to ld/testsuite/ld-frv/tls-dynamic-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-dynamic-2.d b/ld/testsuite/ld-frv/tls-dynamic-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-dynamic-2.d
rename to ld/testsuite/ld-frv/tls-dynamic-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-dynamic-3.d b/ld/testsuite/ld-frv/tls-dynamic-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-dynamic-3.d
rename to ld/testsuite/ld-frv/tls-dynamic-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-initial-shared-2.d b/ld/testsuite/ld-frv/tls-initial-shared-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-initial-shared-2.d
rename to ld/testsuite/ld-frv/tls-initial-shared-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-pie-1.d b/ld/testsuite/ld-frv/tls-pie-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-pie-1.d
rename to ld/testsuite/ld-frv/tls-pie-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-pie-3.d b/ld/testsuite/ld-frv/tls-pie-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-pie-3.d
rename to ld/testsuite/ld-frv/tls-pie-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-dynamic-1.d b/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-dynamic-1.d
rename to ld/testsuite/ld-frv/tls-relax-dynamic-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-dynamic-2.d b/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-dynamic-2.d
rename to ld/testsuite/ld-frv/tls-relax-dynamic-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-dynamic-3.d b/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-dynamic-3.d
rename to ld/testsuite/ld-frv/tls-relax-dynamic-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d b/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
rename to ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-pie-1.d b/ld/testsuite/ld-frv/tls-relax-pie-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-pie-1.d
rename to ld/testsuite/ld-frv/tls-relax-pie-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-pie-3.d b/ld/testsuite/ld-frv/tls-relax-pie-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-pie-3.d
rename to ld/testsuite/ld-frv/tls-relax-pie-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-shared-1.d b/ld/testsuite/ld-frv/tls-relax-shared-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-shared-1.d
rename to ld/testsuite/ld-frv/tls-relax-shared-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-shared-2.d b/ld/testsuite/ld-frv/tls-relax-shared-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-shared-2.d
rename to ld/testsuite/ld-frv/tls-relax-shared-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-shared-3.d b/ld/testsuite/ld-frv/tls-relax-shared-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-shared-3.d
rename to ld/testsuite/ld-frv/tls-relax-shared-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-static-1.d b/ld/testsuite/ld-frv/tls-relax-static-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-static-1.d
rename to ld/testsuite/ld-frv/tls-relax-static-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-static-3.d b/ld/testsuite/ld-frv/tls-relax-static-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-relax-static-3.d
rename to ld/testsuite/ld-frv/tls-relax-static-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-1-fail.d b/ld/testsuite/ld-frv/tls-shared-1-fail.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-1-fail.d
rename to ld/testsuite/ld-frv/tls-shared-1-fail.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-1.d b/ld/testsuite/ld-frv/tls-shared-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-1.d
rename to ld/testsuite/ld-frv/tls-shared-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-2.d b/ld/testsuite/ld-frv/tls-shared-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-2.d
rename to ld/testsuite/ld-frv/tls-shared-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-3.d b/ld/testsuite/ld-frv/tls-shared-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-shared-3.d
rename to ld/testsuite/ld-frv/tls-shared-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-static-1.d b/ld/testsuite/ld-frv/tls-static-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-static-1.d
rename to ld/testsuite/ld-frv/tls-static-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls-static-3.d b/ld/testsuite/ld-frv/tls-static-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls-static-3.d
rename to ld/testsuite/ld-frv/tls-static-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-frv/tls.exp b/ld/testsuite/ld-frv/tls.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-frv/tls.exp
rename to ld/testsuite/ld-frv/tls.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/abi-note.d b/ld/testsuite/ld-gc/abi-note.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/abi-note.d
rename to ld/testsuite/ld-gc/abi-note.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/abi-note.s b/ld/testsuite/ld-gc/abi-note.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/abi-note.s
rename to ld/testsuite/ld-gc/abi-note.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/dummy.s b/ld/testsuite/ld-gc/dummy.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/dummy.s
rename to ld/testsuite/ld-gc/dummy.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/gc.c b/ld/testsuite/ld-gc/gc.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/gc.c
rename to ld/testsuite/ld-gc/gc.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/gc.exp b/ld/testsuite/ld-gc/gc.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/gc.exp
rename to ld/testsuite/ld-gc/gc.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/noent.d b/ld/testsuite/ld-gc/noent.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/noent.d
rename to ld/testsuite/ld-gc/noent.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/noent.s b/ld/testsuite/ld-gc/noent.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/noent.s
rename to ld/testsuite/ld-gc/noent.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/pr11218-1.c b/ld/testsuite/ld-gc/pr11218-1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/pr11218-1.c
rename to ld/testsuite/ld-gc/pr11218-1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/pr11218-2.c b/ld/testsuite/ld-gc/pr11218-2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/pr11218-2.c
rename to ld/testsuite/ld-gc/pr11218-2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/pr11218.d b/ld/testsuite/ld-gc/pr11218.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/pr11218.d
rename to ld/testsuite/ld-gc/pr11218.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/start.d b/ld/testsuite/ld-gc/start.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/start.d
rename to ld/testsuite/ld-gc/start.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-gc/start.s b/ld/testsuite/ld-gc/start.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-gc/start.s
rename to ld/testsuite/ld-gc/start.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/gcsection.d b/ld/testsuite/ld-h8300/gcsection.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/gcsection.d
rename to ld/testsuite/ld-h8300/gcsection.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/gcsection.s b/ld/testsuite/ld-h8300/gcsection.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/gcsection.s
rename to ld/testsuite/ld-h8300/gcsection.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/h8300.exp b/ld/testsuite/ld-h8300/h8300.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/h8300.exp
rename to ld/testsuite/ld-h8300/h8300.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-2.d b/ld/testsuite/ld-h8300/relax-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-2.d
rename to ld/testsuite/ld-h8300/relax-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-2.s b/ld/testsuite/ld-h8300/relax-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-2.s
rename to ld/testsuite/ld-h8300/relax-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-3-coff.d b/ld/testsuite/ld-h8300/relax-3-coff.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-3-coff.d
rename to ld/testsuite/ld-h8300/relax-3-coff.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-3.d b/ld/testsuite/ld-h8300/relax-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-3.d
rename to ld/testsuite/ld-h8300/relax-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-3.s b/ld/testsuite/ld-h8300/relax-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-3.s
rename to ld/testsuite/ld-h8300/relax-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-4-coff.d b/ld/testsuite/ld-h8300/relax-4-coff.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-4-coff.d
rename to ld/testsuite/ld-h8300/relax-4-coff.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-4.d b/ld/testsuite/ld-h8300/relax-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-4.d
rename to ld/testsuite/ld-h8300/relax-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-4.s b/ld/testsuite/ld-h8300/relax-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-4.s
rename to ld/testsuite/ld-h8300/relax-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-5-coff.d b/ld/testsuite/ld-h8300/relax-5-coff.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-5-coff.d
rename to ld/testsuite/ld-h8300/relax-5-coff.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-5.d b/ld/testsuite/ld-h8300/relax-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-5.d
rename to ld/testsuite/ld-h8300/relax-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-5.s b/ld/testsuite/ld-h8300/relax-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-5.s
rename to ld/testsuite/ld-h8300/relax-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-6-coff.d b/ld/testsuite/ld-h8300/relax-6-coff.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-6-coff.d
rename to ld/testsuite/ld-h8300/relax-6-coff.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-6.d b/ld/testsuite/ld-h8300/relax-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-6.d
rename to ld/testsuite/ld-h8300/relax-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-6.s b/ld/testsuite/ld-h8300/relax-6.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax-6.s
rename to ld/testsuite/ld-h8300/relax-6.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax.d b/ld/testsuite/ld-h8300/relax.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax.d
rename to ld/testsuite/ld-h8300/relax.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-h8300/relax.s b/ld/testsuite/ld-h8300/relax.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-h8300/relax.s
rename to ld/testsuite/ld-h8300/relax.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/abs.d
rename to ld/testsuite/ld-i386/abs.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/abs.s b/ld/testsuite/ld-i386/abs.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/abs.s
rename to ld/testsuite/ld-i386/abs.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/alloc.d b/ld/testsuite/ld-i386/alloc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/alloc.d
rename to ld/testsuite/ld-i386/alloc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/alloc.s b/ld/testsuite/ld-i386/alloc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/alloc.s
rename to ld/testsuite/ld-i386/alloc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/alloc.t b/ld/testsuite/ld-i386/alloc.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/alloc.t
rename to ld/testsuite/ld-i386/alloc.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/combreloc.d b/ld/testsuite/ld-i386/combreloc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/combreloc.d
rename to ld/testsuite/ld-i386/combreloc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/combreloc.s b/ld/testsuite/ld-i386/combreloc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/combreloc.s
rename to ld/testsuite/ld-i386/combreloc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/compressed1.d b/ld/testsuite/ld-i386/compressed1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/compressed1.d
rename to ld/testsuite/ld-i386/compressed1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/compressed1.s b/ld/testsuite/ld-i386/compressed1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/compressed1.s
rename to ld/testsuite/ld-i386/compressed1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/discarded1.d b/ld/testsuite/ld-i386/discarded1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/discarded1.d
rename to ld/testsuite/ld-i386/discarded1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/discarded1.s b/ld/testsuite/ld-i386/discarded1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/discarded1.s
rename to ld/testsuite/ld-i386/discarded1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/discarded1.t b/ld/testsuite/ld-i386/discarded1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/discarded1.t
rename to ld/testsuite/ld-i386/discarded1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/emit-relocs.d b/ld/testsuite/ld-i386/emit-relocs.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/emit-relocs.d
rename to ld/testsuite/ld-i386/emit-relocs.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/emit-relocs.s b/ld/testsuite/ld-i386/emit-relocs.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/emit-relocs.s
rename to ld/testsuite/ld-i386/emit-relocs.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/hidden1.d b/ld/testsuite/ld-i386/hidden1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/hidden1.d
rename to ld/testsuite/ld-i386/hidden1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/hidden1.s b/ld/testsuite/ld-i386/hidden1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/hidden1.s
rename to ld/testsuite/ld-i386/hidden1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/hidden2.d b/ld/testsuite/ld-i386/hidden2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/hidden2.d
rename to ld/testsuite/ld-i386/hidden2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/hidden2.s b/ld/testsuite/ld-i386/hidden2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/hidden2.s
rename to ld/testsuite/ld-i386/hidden2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/hidden3.d b/ld/testsuite/ld-i386/hidden3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/hidden3.d
rename to ld/testsuite/ld-i386/hidden3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/hidden3.s b/ld/testsuite/ld-i386/hidden3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/hidden3.s
rename to ld/testsuite/ld-i386/hidden3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/i386.exp
rename to ld/testsuite/ld-i386/i386.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/nogot1.d b/ld/testsuite/ld-i386/nogot1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/nogot1.d
rename to ld/testsuite/ld-i386/nogot1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/nogot1.s b/ld/testsuite/ld-i386/nogot1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/nogot1.s
rename to ld/testsuite/ld-i386/nogot1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/nogot2.d b/ld/testsuite/ld-i386/nogot2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/nogot2.d
rename to ld/testsuite/ld-i386/nogot2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/nogot2.s b/ld/testsuite/ld-i386/nogot2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/nogot2.s
rename to ld/testsuite/ld-i386/nogot2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16.d b/ld/testsuite/ld-i386/pcrel16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16.d
rename to ld/testsuite/ld-i386/pcrel16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16.s b/ld/testsuite/ld-i386/pcrel16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16.s
rename to ld/testsuite/ld-i386/pcrel16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16abs.d b/ld/testsuite/ld-i386/pcrel16abs.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16abs.d
rename to ld/testsuite/ld-i386/pcrel16abs.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16abs.s b/ld/testsuite/ld-i386/pcrel16abs.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel16abs.s
rename to ld/testsuite/ld-i386/pcrel16abs.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel8.d b/ld/testsuite/ld-i386/pcrel8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel8.d
rename to ld/testsuite/ld-i386/pcrel8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel8.s b/ld/testsuite/ld-i386/pcrel8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/pcrel8.s
rename to ld/testsuite/ld-i386/pcrel8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/protected1.d b/ld/testsuite/ld-i386/protected1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/protected1.d
rename to ld/testsuite/ld-i386/protected1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/protected1.s b/ld/testsuite/ld-i386/protected1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/protected1.s
rename to ld/testsuite/ld-i386/protected1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/protected2.d b/ld/testsuite/ld-i386/protected2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/protected2.d
rename to ld/testsuite/ld-i386/protected2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/protected2.s b/ld/testsuite/ld-i386/protected2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/protected2.s
rename to ld/testsuite/ld-i386/protected2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/protected3.d b/ld/testsuite/ld-i386/protected3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/protected3.d
rename to ld/testsuite/ld-i386/protected3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/protected3.s b/ld/testsuite/ld-i386/protected3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/protected3.s
rename to ld/testsuite/ld-i386/protected3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/reloc.d b/ld/testsuite/ld-i386/reloc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/reloc.d
rename to ld/testsuite/ld-i386/reloc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/reloc.s b/ld/testsuite/ld-i386/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/reloc.s
rename to ld/testsuite/ld-i386/reloc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.dd b/ld/testsuite/ld-i386/tlsbin.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.dd
rename to ld/testsuite/ld-i386/tlsbin.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.rd
rename to ld/testsuite/ld-i386/tlsbin.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.s b/ld/testsuite/ld-i386/tlsbin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.s
rename to ld/testsuite/ld-i386/tlsbin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.sd b/ld/testsuite/ld-i386/tlsbin.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.sd
rename to ld/testsuite/ld-i386/tlsbin.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.td b/ld/testsuite/ld-i386/tlsbin.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbin.td
rename to ld/testsuite/ld-i386/tlsbin.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.dd b/ld/testsuite/ld-i386/tlsbindesc.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.dd
rename to ld/testsuite/ld-i386/tlsbindesc.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.rd
rename to ld/testsuite/ld-i386/tlsbindesc.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.s b/ld/testsuite/ld-i386/tlsbindesc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.s
rename to ld/testsuite/ld-i386/tlsbindesc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.sd b/ld/testsuite/ld-i386/tlsbindesc.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.sd
rename to ld/testsuite/ld-i386/tlsbindesc.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.td b/ld/testsuite/ld-i386/tlsbindesc.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbindesc.td
rename to ld/testsuite/ld-i386/tlsbindesc.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbinpic.s b/ld/testsuite/ld-i386/tlsbinpic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsbinpic.s
rename to ld/testsuite/ld-i386/tlsbinpic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.dd b/ld/testsuite/ld-i386/tlsdesc.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.dd
rename to ld/testsuite/ld-i386/tlsdesc.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.rd
rename to ld/testsuite/ld-i386/tlsdesc.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.s b/ld/testsuite/ld-i386/tlsdesc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.s
rename to ld/testsuite/ld-i386/tlsdesc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.sd b/ld/testsuite/ld-i386/tlsdesc.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.sd
rename to ld/testsuite/ld-i386/tlsdesc.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.td b/ld/testsuite/ld-i386/tlsdesc.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsdesc.td
rename to ld/testsuite/ld-i386/tlsdesc.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsg.s b/ld/testsuite/ld-i386/tlsg.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsg.s
rename to ld/testsuite/ld-i386/tlsg.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsg.sd b/ld/testsuite/ld-i386/tlsg.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsg.sd
rename to ld/testsuite/ld-i386/tlsg.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd1.dd b/ld/testsuite/ld-i386/tlsgd1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd1.dd
rename to ld/testsuite/ld-i386/tlsgd1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd1.s b/ld/testsuite/ld-i386/tlsgd1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd1.s
rename to ld/testsuite/ld-i386/tlsgd1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd2.d b/ld/testsuite/ld-i386/tlsgd2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd2.d
rename to ld/testsuite/ld-i386/tlsgd2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd2.s b/ld/testsuite/ld-i386/tlsgd2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgd2.s
rename to ld/testsuite/ld-i386/tlsgd2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgdesc.dd b/ld/testsuite/ld-i386/tlsgdesc.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgdesc.dd
rename to ld/testsuite/ld-i386/tlsgdesc.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgdesc.rd b/ld/testsuite/ld-i386/tlsgdesc.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgdesc.rd
rename to ld/testsuite/ld-i386/tlsgdesc.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgdesc.s b/ld/testsuite/ld-i386/tlsgdesc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsgdesc.s
rename to ld/testsuite/ld-i386/tlsgdesc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie1.dd b/ld/testsuite/ld-i386/tlsie1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie1.dd
rename to ld/testsuite/ld-i386/tlsie1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie1.s b/ld/testsuite/ld-i386/tlsie1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie1.s
rename to ld/testsuite/ld-i386/tlsie1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie2.d b/ld/testsuite/ld-i386/tlsie2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie2.d
rename to ld/testsuite/ld-i386/tlsie2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie2.s b/ld/testsuite/ld-i386/tlsie2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie2.s
rename to ld/testsuite/ld-i386/tlsie2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie3.d b/ld/testsuite/ld-i386/tlsie3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie3.d
rename to ld/testsuite/ld-i386/tlsie3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie3.s b/ld/testsuite/ld-i386/tlsie3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie3.s
rename to ld/testsuite/ld-i386/tlsie3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie4.d b/ld/testsuite/ld-i386/tlsie4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie4.d
rename to ld/testsuite/ld-i386/tlsie4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie4.s b/ld/testsuite/ld-i386/tlsie4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie4.s
rename to ld/testsuite/ld-i386/tlsie4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie5.d b/ld/testsuite/ld-i386/tlsie5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie5.d
rename to ld/testsuite/ld-i386/tlsie5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie5.s b/ld/testsuite/ld-i386/tlsie5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsie5.s
rename to ld/testsuite/ld-i386/tlsie5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsindntpoff.dd b/ld/testsuite/ld-i386/tlsindntpoff.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsindntpoff.dd
rename to ld/testsuite/ld-i386/tlsindntpoff.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsindntpoff.s b/ld/testsuite/ld-i386/tlsindntpoff.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsindntpoff.s
rename to ld/testsuite/ld-i386/tlsindntpoff.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsld1.dd b/ld/testsuite/ld-i386/tlsld1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsld1.dd
rename to ld/testsuite/ld-i386/tlsld1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsld1.s b/ld/testsuite/ld-i386/tlsld1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsld1.s
rename to ld/testsuite/ld-i386/tlsld1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlslib.s b/ld/testsuite/ld-i386/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlslib.s
rename to ld/testsuite/ld-i386/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic.dd b/ld/testsuite/ld-i386/tlsnopic.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic.dd
rename to ld/testsuite/ld-i386/tlsnopic.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic.rd
rename to ld/testsuite/ld-i386/tlsnopic.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic.sd b/ld/testsuite/ld-i386/tlsnopic.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic.sd
rename to ld/testsuite/ld-i386/tlsnopic.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic1.s b/ld/testsuite/ld-i386/tlsnopic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic1.s
rename to ld/testsuite/ld-i386/tlsnopic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic2.s b/ld/testsuite/ld-i386/tlsnopic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlsnopic2.s
rename to ld/testsuite/ld-i386/tlsnopic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.dd b/ld/testsuite/ld-i386/tlspic.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.dd
rename to ld/testsuite/ld-i386/tlspic.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.rd
rename to ld/testsuite/ld-i386/tlspic.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.sd b/ld/testsuite/ld-i386/tlspic.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.sd
rename to ld/testsuite/ld-i386/tlspic.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.td b/ld/testsuite/ld-i386/tlspic.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic.td
rename to ld/testsuite/ld-i386/tlspic.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic1.s b/ld/testsuite/ld-i386/tlspic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic1.s
rename to ld/testsuite/ld-i386/tlspic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic2.s b/ld/testsuite/ld-i386/tlspic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspic2.s
rename to ld/testsuite/ld-i386/tlspic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspie1.d b/ld/testsuite/ld-i386/tlspie1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspie1.d
rename to ld/testsuite/ld-i386/tlspie1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/tlspie1.s b/ld/testsuite/ld-i386/tlspie1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/tlspie1.s
rename to ld/testsuite/ld-i386/tlspie1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.dd b/ld/testsuite/ld-i386/vxworks1-lib.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.dd
rename to ld/testsuite/ld-i386/vxworks1-lib.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.nd b/ld/testsuite/ld-i386/vxworks1-lib.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.nd
rename to ld/testsuite/ld-i386/vxworks1-lib.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.rd b/ld/testsuite/ld-i386/vxworks1-lib.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.rd
rename to ld/testsuite/ld-i386/vxworks1-lib.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.s b/ld/testsuite/ld-i386/vxworks1-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.s
rename to ld/testsuite/ld-i386/vxworks1-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.td b/ld/testsuite/ld-i386/vxworks1-lib.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-lib.td
rename to ld/testsuite/ld-i386/vxworks1-lib.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-static.d b/ld/testsuite/ld-i386/vxworks1-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1-static.d
rename to ld/testsuite/ld-i386/vxworks1-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.dd b/ld/testsuite/ld-i386/vxworks1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.dd
rename to ld/testsuite/ld-i386/vxworks1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.ld b/ld/testsuite/ld-i386/vxworks1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.ld
rename to ld/testsuite/ld-i386/vxworks1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.rd b/ld/testsuite/ld-i386/vxworks1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.rd
rename to ld/testsuite/ld-i386/vxworks1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.s b/ld/testsuite/ld-i386/vxworks1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks1.s
rename to ld/testsuite/ld-i386/vxworks1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks2-static.sd b/ld/testsuite/ld-i386/vxworks2-static.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks2-static.sd
rename to ld/testsuite/ld-i386/vxworks2-static.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks2.s b/ld/testsuite/ld-i386/vxworks2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks2.s
rename to ld/testsuite/ld-i386/vxworks2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks2.sd b/ld/testsuite/ld-i386/vxworks2.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/vxworks2.sd
rename to ld/testsuite/ld-i386/vxworks2.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/warn1.d b/ld/testsuite/ld-i386/warn1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/warn1.d
rename to ld/testsuite/ld-i386/warn1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/warn1.s b/ld/testsuite/ld-i386/warn1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/warn1.s
rename to ld/testsuite/ld-i386/warn1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-i386/zero.s b/ld/testsuite/ld-i386/zero.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-i386/zero.s
rename to ld/testsuite/ld-i386/zero.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/ia64.exp b/ld/testsuite/ld-ia64/ia64.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/ia64.exp
rename to ld/testsuite/ld-ia64/ia64.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/line.exp b/ld/testsuite/ld-ia64/line.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/line.exp
rename to ld/testsuite/ld-ia64/line.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/link-order.d b/ld/testsuite/ld-ia64/link-order.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/link-order.d
rename to ld/testsuite/ld-ia64/link-order.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/local1.d b/ld/testsuite/ld-ia64/local1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/local1.d
rename to ld/testsuite/ld-ia64/local1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/local1.map b/ld/testsuite/ld-ia64/local1.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/local1.map
rename to ld/testsuite/ld-ia64/local1.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/local1.s b/ld/testsuite/ld-ia64/local1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/local1.s
rename to ld/testsuite/ld-ia64/local1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge1.d b/ld/testsuite/ld-ia64/merge1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge1.d
rename to ld/testsuite/ld-ia64/merge1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge1.s b/ld/testsuite/ld-ia64/merge1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge1.s
rename to ld/testsuite/ld-ia64/merge1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge2.d b/ld/testsuite/ld-ia64/merge2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge2.d
rename to ld/testsuite/ld-ia64/merge2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge2.s b/ld/testsuite/ld-ia64/merge2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge2.s
rename to ld/testsuite/ld-ia64/merge2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge3.d b/ld/testsuite/ld-ia64/merge3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge3.d
rename to ld/testsuite/ld-ia64/merge3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge3.s b/ld/testsuite/ld-ia64/merge3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge3.s
rename to ld/testsuite/ld-ia64/merge3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge4.d b/ld/testsuite/ld-ia64/merge4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge4.d
rename to ld/testsuite/ld-ia64/merge4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge4.s b/ld/testsuite/ld-ia64/merge4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge4.s
rename to ld/testsuite/ld-ia64/merge4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge5.d b/ld/testsuite/ld-ia64/merge5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge5.d
rename to ld/testsuite/ld-ia64/merge5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/merge5.s b/ld/testsuite/ld-ia64/merge5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/merge5.s
rename to ld/testsuite/ld-ia64/merge5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.dd b/ld/testsuite/ld-ia64/tlsbin.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.dd
rename to ld/testsuite/ld-ia64/tlsbin.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.rd
rename to ld/testsuite/ld-ia64/tlsbin.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.s b/ld/testsuite/ld-ia64/tlsbin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.s
rename to ld/testsuite/ld-ia64/tlsbin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.sd b/ld/testsuite/ld-ia64/tlsbin.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.sd
rename to ld/testsuite/ld-ia64/tlsbin.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.td b/ld/testsuite/ld-ia64/tlsbin.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbin.td
rename to ld/testsuite/ld-ia64/tlsbin.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbinpic.s b/ld/testsuite/ld-ia64/tlsbinpic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsbinpic.s
rename to ld/testsuite/ld-ia64/tlsbinpic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsg.s b/ld/testsuite/ld-ia64/tlsg.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsg.s
rename to ld/testsuite/ld-ia64/tlsg.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsg.sd b/ld/testsuite/ld-ia64/tlsg.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlsg.sd
rename to ld/testsuite/ld-ia64/tlsg.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlslib.s b/ld/testsuite/ld-ia64/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlslib.s
rename to ld/testsuite/ld-ia64/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.dd b/ld/testsuite/ld-ia64/tlspic.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.dd
rename to ld/testsuite/ld-ia64/tlspic.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.rd
rename to ld/testsuite/ld-ia64/tlspic.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.sd b/ld/testsuite/ld-ia64/tlspic.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.sd
rename to ld/testsuite/ld-ia64/tlspic.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.td b/ld/testsuite/ld-ia64/tlspic.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic.td
rename to ld/testsuite/ld-ia64/tlspic.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic1.s b/ld/testsuite/ld-ia64/tlspic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic1.s
rename to ld/testsuite/ld-ia64/tlspic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic2.s b/ld/testsuite/ld-ia64/tlspic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/tlspic2.s
rename to ld/testsuite/ld-ia64/tlspic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ia64/undefined.s b/ld/testsuite/ld-ia64/undefined.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ia64/undefined.s
rename to ld/testsuite/ld-ia64/undefined.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/binutils.exp b/ld/testsuite/ld-ifunc/binutils.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/binutils.exp
rename to ld/testsuite/ld-ifunc/binutils.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d b/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-local-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-1-local-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-local-x86.s b/ld/testsuite/ld-ifunc/ifunc-1-local-x86.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-local-x86.s
rename to ld/testsuite/ld-ifunc/ifunc-1-local-x86.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-x86.d b/ld/testsuite/ld-ifunc/ifunc-1-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-1-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-x86.s b/ld/testsuite/ld-ifunc/ifunc-1-x86.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-1-x86.s
rename to ld/testsuite/ld-ifunc/ifunc-1-x86.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-i386.d b/ld/testsuite/ld-ifunc/ifunc-10-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-10-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-i386.s b/ld/testsuite/ld-ifunc/ifunc-10-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-10-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-10-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-10-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-10-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-10-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-10-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-i386.d b/ld/testsuite/ld-ifunc/ifunc-11-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-11-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-i386.s b/ld/testsuite/ld-ifunc/ifunc-11-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-11-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-11-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-11-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-11-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-11-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-11-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-i386.d b/ld/testsuite/ld-ifunc/ifunc-12-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-12-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-i386.s b/ld/testsuite/ld-ifunc/ifunc-12-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-12-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-12-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-12-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-12-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-i386.d b/ld/testsuite/ld-ifunc/ifunc-13-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-13-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-i386.s b/ld/testsuite/ld-ifunc/ifunc-13a-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-13a-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-13a-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13a-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-13a-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-i386.s b/ld/testsuite/ld-ifunc/ifunc-13b-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-13b-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-13b-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-13b-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-13b-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-i386.d b/ld/testsuite/ld-ifunc/ifunc-2-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-2-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-i386.s b/ld/testsuite/ld-ifunc/ifunc-2-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-2-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-2-local-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-i386.s b/ld/testsuite/ld-ifunc/ifunc-2-local-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-2-local-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-2-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-2-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-3-x86.s b/ld/testsuite/ld-ifunc/ifunc-3-x86.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-3-x86.s
rename to ld/testsuite/ld-ifunc/ifunc-3-x86.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-3a-x86.d b/ld/testsuite/ld-ifunc/ifunc-3a-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-3a-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-3a-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-3b-x86.d b/ld/testsuite/ld-ifunc/ifunc-3b-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-3b-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-3b-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-local-x86.d b/ld/testsuite/ld-ifunc/ifunc-4-local-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-local-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-4-local-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-local-x86.s b/ld/testsuite/ld-ifunc/ifunc-4-local-x86.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-local-x86.s
rename to ld/testsuite/ld-ifunc/ifunc-4-local-x86.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-x86.d b/ld/testsuite/ld-ifunc/ifunc-4-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-4-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-x86.s b/ld/testsuite/ld-ifunc/ifunc-4-x86.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4-x86.s
rename to ld/testsuite/ld-ifunc/ifunc-4-x86.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4a-x86.d b/ld/testsuite/ld-ifunc/ifunc-4a-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-4a-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-4a-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-i386.s b/ld/testsuite/ld-ifunc/ifunc-5-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-5-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-local-i386.s b/ld/testsuite/ld-ifunc/ifunc-5-local-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-local-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-5-local-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-local-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-5-local-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-local-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-5-local-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-5-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-5-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-i386.d b/ld/testsuite/ld-ifunc/ifunc-5a-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-5a-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-i386.d b/ld/testsuite/ld-ifunc/ifunc-5b-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-5b-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6-i386.s b/ld/testsuite/ld-ifunc/ifunc-6-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-6-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-6-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-6-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6a-i386.d b/ld/testsuite/ld-ifunc/ifunc-6a-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6a-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-6a-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6b-i386.d b/ld/testsuite/ld-ifunc/ifunc-6b-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6b-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-6b-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7-i386.s b/ld/testsuite/ld-ifunc/ifunc-7-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-7-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-7-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-7-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7a-i386.d b/ld/testsuite/ld-ifunc/ifunc-7a-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7a-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-7a-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7b-i386.d b/ld/testsuite/ld-ifunc/ifunc-7b-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7b-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-7b-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8-i386.d b/ld/testsuite/ld-ifunc/ifunc-8-i386.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8-i386.d
rename to ld/testsuite/ld-ifunc/ifunc-8-i386.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
rename to ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8a-i386.s b/ld/testsuite/ld-ifunc/ifunc-8a-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8a-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-8a-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8b-i386.s b/ld/testsuite/ld-ifunc/ifunc-8b-i386.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8b-i386.s
rename to ld/testsuite/ld-ifunc/ifunc-8b-i386.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s b/ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s
rename to ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-9-x86.d b/ld/testsuite/ld-ifunc/ifunc-9-x86.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-9-x86.d
rename to ld/testsuite/ld-ifunc/ifunc-9-x86.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-9-x86.s b/ld/testsuite/ld-ifunc/ifunc-9-x86.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc-9-x86.s
rename to ld/testsuite/ld-ifunc/ifunc-9-x86.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/ifunc.exp
rename to ld/testsuite/ld-ifunc/ifunc.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/lib.c b/ld/testsuite/ld-ifunc/lib.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/lib.c
rename to ld/testsuite/ld-ifunc/lib.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/prog.c b/ld/testsuite/ld-ifunc/prog.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/prog.c
rename to ld/testsuite/ld-ifunc/prog.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/test-1.c b/ld/testsuite/ld-ifunc/test-1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/test-1.c
rename to ld/testsuite/ld-ifunc/test-1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-ifunc/test-2.c b/ld/testsuite/ld-ifunc/test-2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-ifunc/test-2.c
rename to ld/testsuite/ld-ifunc/test-2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-libs/lib-1.s b/ld/testsuite/ld-libs/lib-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-libs/lib-1.s
rename to ld/testsuite/ld-libs/lib-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-libs/lib-2.d b/ld/testsuite/ld-libs/lib-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-libs/lib-2.d
rename to ld/testsuite/ld-libs/lib-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-libs/lib-2.s b/ld/testsuite/ld-libs/lib-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-libs/lib-2.s
rename to ld/testsuite/ld-libs/lib-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-libs/libs.exp b/ld/testsuite/ld-libs/libs.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-libs/libs.exp
rename to ld/testsuite/ld-libs/libs.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-linkonce/linkonce.exp b/ld/testsuite/ld-linkonce/linkonce.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-linkonce/linkonce.exp
rename to ld/testsuite/ld-linkonce/linkonce.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-linkonce/x.s b/ld/testsuite/ld-linkonce/x.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-linkonce/x.s
rename to ld/testsuite/ld-linkonce/x.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-linkonce/y.s b/ld/testsuite/ld-linkonce/y.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-linkonce/y.s
rename to ld/testsuite/ld-linkonce/y.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-linkonce/zeroeh.ld
rename to ld/testsuite/ld-linkonce/zeroeh.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-linkonce/zeroehl32.d b/ld/testsuite/ld-linkonce/zeroehl32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-linkonce/zeroehl32.d
rename to ld/testsuite/ld-linkonce/zeroehl32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-brset.d b/ld/testsuite/ld-m68hc11/adj-brset.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-brset.d
rename to ld/testsuite/ld-m68hc11/adj-brset.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-brset.s b/ld/testsuite/ld-m68hc11/adj-brset.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-brset.s
rename to ld/testsuite/ld-m68hc11/adj-brset.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-jump.d b/ld/testsuite/ld-m68hc11/adj-jump.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-jump.d
rename to ld/testsuite/ld-m68hc11/adj-jump.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-jump.s b/ld/testsuite/ld-m68hc11/adj-jump.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/adj-jump.s
rename to ld/testsuite/ld-m68hc11/adj-jump.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1403.d b/ld/testsuite/ld-m68hc11/bug-1403.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1403.d
rename to ld/testsuite/ld-m68hc11/bug-1403.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1403.s b/ld/testsuite/ld-m68hc11/bug-1403.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1403.s
rename to ld/testsuite/ld-m68hc11/bug-1403.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1417.d b/ld/testsuite/ld-m68hc11/bug-1417.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1417.d
rename to ld/testsuite/ld-m68hc11/bug-1417.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1417.s b/ld/testsuite/ld-m68hc11/bug-1417.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-1417.s
rename to ld/testsuite/ld-m68hc11/bug-1417.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-3331.d b/ld/testsuite/ld-m68hc11/bug-3331.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-3331.d
rename to ld/testsuite/ld-m68hc11/bug-3331.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-3331.s b/ld/testsuite/ld-m68hc11/bug-3331.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/bug-3331.s
rename to ld/testsuite/ld-m68hc11/bug-3331.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc11.d b/ld/testsuite/ld-m68hc11/far-hc11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc11.d
rename to ld/testsuite/ld-m68hc11/far-hc11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc11.s b/ld/testsuite/ld-m68hc11/far-hc11.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc11.s
rename to ld/testsuite/ld-m68hc11/far-hc11.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc12.d b/ld/testsuite/ld-m68hc11/far-hc12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc12.d
rename to ld/testsuite/ld-m68hc11/far-hc12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc12.ld b/ld/testsuite/ld-m68hc11/far-hc12.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc12.ld
rename to ld/testsuite/ld-m68hc11/far-hc12.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc12.s b/ld/testsuite/ld-m68hc11/far-hc12.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/far-hc12.s
rename to ld/testsuite/ld-m68hc11/far-hc12.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/link-hc12.s b/ld/testsuite/ld-m68hc11/link-hc12.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/link-hc12.s
rename to ld/testsuite/ld-m68hc11/link-hc12.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/link-hcs12.d b/ld/testsuite/ld-m68hc11/link-hcs12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/link-hcs12.d
rename to ld/testsuite/ld-m68hc11/link-hcs12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/link-hcs12.s b/ld/testsuite/ld-m68hc11/link-hcs12.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/link-hcs12.s
rename to ld/testsuite/ld-m68hc11/link-hcs12.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/m68hc11.exp b/ld/testsuite/ld-m68hc11/m68hc11.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/m68hc11.exp
rename to ld/testsuite/ld-m68hc11/m68hc11.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-direct.d b/ld/testsuite/ld-m68hc11/relax-direct.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-direct.d
rename to ld/testsuite/ld-m68hc11/relax-direct.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-direct.s b/ld/testsuite/ld-m68hc11/relax-direct.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-direct.s
rename to ld/testsuite/ld-m68hc11/relax-direct.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-group.d b/ld/testsuite/ld-m68hc11/relax-group.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-group.d
rename to ld/testsuite/ld-m68hc11/relax-group.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-group.s b/ld/testsuite/ld-m68hc11/relax-group.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68hc11/relax-group.s
rename to ld/testsuite/ld-m68hc11/relax-group.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-1.d b/ld/testsuite/ld-m68k/got-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-1.d
rename to ld/testsuite/ld-m68k/got-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-1.s b/ld/testsuite/ld-m68k/got-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-1.s
rename to ld/testsuite/ld-m68k/got-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d b/ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d
rename to ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-multigot-14-ok.d b/ld/testsuite/ld-m68k/got-multigot-14-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-multigot-14-ok.d
rename to ld/testsuite/ld-m68k/got-multigot-14-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-multigot-15-er.d b/ld/testsuite/ld-m68k/got-multigot-15-er.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-multigot-15-er.d
rename to ld/testsuite/ld-m68k/got-multigot-15-er.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d b/ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d
rename to ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-12-13-14-35-er.d b/ld/testsuite/ld-m68k/got-negative-12-13-14-35-er.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-12-13-14-35-er.d
rename to ld/testsuite/ld-m68k/got-negative-12-13-14-35-er.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-14-ok.d b/ld/testsuite/ld-m68k/got-negative-14-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-14-ok.d
rename to ld/testsuite/ld-m68k/got-negative-14-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-15-er.d b/ld/testsuite/ld-m68k/got-negative-15-er.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-negative-15-er.d
rename to ld/testsuite/ld-m68k/got-negative-15-er.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-single-12-ok.d b/ld/testsuite/ld-m68k/got-single-12-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-single-12-ok.d
rename to ld/testsuite/ld-m68k/got-single-12-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-single-13-er.d b/ld/testsuite/ld-m68k/got-single-13-er.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-single-13-er.d
rename to ld/testsuite/ld-m68k/got-single-13-er.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-xgot-12-13-14-15-34-35-ok.d b/ld/testsuite/ld-m68k/got-xgot-12-13-14-15-34-35-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-xgot-12-13-14-15-34-35-ok.d
rename to ld/testsuite/ld-m68k/got-xgot-12-13-14-15-34-35-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/got-xgot-15-ok.d b/ld/testsuite/ld-m68k/got-xgot-15-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/got-xgot-15-ok.d
rename to ld/testsuite/ld-m68k/got-xgot-15-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa-mac.d b/ld/testsuite/ld-m68k/isaa-mac.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa-mac.d
rename to ld/testsuite/ld-m68k/isaa-mac.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa-mac.s b/ld/testsuite/ld-m68k/isaa-mac.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa-mac.s
rename to ld/testsuite/ld-m68k/isaa-mac.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa-nodiv.s b/ld/testsuite/ld-m68k/isaa-nodiv.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa-nodiv.s
rename to ld/testsuite/ld-m68k/isaa-nodiv.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa.d b/ld/testsuite/ld-m68k/isaa.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa.d
rename to ld/testsuite/ld-m68k/isaa.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa.s b/ld/testsuite/ld-m68k/isaa.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isaa.s
rename to ld/testsuite/ld-m68k/isaa.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isaaplus.d b/ld/testsuite/ld-m68k/isaaplus.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isaaplus.d
rename to ld/testsuite/ld-m68k/isaaplus.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isaaplus.s b/ld/testsuite/ld-m68k/isaaplus.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isaaplus.s
rename to ld/testsuite/ld-m68k/isaaplus.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isab-float.d b/ld/testsuite/ld-m68k/isab-float.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isab-float.d
rename to ld/testsuite/ld-m68k/isab-float.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isab-float.s b/ld/testsuite/ld-m68k/isab-float.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isab-float.s
rename to ld/testsuite/ld-m68k/isab-float.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isab-nousp.s b/ld/testsuite/ld-m68k/isab-nousp.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isab-nousp.s
rename to ld/testsuite/ld-m68k/isab-nousp.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isab.d b/ld/testsuite/ld-m68k/isab.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isab.d
rename to ld/testsuite/ld-m68k/isab.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/isab.s b/ld/testsuite/ld-m68k/isab.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/isab.s
rename to ld/testsuite/ld-m68k/isab.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/m68k-got.exp b/ld/testsuite/ld-m68k/m68k-got.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/m68k-got.exp
rename to ld/testsuite/ld-m68k/m68k-got.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/m68k.exp b/ld/testsuite/ld-m68k/m68k.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/m68k.exp
rename to ld/testsuite/ld-m68k/m68k.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1a.d b/ld/testsuite/ld-m68k/merge-error-1a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1a.d
rename to ld/testsuite/ld-m68k/merge-error-1a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1a.s b/ld/testsuite/ld-m68k/merge-error-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1a.s
rename to ld/testsuite/ld-m68k/merge-error-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1b.d b/ld/testsuite/ld-m68k/merge-error-1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1b.d
rename to ld/testsuite/ld-m68k/merge-error-1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1b.s b/ld/testsuite/ld-m68k/merge-error-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1b.s
rename to ld/testsuite/ld-m68k/merge-error-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1c.d b/ld/testsuite/ld-m68k/merge-error-1c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1c.d
rename to ld/testsuite/ld-m68k/merge-error-1c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1d.d b/ld/testsuite/ld-m68k/merge-error-1d.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1d.d
rename to ld/testsuite/ld-m68k/merge-error-1d.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1e.d b/ld/testsuite/ld-m68k/merge-error-1e.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-error-1e.d
rename to ld/testsuite/ld-m68k/merge-error-1e.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-ok-1a.d b/ld/testsuite/ld-m68k/merge-ok-1a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-ok-1a.d
rename to ld/testsuite/ld-m68k/merge-ok-1a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-ok-1b.d b/ld/testsuite/ld-m68k/merge-ok-1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-ok-1b.d
rename to ld/testsuite/ld-m68k/merge-ok-1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-ok-1c.d b/ld/testsuite/ld-m68k/merge-ok-1c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge-ok-1c.d
rename to ld/testsuite/ld-m68k/merge-ok-1c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/merge.ld b/ld/testsuite/ld-m68k/merge.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/merge.ld
rename to ld/testsuite/ld-m68k/merge.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-68020.d b/ld/testsuite/ld-m68k/plt1-68020.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-68020.d
rename to ld/testsuite/ld-m68k/plt1-68020.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-cpu32.d b/ld/testsuite/ld-m68k/plt1-cpu32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-cpu32.d
rename to ld/testsuite/ld-m68k/plt1-cpu32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-empty.s b/ld/testsuite/ld-m68k/plt1-empty.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-empty.s
rename to ld/testsuite/ld-m68k/plt1-empty.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-isab.d b/ld/testsuite/ld-m68k/plt1-isab.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-isab.d
rename to ld/testsuite/ld-m68k/plt1-isab.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-isac.d b/ld/testsuite/ld-m68k/plt1-isac.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1-isac.d
rename to ld/testsuite/ld-m68k/plt1-isac.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1.ld b/ld/testsuite/ld-m68k/plt1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1.ld
rename to ld/testsuite/ld-m68k/plt1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1.s b/ld/testsuite/ld-m68k/plt1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/plt1.s
rename to ld/testsuite/ld-m68k/plt1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-def-1.d b/ld/testsuite/ld-m68k/tls-def-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-def-1.d
rename to ld/testsuite/ld-m68k/tls-def-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-def-1.s b/ld/testsuite/ld-m68k/tls-def-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-def-1.s
rename to ld/testsuite/ld-m68k/tls-def-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.d b/ld/testsuite/ld-m68k/tls-gd-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.d
rename to ld/testsuite/ld-m68k/tls-gd-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.d2 b/ld/testsuite/ld-m68k/tls-gd-1.d2
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.d2
rename to ld/testsuite/ld-m68k/tls-gd-1.d2
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.d3 b/ld/testsuite/ld-m68k/tls-gd-1.d3
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.d3
rename to ld/testsuite/ld-m68k/tls-gd-1.d3
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.s b/ld/testsuite/ld-m68k/tls-gd-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-1.s
rename to ld/testsuite/ld-m68k/tls-gd-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-2.d b/ld/testsuite/ld-m68k/tls-gd-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-2.d
rename to ld/testsuite/ld-m68k/tls-gd-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-2.s b/ld/testsuite/ld-m68k/tls-gd-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-2.s
rename to ld/testsuite/ld-m68k/tls-gd-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-ie-1.d b/ld/testsuite/ld-m68k/tls-gd-ie-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-ie-1.d
rename to ld/testsuite/ld-m68k/tls-gd-ie-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-ie-1.s b/ld/testsuite/ld-m68k/tls-gd-ie-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-gd-ie-1.s
rename to ld/testsuite/ld-m68k/tls-gd-ie-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ie-1.d b/ld/testsuite/ld-m68k/tls-ie-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ie-1.d
rename to ld/testsuite/ld-m68k/tls-ie-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ie-1.s b/ld/testsuite/ld-m68k/tls-ie-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ie-1.s
rename to ld/testsuite/ld-m68k/tls-ie-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-1.d b/ld/testsuite/ld-m68k/tls-ld-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-1.d
rename to ld/testsuite/ld-m68k/tls-ld-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-1.s b/ld/testsuite/ld-m68k/tls-ld-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-1.s
rename to ld/testsuite/ld-m68k/tls-ld-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-2.d b/ld/testsuite/ld-m68k/tls-ld-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-2.d
rename to ld/testsuite/ld-m68k/tls-ld-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-2.s b/ld/testsuite/ld-m68k/tls-ld-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-ld-2.s
rename to ld/testsuite/ld-m68k/tls-ld-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-le-1.s b/ld/testsuite/ld-m68k/tls-le-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-le-1.s
rename to ld/testsuite/ld-m68k/tls-le-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-main-1.d b/ld/testsuite/ld-m68k/tls-main-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-main-1.d
rename to ld/testsuite/ld-m68k/tls-main-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-main-1.s b/ld/testsuite/ld-m68k/tls-main-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-main-1.s
rename to ld/testsuite/ld-m68k/tls-main-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-no-1.s b/ld/testsuite/ld-m68k/tls-no-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-m68k/tls-no-1.s
rename to ld/testsuite/ld-m68k/tls-no-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mep/mep.exp b/ld/testsuite/ld-mep/mep.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mep/mep.exp
rename to ld/testsuite/ld-mep/mep.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mep/mep1.ld b/ld/testsuite/ld-mep/mep1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mep/mep1.ld
rename to ld/testsuite/ld-mep/mep1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mep/mep1.s b/ld/testsuite/ld-mep/mep1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mep/mep1.s
rename to ld/testsuite/ld-mep/mep1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-0.s b/ld/testsuite/ld-mips-elf/attr-gnu-4-0.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-0.s
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-0.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-00.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-00.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-00.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-00.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-01.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-02.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-03.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-03.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-03.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-03.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-04.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-04.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-04.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-04.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-1.s b/ld/testsuite/ld-mips-elf/attr-gnu-4-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-1.s
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-11.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-2.s b/ld/testsuite/ld-mips-elf/attr-gnu-4-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-2.s
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-20.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-22.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-3.s b/ld/testsuite/ld-mips-elf/attr-gnu-4-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-3.s
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-30.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-30.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-30.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-30.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-33.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-33.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-33.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-33.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-4.s b/ld/testsuite/ld-mips-elf/attr-gnu-4-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-4.s
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-40.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-40.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-40.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-40.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-44.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-44.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-44.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-44.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-5.s b/ld/testsuite/ld-mips-elf/attr-gnu-4-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-5.s
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
rename to ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/branch-misc-1.d b/ld/testsuite/ld-mips-elf/branch-misc-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/branch-misc-1.d
rename to ld/testsuite/ld-mips-elf/branch-misc-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/dyn-sec64.d b/ld/testsuite/ld-mips-elf/dyn-sec64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/dyn-sec64.d
rename to ld/testsuite/ld-mips-elf/dyn-sec64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/dyn-sec64.ld b/ld/testsuite/ld-mips-elf/dyn-sec64.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/dyn-sec64.ld
rename to ld/testsuite/ld-mips-elf/dyn-sec64.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/dyn-sec64.s b/ld/testsuite/ld-mips-elf/dyn-sec64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/dyn-sec64.s
rename to ld/testsuite/ld-mips-elf/dyn-sec64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1-n32.d b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
rename to ld/testsuite/ld-mips-elf/eh-frame1-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
rename to ld/testsuite/ld-mips-elf/eh-frame1-n64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1.ld b/ld/testsuite/ld-mips-elf/eh-frame1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1.ld
rename to ld/testsuite/ld-mips-elf/eh-frame1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1.s b/ld/testsuite/ld-mips-elf/eh-frame1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame1.s
rename to ld/testsuite/ld-mips-elf/eh-frame1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame2-n32.d b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
rename to ld/testsuite/ld-mips-elf/eh-frame2-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
rename to ld/testsuite/ld-mips-elf/eh-frame2-n64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame3.d b/ld/testsuite/ld-mips-elf/eh-frame3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame3.d
rename to ld/testsuite/ld-mips-elf/eh-frame3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame4.d b/ld/testsuite/ld-mips-elf/eh-frame4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame4.d
rename to ld/testsuite/ld-mips-elf/eh-frame4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame5.d b/ld/testsuite/ld-mips-elf/eh-frame5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame5.d
rename to ld/testsuite/ld-mips-elf/eh-frame5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame5.ld b/ld/testsuite/ld-mips-elf/eh-frame5.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame5.ld
rename to ld/testsuite/ld-mips-elf/eh-frame5.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame5.s b/ld/testsuite/ld-mips-elf/eh-frame5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/eh-frame5.s
rename to ld/testsuite/ld-mips-elf/eh-frame5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
rename to ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
rename to ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
rename to ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
rename to ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
rename to ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
rename to ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1.d b/ld/testsuite/ld-mips-elf/emit-relocs-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1.d
rename to ld/testsuite/ld-mips-elf/emit-relocs-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1.ld b/ld/testsuite/ld-mips-elf/emit-relocs-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1.ld
rename to ld/testsuite/ld-mips-elf/emit-relocs-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1a.s b/ld/testsuite/ld-mips-elf/emit-relocs-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1a.s
rename to ld/testsuite/ld-mips-elf/emit-relocs-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1b.s b/ld/testsuite/ld-mips-elf/emit-relocs-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/emit-relocs-1b.s
rename to ld/testsuite/ld-mips-elf/emit-relocs-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-1.d b/ld/testsuite/ld-mips-elf/got-dump-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-1.d
rename to ld/testsuite/ld-mips-elf/got-dump-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-1.ld b/ld/testsuite/ld-mips-elf/got-dump-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-1.ld
rename to ld/testsuite/ld-mips-elf/got-dump-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-1.s b/ld/testsuite/ld-mips-elf/got-dump-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-1.s
rename to ld/testsuite/ld-mips-elf/got-dump-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-2.d b/ld/testsuite/ld-mips-elf/got-dump-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-2.d
rename to ld/testsuite/ld-mips-elf/got-dump-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-2.ld b/ld/testsuite/ld-mips-elf/got-dump-2.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-2.ld
rename to ld/testsuite/ld-mips-elf/got-dump-2.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-2.s b/ld/testsuite/ld-mips-elf/got-dump-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-dump-2.s
rename to ld/testsuite/ld-mips-elf/got-dump-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-1.d b/ld/testsuite/ld-mips-elf/got-page-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-1.d
rename to ld/testsuite/ld-mips-elf/got-page-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-1.ld b/ld/testsuite/ld-mips-elf/got-page-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-1.ld
rename to ld/testsuite/ld-mips-elf/got-page-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-1.s b/ld/testsuite/ld-mips-elf/got-page-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-1.s
rename to ld/testsuite/ld-mips-elf/got-page-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-2.d b/ld/testsuite/ld-mips-elf/got-page-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-2.d
rename to ld/testsuite/ld-mips-elf/got-page-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-2.s b/ld/testsuite/ld-mips-elf/got-page-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-2.s
rename to ld/testsuite/ld-mips-elf/got-page-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3.d b/ld/testsuite/ld-mips-elf/got-page-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3.d
rename to ld/testsuite/ld-mips-elf/got-page-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3a.s b/ld/testsuite/ld-mips-elf/got-page-3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3a.s
rename to ld/testsuite/ld-mips-elf/got-page-3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3b.s b/ld/testsuite/ld-mips-elf/got-page-3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3b.s
rename to ld/testsuite/ld-mips-elf/got-page-3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3c.s b/ld/testsuite/ld-mips-elf/got-page-3c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-page-3c.s
rename to ld/testsuite/ld-mips-elf/got-page-3c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.dd b/ld/testsuite/ld-mips-elf/got-vers-1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.dd
rename to ld/testsuite/ld-mips-elf/got-vers-1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.rd b/ld/testsuite/ld-mips-elf/got-vers-1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.rd
rename to ld/testsuite/ld-mips-elf/got-vers-1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.sd b/ld/testsuite/ld-mips-elf/got-vers-1.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.sd
rename to ld/testsuite/ld-mips-elf/got-vers-1.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.ver b/ld/testsuite/ld-mips-elf/got-vers-1.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1.ver
rename to ld/testsuite/ld-mips-elf/got-vers-1.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1a.s b/ld/testsuite/ld-mips-elf/got-vers-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1a.s
rename to ld/testsuite/ld-mips-elf/got-vers-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1b.s b/ld/testsuite/ld-mips-elf/got-vers-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/got-vers-1b.s
rename to ld/testsuite/ld-mips-elf/got-vers-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1.s b/ld/testsuite/ld-mips-elf/hash1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1.s
rename to ld/testsuite/ld-mips-elf/hash1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1a.d b/ld/testsuite/ld-mips-elf/hash1a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1a.d
rename to ld/testsuite/ld-mips-elf/hash1a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1b.d b/ld/testsuite/ld-mips-elf/hash1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1b.d
rename to ld/testsuite/ld-mips-elf/hash1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1c.d b/ld/testsuite/ld-mips-elf/hash1c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/hash1c.d
rename to ld/testsuite/ld-mips-elf/hash1c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jalbal.d b/ld/testsuite/ld-mips-elf/jalbal.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jalbal.d
rename to ld/testsuite/ld-mips-elf/jalbal.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jalbal.s b/ld/testsuite/ld-mips-elf/jalbal.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jalbal.s
rename to ld/testsuite/ld-mips-elf/jalbal.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow-2.d b/ld/testsuite/ld-mips-elf/jaloverflow-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow-2.d
rename to ld/testsuite/ld-mips-elf/jaloverflow-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow-2.s b/ld/testsuite/ld-mips-elf/jaloverflow-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow-2.s
rename to ld/testsuite/ld-mips-elf/jaloverflow-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow.d b/ld/testsuite/ld-mips-elf/jaloverflow.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow.d
rename to ld/testsuite/ld-mips-elf/jaloverflow.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow.s b/ld/testsuite/ld-mips-elf/jaloverflow.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jaloverflow.s
rename to ld/testsuite/ld-mips-elf/jaloverflow.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-1.d b/ld/testsuite/ld-mips-elf/jr-to-b-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-1.d
rename to ld/testsuite/ld-mips-elf/jr-to-b-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-1.s b/ld/testsuite/ld-mips-elf/jr-to-b-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-1.s
rename to ld/testsuite/ld-mips-elf/jr-to-b-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-2.d b/ld/testsuite/ld-mips-elf/jr-to-b-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-2.d
rename to ld/testsuite/ld-mips-elf/jr-to-b-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-2.s b/ld/testsuite/ld-mips-elf/jr-to-b-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr-to-b-2.s
rename to ld/testsuite/ld-mips-elf/jr-to-b-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr.s b/ld/testsuite/ld-mips-elf/jr.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/jr.s
rename to ld/testsuite/ld-mips-elf/jr.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-dyn.ld b/ld/testsuite/ld-mips-elf/mips-dyn.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-dyn.ld
rename to ld/testsuite/ld-mips-elf/mips-dyn.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-elf-flags.exp b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-elf-flags.exp
rename to ld/testsuite/ld-mips-elf/mips-elf-flags.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-elf.exp
rename to ld/testsuite/ld-mips-elf/mips-elf.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-lib.ld b/ld/testsuite/ld-mips-elf/mips-lib.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips-lib.ld
rename to ld/testsuite/ld-mips-elf/mips-lib.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-1.d b/ld/testsuite/ld-mips-elf/mips16-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-1.d
rename to ld/testsuite/ld-mips-elf/mips16-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-1a.s b/ld/testsuite/ld-mips-elf/mips16-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-1a.s
rename to ld/testsuite/ld-mips-elf/mips16-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-1b.s b/ld/testsuite/ld-mips-elf/mips16-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-1b.s
rename to ld/testsuite/ld-mips-elf/mips16-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global-1.s b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global-1.s
rename to ld/testsuite/ld-mips-elf/mips16-call-global-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global-2.s b/ld/testsuite/ld-mips-elf/mips16-call-global-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global-2.s
rename to ld/testsuite/ld-mips-elf/mips16-call-global-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global-3.s b/ld/testsuite/ld-mips-elf/mips16-call-global-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global-3.s
rename to ld/testsuite/ld-mips-elf/mips16-call-global-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global.d b/ld/testsuite/ld-mips-elf/mips16-call-global.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-call-global.d
rename to ld/testsuite/ld-mips-elf/mips16-call-global.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d b/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
rename to ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo.d b/ld/testsuite/ld-mips-elf/mips16-hilo.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo.d
rename to ld/testsuite/ld-mips-elf/mips16-hilo.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo.ld b/ld/testsuite/ld-mips-elf/mips16-hilo.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo.ld
rename to ld/testsuite/ld-mips-elf/mips16-hilo.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo.s b/ld/testsuite/ld-mips-elf/mips16-hilo.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-hilo.s
rename to ld/testsuite/ld-mips-elf/mips16-hilo.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-intermix-1.s b/ld/testsuite/ld-mips-elf/mips16-intermix-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-intermix-1.s
rename to ld/testsuite/ld-mips-elf/mips16-intermix-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-intermix-2.s b/ld/testsuite/ld-mips-elf/mips16-intermix-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-intermix-2.s
rename to ld/testsuite/ld-mips-elf/mips16-intermix-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-intermix.d b/ld/testsuite/ld-mips-elf/mips16-intermix.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-intermix.d
rename to ld/testsuite/ld-mips-elf/mips16-intermix.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-local-stubs-1.d b/ld/testsuite/ld-mips-elf/mips16-local-stubs-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-local-stubs-1.d
rename to ld/testsuite/ld-mips-elf/mips16-local-stubs-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-local-stubs-1.s b/ld/testsuite/ld-mips-elf/mips16-local-stubs-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-local-stubs-1.s
rename to ld/testsuite/ld-mips-elf/mips16-local-stubs-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1-dummy.s b/ld/testsuite/ld-mips-elf/mips16-pic-1-dummy.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1-dummy.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-1-dummy.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.dd b/ld/testsuite/ld-mips-elf/mips16-pic-1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.dd
rename to ld/testsuite/ld-mips-elf/mips16-pic-1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.gd b/ld/testsuite/ld-mips-elf/mips16-pic-1.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.gd
rename to ld/testsuite/ld-mips-elf/mips16-pic-1.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.inc b/ld/testsuite/ld-mips-elf/mips16-pic-1.inc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.inc
rename to ld/testsuite/ld-mips-elf/mips16-pic-1.inc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.ld b/ld/testsuite/ld-mips-elf/mips16-pic-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1.ld
rename to ld/testsuite/ld-mips-elf/mips16-pic-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1a.s b/ld/testsuite/ld-mips-elf/mips16-pic-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1a.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1b.s b/ld/testsuite/ld-mips-elf/mips16-pic-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-1b.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.ad b/ld/testsuite/ld-mips-elf/mips16-pic-2.ad
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.ad
rename to ld/testsuite/ld-mips-elf/mips16-pic-2.ad
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.dd b/ld/testsuite/ld-mips-elf/mips16-pic-2.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.dd
rename to ld/testsuite/ld-mips-elf/mips16-pic-2.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.gd b/ld/testsuite/ld-mips-elf/mips16-pic-2.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.gd
rename to ld/testsuite/ld-mips-elf/mips16-pic-2.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.nd b/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
rename to ld/testsuite/ld-mips-elf/mips16-pic-2.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.rd b/ld/testsuite/ld-mips-elf/mips16-pic-2.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2.rd
rename to ld/testsuite/ld-mips-elf/mips16-pic-2.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2a.s b/ld/testsuite/ld-mips-elf/mips16-pic-2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2a.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2b.s b/ld/testsuite/ld-mips-elf/mips16-pic-2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-2b.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.dd b/ld/testsuite/ld-mips-elf/mips16-pic-3.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.dd
rename to ld/testsuite/ld-mips-elf/mips16-pic-3.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.gd b/ld/testsuite/ld-mips-elf/mips16-pic-3.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.gd
rename to ld/testsuite/ld-mips-elf/mips16-pic-3.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.inc b/ld/testsuite/ld-mips-elf/mips16-pic-3.inc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.inc
rename to ld/testsuite/ld-mips-elf/mips16-pic-3.inc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.rd b/ld/testsuite/ld-mips-elf/mips16-pic-3.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3.rd
rename to ld/testsuite/ld-mips-elf/mips16-pic-3.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3a.s b/ld/testsuite/ld-mips-elf/mips16-pic-3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3a.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3b.s b/ld/testsuite/ld-mips-elf/mips16-pic-3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-3b.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4.ver b/ld/testsuite/ld-mips-elf/mips16-pic-4.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4.ver
rename to ld/testsuite/ld-mips-elf/mips16-pic-4.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.dd b/ld/testsuite/ld-mips-elf/mips16-pic-4a.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.dd
rename to ld/testsuite/ld-mips-elf/mips16-pic-4a.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.gd b/ld/testsuite/ld-mips-elf/mips16-pic-4a.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.gd
rename to ld/testsuite/ld-mips-elf/mips16-pic-4a.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.nd b/ld/testsuite/ld-mips-elf/mips16-pic-4a.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.nd
rename to ld/testsuite/ld-mips-elf/mips16-pic-4a.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.s b/ld/testsuite/ld-mips-elf/mips16-pic-4a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4a.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-4a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4b.dd b/ld/testsuite/ld-mips-elf/mips16-pic-4b.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4b.dd
rename to ld/testsuite/ld-mips-elf/mips16-pic-4b.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4b.s b/ld/testsuite/ld-mips-elf/mips16-pic-4b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4b.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-4b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4c.s b/ld/testsuite/ld-mips-elf/mips16-pic-4c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mips16-pic-4c.s
rename to ld/testsuite/ld-mips-elf/mips16-pic-4c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mode-change-error-1.d b/ld/testsuite/ld-mips-elf/mode-change-error-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mode-change-error-1.d
rename to ld/testsuite/ld-mips-elf/mode-change-error-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mode-change-error-1a.s b/ld/testsuite/ld-mips-elf/mode-change-error-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mode-change-error-1a.s
rename to ld/testsuite/ld-mips-elf/mode-change-error-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mode-change-error-1b.s b/ld/testsuite/ld-mips-elf/mode-change-error-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/mode-change-error-1b.s
rename to ld/testsuite/ld-mips-elf/mode-change-error-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-1-1.s b/ld/testsuite/ld-mips-elf/multi-got-1-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-1-1.s
rename to ld/testsuite/ld-mips-elf/multi-got-1-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-1-2.s b/ld/testsuite/ld-mips-elf/multi-got-1-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-1-2.s
rename to ld/testsuite/ld-mips-elf/multi-got-1-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-1.d b/ld/testsuite/ld-mips-elf/multi-got-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-1.d
rename to ld/testsuite/ld-mips-elf/multi-got-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d b/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
rename to ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-1.s b/ld/testsuite/ld-mips-elf/multi-got-hidden-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-1.s
rename to ld/testsuite/ld-mips-elf/multi-got-hidden-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d b/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
rename to ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-2.s b/ld/testsuite/ld-mips-elf/multi-got-hidden-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-hidden-2.s
rename to ld/testsuite/ld-mips-elf/multi-got-hidden-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-no-shared-1.s b/ld/testsuite/ld-mips-elf/multi-got-no-shared-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-no-shared-1.s
rename to ld/testsuite/ld-mips-elf/multi-got-no-shared-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-no-shared-2.s b/ld/testsuite/ld-mips-elf/multi-got-no-shared-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-no-shared-2.s
rename to ld/testsuite/ld-mips-elf/multi-got-no-shared-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-no-shared.d b/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
rename to ld/testsuite/ld-mips-elf/multi-got-no-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-n32.d b/ld/testsuite/ld-mips-elf/no-shared-1-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-n32.d
rename to ld/testsuite/ld-mips-elf/no-shared-1-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-n64.d b/ld/testsuite/ld-mips-elf/no-shared-1-n64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-n64.d
rename to ld/testsuite/ld-mips-elf/no-shared-1-n64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-n64.s b/ld/testsuite/ld-mips-elf/no-shared-1-n64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-n64.s
rename to ld/testsuite/ld-mips-elf/no-shared-1-n64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-o32.d b/ld/testsuite/ld-mips-elf/no-shared-1-o32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-o32.d
rename to ld/testsuite/ld-mips-elf/no-shared-1-o32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-o32.s b/ld/testsuite/ld-mips-elf/no-shared-1-o32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1-o32.s
rename to ld/testsuite/ld-mips-elf/no-shared-1-o32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1.ld b/ld/testsuite/ld-mips-elf/no-shared-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/no-shared-1.ld
rename to ld/testsuite/ld-mips-elf/no-shared-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.ld b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.ld
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-2b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-2b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.gd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.gd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.ld b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.ld
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.gd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.gd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ld b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ld
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.pd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.pd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.pd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.pd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.rd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.rd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.gd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.gd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ld b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ld
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.gd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.gd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ld b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ld
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.pd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.pd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.pd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.pd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.rd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.rd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.gd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.gd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.pd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.pd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.pd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.pd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.rd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.rd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.gd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.gd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.pd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.pd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.pd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.pd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.rd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.rd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.gd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.gd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.gd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.gd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.pd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.pd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.pd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.pd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.rd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.rd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32a.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32b.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6.ld b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/pic-and-nonpic-6.ld
rename to ld/testsuite/ld-mips-elf/pic-and-nonpic-6.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1.d b/ld/testsuite/ld-mips-elf/region1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1.d
rename to ld/testsuite/ld-mips-elf/region1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1.t b/ld/testsuite/ld-mips-elf/region1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1.t
rename to ld/testsuite/ld-mips-elf/region1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1a.s b/ld/testsuite/ld-mips-elf/region1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1a.s
rename to ld/testsuite/ld-mips-elf/region1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1b.s b/ld/testsuite/ld-mips-elf/region1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/region1b.s
rename to ld/testsuite/ld-mips-elf/region1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel32-n32.d
rename to ld/testsuite/ld-mips-elf/rel32-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel32-o32.d b/ld/testsuite/ld-mips-elf/rel32-o32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel32-o32.d
rename to ld/testsuite/ld-mips-elf/rel32-o32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel32.s b/ld/testsuite/ld-mips-elf/rel32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel32.s
rename to ld/testsuite/ld-mips-elf/rel32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel64.d
rename to ld/testsuite/ld-mips-elf/rel64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel64.s b/ld/testsuite/ld-mips-elf/rel64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/rel64.s
rename to ld/testsuite/ld-mips-elf/rel64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
rename to ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n32.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
rename to ld/testsuite/ld-mips-elf/relax-jalr-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
rename to ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n64.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr-n64.d
rename to ld/testsuite/ld-mips-elf/relax-jalr-n64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr.s b/ld/testsuite/ld-mips-elf/relax-jalr.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/relax-jalr.s
rename to ld/testsuite/ld-mips-elf/relax-jalr.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1-n32.d b/ld/testsuite/ld-mips-elf/reloc-1-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1-n32.d
rename to ld/testsuite/ld-mips-elf/reloc-1-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1-n64.d b/ld/testsuite/ld-mips-elf/reloc-1-n64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1-n64.d
rename to ld/testsuite/ld-mips-elf/reloc-1-n64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1-rel.d b/ld/testsuite/ld-mips-elf/reloc-1-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1-rel.d
rename to ld/testsuite/ld-mips-elf/reloc-1-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1a.s b/ld/testsuite/ld-mips-elf/reloc-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1a.s
rename to ld/testsuite/ld-mips-elf/reloc-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1b.s b/ld/testsuite/ld-mips-elf/reloc-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-1b.s
rename to ld/testsuite/ld-mips-elf/reloc-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2.d b/ld/testsuite/ld-mips-elf/reloc-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2.d
rename to ld/testsuite/ld-mips-elf/reloc-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2.ld b/ld/testsuite/ld-mips-elf/reloc-2.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2.ld
rename to ld/testsuite/ld-mips-elf/reloc-2.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2a.s b/ld/testsuite/ld-mips-elf/reloc-2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2a.s
rename to ld/testsuite/ld-mips-elf/reloc-2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2b.s b/ld/testsuite/ld-mips-elf/reloc-2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-2b.s
rename to ld/testsuite/ld-mips-elf/reloc-2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-3-n32.d b/ld/testsuite/ld-mips-elf/reloc-3-n32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-3-n32.d
rename to ld/testsuite/ld-mips-elf/reloc-3-n32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-3.d b/ld/testsuite/ld-mips-elf/reloc-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-3.d
rename to ld/testsuite/ld-mips-elf/reloc-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-4.d b/ld/testsuite/ld-mips-elf/reloc-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-4.d
rename to ld/testsuite/ld-mips-elf/reloc-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-4.s b/ld/testsuite/ld-mips-elf/reloc-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-4.s
rename to ld/testsuite/ld-mips-elf/reloc-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-5.d b/ld/testsuite/ld-mips-elf/reloc-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-5.d
rename to ld/testsuite/ld-mips-elf/reloc-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-5.s b/ld/testsuite/ld-mips-elf/reloc-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-5.s
rename to ld/testsuite/ld-mips-elf/reloc-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1.d b/ld/testsuite/ld-mips-elf/reloc-estimate-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1.d
rename to ld/testsuite/ld-mips-elf/reloc-estimate-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1.ld b/ld/testsuite/ld-mips-elf/reloc-estimate-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1.ld
rename to ld/testsuite/ld-mips-elf/reloc-estimate-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1a.s b/ld/testsuite/ld-mips-elf/reloc-estimate-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1a.s
rename to ld/testsuite/ld-mips-elf/reloc-estimate-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1b.s b/ld/testsuite/ld-mips-elf/reloc-estimate-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-estimate-1b.s
rename to ld/testsuite/ld-mips-elf/reloc-estimate-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d b/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
rename to ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-merge-lo16.ld b/ld/testsuite/ld-mips-elf/reloc-merge-lo16.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-merge-lo16.ld
rename to ld/testsuite/ld-mips-elf/reloc-merge-lo16.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-merge-lo16.s b/ld/testsuite/ld-mips-elf/reloc-merge-lo16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/reloc-merge-lo16.s
rename to ld/testsuite/ld-mips-elf/reloc-merge-lo16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d
rename to ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d
rename to ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d
rename to ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d
rename to ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d
rename to ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1.ld b/ld/testsuite/ld-mips-elf/stub-dynsym-1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1.ld
rename to ld/testsuite/ld-mips-elf/stub-dynsym-1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1.s b/ld/testsuite/ld-mips-elf/stub-dynsym-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/stub-dynsym-1.s
rename to ld/testsuite/ld-mips-elf/stub-dynsym-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/textrel-1.d b/ld/testsuite/ld-mips-elf/textrel-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/textrel-1.d
rename to ld/testsuite/ld-mips-elf/textrel-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/textrel-1.s b/ld/testsuite/ld-mips-elf/textrel-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/textrel-1.s
rename to ld/testsuite/ld-mips-elf/textrel-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2-got.d b/ld/testsuite/ld-mips-elf/tls-hidden2-got.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2-got.d
rename to ld/testsuite/ld-mips-elf/tls-hidden2-got.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2.d b/ld/testsuite/ld-mips-elf/tls-hidden2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2.d
rename to ld/testsuite/ld-mips-elf/tls-hidden2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2a.s b/ld/testsuite/ld-mips-elf/tls-hidden2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2a.s
rename to ld/testsuite/ld-mips-elf/tls-hidden2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2b.s b/ld/testsuite/ld-mips-elf/tls-hidden2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden2b.s
rename to ld/testsuite/ld-mips-elf/tls-hidden2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.d b/ld/testsuite/ld-mips-elf/tls-hidden3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.d
rename to ld/testsuite/ld-mips-elf/tls-hidden3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.got b/ld/testsuite/ld-mips-elf/tls-hidden3.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.got
rename to ld/testsuite/ld-mips-elf/tls-hidden3.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.ld b/ld/testsuite/ld-mips-elf/tls-hidden3.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.ld
rename to ld/testsuite/ld-mips-elf/tls-hidden3.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.r b/ld/testsuite/ld-mips-elf/tls-hidden3.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3.r
rename to ld/testsuite/ld-mips-elf/tls-hidden3.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3a.s b/ld/testsuite/ld-mips-elf/tls-hidden3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3a.s
rename to ld/testsuite/ld-mips-elf/tls-hidden3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3b.s b/ld/testsuite/ld-mips-elf/tls-hidden3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden3b.s
rename to ld/testsuite/ld-mips-elf/tls-hidden3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4.got b/ld/testsuite/ld-mips-elf/tls-hidden4.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4.got
rename to ld/testsuite/ld-mips-elf/tls-hidden4.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4.r b/ld/testsuite/ld-mips-elf/tls-hidden4.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4.r
rename to ld/testsuite/ld-mips-elf/tls-hidden4.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4a.s b/ld/testsuite/ld-mips-elf/tls-hidden4a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4a.s
rename to ld/testsuite/ld-mips-elf/tls-hidden4a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4b.s b/ld/testsuite/ld-mips-elf/tls-hidden4b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-hidden4b.s
rename to ld/testsuite/ld-mips-elf/tls-hidden4b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1-1.s b/ld/testsuite/ld-mips-elf/tls-multi-got-1-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1-1.s
rename to ld/testsuite/ld-mips-elf/tls-multi-got-1-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1-2.s b/ld/testsuite/ld-mips-elf/tls-multi-got-1-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1-2.s
rename to ld/testsuite/ld-mips-elf/tls-multi-got-1-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1.d b/ld/testsuite/ld-mips-elf/tls-multi-got-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1.d
rename to ld/testsuite/ld-mips-elf/tls-multi-got-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1.got b/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
rename to ld/testsuite/ld-mips-elf/tls-multi-got-1.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1.r b/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
rename to ld/testsuite/ld-mips-elf/tls-multi-got-1.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsbin-o32.d b/ld/testsuite/ld-mips-elf/tlsbin-o32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsbin-o32.d
rename to ld/testsuite/ld-mips-elf/tlsbin-o32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsbin-o32.got b/ld/testsuite/ld-mips-elf/tlsbin-o32.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsbin-o32.got
rename to ld/testsuite/ld-mips-elf/tlsbin-o32.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsbin-o32.s b/ld/testsuite/ld-mips-elf/tlsbin-o32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsbin-o32.s
rename to ld/testsuite/ld-mips-elf/tlsbin-o32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.s b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.s
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32.s b/ld/testsuite/ld-mips-elf/tlsdyn-o32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlsdyn-o32.s
rename to ld/testsuite/ld-mips-elf/tlsdyn-o32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-hidden.ver b/ld/testsuite/ld-mips-elf/tlslib-hidden.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-hidden.ver
rename to ld/testsuite/ld-mips-elf/tlslib-hidden.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got b/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
rename to ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
rename to ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32.d b/ld/testsuite/ld-mips-elf/tlslib-o32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32.d
rename to ld/testsuite/ld-mips-elf/tlslib-o32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32.got b/ld/testsuite/ld-mips-elf/tlslib-o32.got
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32.got
rename to ld/testsuite/ld-mips-elf/tlslib-o32.got
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32.s b/ld/testsuite/ld-mips-elf/tlslib-o32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib-o32.s
rename to ld/testsuite/ld-mips-elf/tlslib-o32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib.ver b/ld/testsuite/ld-mips-elf/tlslib.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/tlslib.ver
rename to ld/testsuite/ld-mips-elf/tlslib.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/undefined.d b/ld/testsuite/ld-mips-elf/undefined.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/undefined.d
rename to ld/testsuite/ld-mips-elf/undefined.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/undefined.s b/ld/testsuite/ld-mips-elf/undefined.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/undefined.s
rename to ld/testsuite/ld-mips-elf/undefined.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.d b/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.d
rename to ld/testsuite/ld-mips-elf/vxworks-forced-local-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.s b/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.s
rename to ld/testsuite/ld-mips-elf/vxworks-forced-local-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.ver b/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks-forced-local-1.ver
rename to ld/testsuite/ld-mips-elf/vxworks-forced-local-1.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.dd b/ld/testsuite/ld-mips-elf/vxworks1-lib.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.dd
rename to ld/testsuite/ld-mips-elf/vxworks1-lib.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.nd b/ld/testsuite/ld-mips-elf/vxworks1-lib.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.nd
rename to ld/testsuite/ld-mips-elf/vxworks1-lib.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.rd b/ld/testsuite/ld-mips-elf/vxworks1-lib.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.rd
rename to ld/testsuite/ld-mips-elf/vxworks1-lib.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.s b/ld/testsuite/ld-mips-elf/vxworks1-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.s
rename to ld/testsuite/ld-mips-elf/vxworks1-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.td b/ld/testsuite/ld-mips-elf/vxworks1-lib.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-lib.td
rename to ld/testsuite/ld-mips-elf/vxworks1-lib.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-static.d b/ld/testsuite/ld-mips-elf/vxworks1-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1-static.d
rename to ld/testsuite/ld-mips-elf/vxworks1-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.dd b/ld/testsuite/ld-mips-elf/vxworks1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.dd
rename to ld/testsuite/ld-mips-elf/vxworks1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.ld b/ld/testsuite/ld-mips-elf/vxworks1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.ld
rename to ld/testsuite/ld-mips-elf/vxworks1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.rd b/ld/testsuite/ld-mips-elf/vxworks1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.rd
rename to ld/testsuite/ld-mips-elf/vxworks1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.s b/ld/testsuite/ld-mips-elf/vxworks1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks1.s
rename to ld/testsuite/ld-mips-elf/vxworks1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks2-static.sd b/ld/testsuite/ld-mips-elf/vxworks2-static.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks2-static.sd
rename to ld/testsuite/ld-mips-elf/vxworks2-static.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks2.s b/ld/testsuite/ld-mips-elf/vxworks2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks2.s
rename to ld/testsuite/ld-mips-elf/vxworks2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks2.sd b/ld/testsuite/ld-mips-elf/vxworks2.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mips-elf/vxworks2.sd
rename to ld/testsuite/ld-mips-elf/vxworks2.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/a.s b/ld/testsuite/ld-mmix/a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/a.s
rename to ld/testsuite/ld-mmix/a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/areg-256.s b/ld/testsuite/ld-mmix/areg-256.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/areg-256.s
rename to ld/testsuite/ld-mmix/areg-256.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/areg-t.s b/ld/testsuite/ld-mmix/areg-t.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/areg-t.s
rename to ld/testsuite/ld-mmix/areg-t.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/aregm.s b/ld/testsuite/ld-mmix/aregm.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/aregm.s
rename to ld/testsuite/ld-mmix/aregm.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil1.d b/ld/testsuite/ld-mmix/b-badfil1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil1.d
rename to ld/testsuite/ld-mmix/b-badfil1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil1.s b/ld/testsuite/ld-mmix/b-badfil1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil1.s
rename to ld/testsuite/ld-mmix/b-badfil1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil2.d b/ld/testsuite/ld-mmix/b-badfil2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil2.d
rename to ld/testsuite/ld-mmix/b-badfil2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil2.s b/ld/testsuite/ld-mmix/b-badfil2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfil2.s
rename to ld/testsuite/ld-mmix/b-badfil2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfixo.d b/ld/testsuite/ld-mmix/b-badfixo.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfixo.d
rename to ld/testsuite/ld-mmix/b-badfixo.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfixo.s b/ld/testsuite/ld-mmix/b-badfixo.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badfixo.s
rename to ld/testsuite/ld-mmix/b-badfixo.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badloc.d b/ld/testsuite/ld-mmix/b-badloc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badloc.d
rename to ld/testsuite/ld-mmix/b-badloc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badloc.s b/ld/testsuite/ld-mmix/b-badloc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badloc.s
rename to ld/testsuite/ld-mmix/b-badloc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badlop.d b/ld/testsuite/ld-mmix/b-badlop.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badlop.d
rename to ld/testsuite/ld-mmix/b-badlop.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badlop.s b/ld/testsuite/ld-mmix/b-badlop.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badlop.s
rename to ld/testsuite/ld-mmix/b-badlop.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badm.d b/ld/testsuite/ld-mmix/b-badm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badm.d
rename to ld/testsuite/ld-mmix/b-badm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badm2.s b/ld/testsuite/ld-mmix/b-badm2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badm2.s
rename to ld/testsuite/ld-mmix/b-badm2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badmain.s b/ld/testsuite/ld-mmix/b-badmain.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badmain.s
rename to ld/testsuite/ld-mmix/b-badmain.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badquot.d b/ld/testsuite/ld-mmix/b-badquot.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badquot.d
rename to ld/testsuite/ld-mmix/b-badquot.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badquot.s b/ld/testsuite/ld-mmix/b-badquot.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badquot.s
rename to ld/testsuite/ld-mmix/b-badquot.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx1.d b/ld/testsuite/ld-mmix/b-badrx1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx1.d
rename to ld/testsuite/ld-mmix/b-badrx1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx1.s b/ld/testsuite/ld-mmix/b-badrx1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx1.s
rename to ld/testsuite/ld-mmix/b-badrx1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx2.d b/ld/testsuite/ld-mmix/b-badrx2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx2.d
rename to ld/testsuite/ld-mmix/b-badrx2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx2.s b/ld/testsuite/ld-mmix/b-badrx2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx2.s
rename to ld/testsuite/ld-mmix/b-badrx2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx3.d b/ld/testsuite/ld-mmix/b-badrx3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx3.d
rename to ld/testsuite/ld-mmix/b-badrx3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx3.s b/ld/testsuite/ld-mmix/b-badrx3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-badrx3.s
rename to ld/testsuite/ld-mmix/b-badrx3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend.s b/ld/testsuite/ld-mmix/b-bend.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend.s
rename to ld/testsuite/ld-mmix/b-bend.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend1.d b/ld/testsuite/ld-mmix/b-bend1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend1.d
rename to ld/testsuite/ld-mmix/b-bend1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend2.d b/ld/testsuite/ld-mmix/b-bend2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend2.d
rename to ld/testsuite/ld-mmix/b-bend2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend3.d b/ld/testsuite/ld-mmix/b-bend3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bend3.d
rename to ld/testsuite/ld-mmix/b-bend3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bstab1.d b/ld/testsuite/ld-mmix/b-bstab1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bstab1.d
rename to ld/testsuite/ld-mmix/b-bstab1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bstab1.s b/ld/testsuite/ld-mmix/b-bstab1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-bstab1.s
rename to ld/testsuite/ld-mmix/b-bstab1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-fixo2.d b/ld/testsuite/ld-mmix/b-fixo2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-fixo2.d
rename to ld/testsuite/ld-mmix/b-fixo2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-fixo2.s b/ld/testsuite/ld-mmix/b-fixo2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-fixo2.s
rename to ld/testsuite/ld-mmix/b-fixo2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-goodmain.s b/ld/testsuite/ld-mmix/b-goodmain.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-goodmain.s
rename to ld/testsuite/ld-mmix/b-goodmain.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-loc64k.d b/ld/testsuite/ld-mmix/b-loc64k.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-loc64k.d
rename to ld/testsuite/ld-mmix/b-loc64k.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-loc64k.s b/ld/testsuite/ld-mmix/b-loc64k.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-loc64k.s
rename to ld/testsuite/ld-mmix/b-loc64k.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-nosym.d b/ld/testsuite/ld-mmix/b-nosym.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-nosym.d
rename to ld/testsuite/ld-mmix/b-nosym.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-nosym.s b/ld/testsuite/ld-mmix/b-nosym.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-nosym.s
rename to ld/testsuite/ld-mmix/b-nosym.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-offloc.s b/ld/testsuite/ld-mmix/b-offloc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-offloc.s
rename to ld/testsuite/ld-mmix/b-offloc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-post1.s b/ld/testsuite/ld-mmix/b-post1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-post1.s
rename to ld/testsuite/ld-mmix/b-post1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-twoinsn.s b/ld/testsuite/ld-mmix/b-twoinsn.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-twoinsn.s
rename to ld/testsuite/ld-mmix/b-twoinsn.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec.s b/ld/testsuite/ld-mmix/b-widec.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec.s
rename to ld/testsuite/ld-mmix/b-widec.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec1.d b/ld/testsuite/ld-mmix/b-widec1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec1.d
rename to ld/testsuite/ld-mmix/b-widec1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec2.d b/ld/testsuite/ld-mmix/b-widec2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec2.d
rename to ld/testsuite/ld-mmix/b-widec2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec2.s b/ld/testsuite/ld-mmix/b-widec2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec2.s
rename to ld/testsuite/ld-mmix/b-widec2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec3.d b/ld/testsuite/ld-mmix/b-widec3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec3.d
rename to ld/testsuite/ld-mmix/b-widec3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec3.s b/ld/testsuite/ld-mmix/b-widec3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/b-widec3.s
rename to ld/testsuite/ld-mmix/b-widec3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-1.d b/ld/testsuite/ld-mmix/bpo-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-1.d
rename to ld/testsuite/ld-mmix/bpo-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-1.s b/ld/testsuite/ld-mmix/bpo-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-1.s
rename to ld/testsuite/ld-mmix/bpo-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-10.d b/ld/testsuite/ld-mmix/bpo-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-10.d
rename to ld/testsuite/ld-mmix/bpo-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-10.s b/ld/testsuite/ld-mmix/bpo-10.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-10.s
rename to ld/testsuite/ld-mmix/bpo-10.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-11.d b/ld/testsuite/ld-mmix/bpo-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-11.d
rename to ld/testsuite/ld-mmix/bpo-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-11.s b/ld/testsuite/ld-mmix/bpo-11.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-11.s
rename to ld/testsuite/ld-mmix/bpo-11.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-12.d b/ld/testsuite/ld-mmix/bpo-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-12.d
rename to ld/testsuite/ld-mmix/bpo-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-12m.d b/ld/testsuite/ld-mmix/bpo-12m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-12m.d
rename to ld/testsuite/ld-mmix/bpo-12m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-13.d b/ld/testsuite/ld-mmix/bpo-13.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-13.d
rename to ld/testsuite/ld-mmix/bpo-13.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-13m.d b/ld/testsuite/ld-mmix/bpo-13m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-13m.d
rename to ld/testsuite/ld-mmix/bpo-13m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-14.d b/ld/testsuite/ld-mmix/bpo-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-14.d
rename to ld/testsuite/ld-mmix/bpo-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-14m.d b/ld/testsuite/ld-mmix/bpo-14m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-14m.d
rename to ld/testsuite/ld-mmix/bpo-14m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-15.d b/ld/testsuite/ld-mmix/bpo-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-15.d
rename to ld/testsuite/ld-mmix/bpo-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-15m.d b/ld/testsuite/ld-mmix/bpo-15m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-15m.d
rename to ld/testsuite/ld-mmix/bpo-15m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-16.d b/ld/testsuite/ld-mmix/bpo-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-16.d
rename to ld/testsuite/ld-mmix/bpo-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-16m.d b/ld/testsuite/ld-mmix/bpo-16m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-16m.d
rename to ld/testsuite/ld-mmix/bpo-16m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-17.d b/ld/testsuite/ld-mmix/bpo-17.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-17.d
rename to ld/testsuite/ld-mmix/bpo-17.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-17m.d b/ld/testsuite/ld-mmix/bpo-17m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-17m.d
rename to ld/testsuite/ld-mmix/bpo-17m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-18.d b/ld/testsuite/ld-mmix/bpo-18.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-18.d
rename to ld/testsuite/ld-mmix/bpo-18.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-18m.d b/ld/testsuite/ld-mmix/bpo-18m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-18m.d
rename to ld/testsuite/ld-mmix/bpo-18m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-19.d b/ld/testsuite/ld-mmix/bpo-19.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-19.d
rename to ld/testsuite/ld-mmix/bpo-19.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-19m.d b/ld/testsuite/ld-mmix/bpo-19m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-19m.d
rename to ld/testsuite/ld-mmix/bpo-19m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-1m.d b/ld/testsuite/ld-mmix/bpo-1m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-1m.d
rename to ld/testsuite/ld-mmix/bpo-1m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-2.d b/ld/testsuite/ld-mmix/bpo-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-2.d
rename to ld/testsuite/ld-mmix/bpo-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-2.s b/ld/testsuite/ld-mmix/bpo-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-2.s
rename to ld/testsuite/ld-mmix/bpo-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-20.d b/ld/testsuite/ld-mmix/bpo-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-20.d
rename to ld/testsuite/ld-mmix/bpo-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-20m.d b/ld/testsuite/ld-mmix/bpo-20m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-20m.d
rename to ld/testsuite/ld-mmix/bpo-20m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-21.d b/ld/testsuite/ld-mmix/bpo-21.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-21.d
rename to ld/testsuite/ld-mmix/bpo-21.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-21m.d b/ld/testsuite/ld-mmix/bpo-21m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-21m.d
rename to ld/testsuite/ld-mmix/bpo-21m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-22.d b/ld/testsuite/ld-mmix/bpo-22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-22.d
rename to ld/testsuite/ld-mmix/bpo-22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-2m.d b/ld/testsuite/ld-mmix/bpo-2m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-2m.d
rename to ld/testsuite/ld-mmix/bpo-2m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-3.d b/ld/testsuite/ld-mmix/bpo-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-3.d
rename to ld/testsuite/ld-mmix/bpo-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-3.s b/ld/testsuite/ld-mmix/bpo-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-3.s
rename to ld/testsuite/ld-mmix/bpo-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-3m.d b/ld/testsuite/ld-mmix/bpo-3m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-3m.d
rename to ld/testsuite/ld-mmix/bpo-3m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-4.d b/ld/testsuite/ld-mmix/bpo-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-4.d
rename to ld/testsuite/ld-mmix/bpo-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-4.s b/ld/testsuite/ld-mmix/bpo-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-4.s
rename to ld/testsuite/ld-mmix/bpo-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-4m.d b/ld/testsuite/ld-mmix/bpo-4m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-4m.d
rename to ld/testsuite/ld-mmix/bpo-4m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-5.d b/ld/testsuite/ld-mmix/bpo-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-5.d
rename to ld/testsuite/ld-mmix/bpo-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-5.s b/ld/testsuite/ld-mmix/bpo-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-5.s
rename to ld/testsuite/ld-mmix/bpo-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-5m.d b/ld/testsuite/ld-mmix/bpo-5m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-5m.d
rename to ld/testsuite/ld-mmix/bpo-5m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-6.d b/ld/testsuite/ld-mmix/bpo-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-6.d
rename to ld/testsuite/ld-mmix/bpo-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-6.s b/ld/testsuite/ld-mmix/bpo-6.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-6.s
rename to ld/testsuite/ld-mmix/bpo-6.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-6m.d b/ld/testsuite/ld-mmix/bpo-6m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-6m.d
rename to ld/testsuite/ld-mmix/bpo-6m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-7.d b/ld/testsuite/ld-mmix/bpo-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-7.d
rename to ld/testsuite/ld-mmix/bpo-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-7.s b/ld/testsuite/ld-mmix/bpo-7.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-7.s
rename to ld/testsuite/ld-mmix/bpo-7.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-7m.d b/ld/testsuite/ld-mmix/bpo-7m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-7m.d
rename to ld/testsuite/ld-mmix/bpo-7m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-8.d b/ld/testsuite/ld-mmix/bpo-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-8.d
rename to ld/testsuite/ld-mmix/bpo-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-8.s b/ld/testsuite/ld-mmix/bpo-8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-8.s
rename to ld/testsuite/ld-mmix/bpo-8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-8m.d b/ld/testsuite/ld-mmix/bpo-8m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-8m.d
rename to ld/testsuite/ld-mmix/bpo-8m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-9.d b/ld/testsuite/ld-mmix/bpo-9.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-9.d
rename to ld/testsuite/ld-mmix/bpo-9.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-9.s b/ld/testsuite/ld-mmix/bpo-9.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-9.s
rename to ld/testsuite/ld-mmix/bpo-9.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-9m.d b/ld/testsuite/ld-mmix/bpo-9m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo-9m.d
rename to ld/testsuite/ld-mmix/bpo-9m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo64addr.ld b/ld/testsuite/ld-mmix/bpo64addr.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bpo64addr.ld
rename to ld/testsuite/ld-mmix/bpo64addr.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec1.d b/ld/testsuite/ld-mmix/bspec1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec1.d
rename to ld/testsuite/ld-mmix/bspec1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec1.s b/ld/testsuite/ld-mmix/bspec1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec1.s
rename to ld/testsuite/ld-mmix/bspec1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec1m.d b/ld/testsuite/ld-mmix/bspec1m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec1m.d
rename to ld/testsuite/ld-mmix/bspec1m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec2.d b/ld/testsuite/ld-mmix/bspec2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec2.d
rename to ld/testsuite/ld-mmix/bspec2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec2.s b/ld/testsuite/ld-mmix/bspec2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec2.s
rename to ld/testsuite/ld-mmix/bspec2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec2m.d b/ld/testsuite/ld-mmix/bspec2m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec2m.d
rename to ld/testsuite/ld-mmix/bspec2m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec801.s b/ld/testsuite/ld-mmix/bspec801.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec801.s
rename to ld/testsuite/ld-mmix/bspec801.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec802.s b/ld/testsuite/ld-mmix/bspec802.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec802.s
rename to ld/testsuite/ld-mmix/bspec802.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec803.s b/ld/testsuite/ld-mmix/bspec803.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec803.s
rename to ld/testsuite/ld-mmix/bspec803.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec804.s b/ld/testsuite/ld-mmix/bspec804.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec804.s
rename to ld/testsuite/ld-mmix/bspec804.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec805.s b/ld/testsuite/ld-mmix/bspec805.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec805.s
rename to ld/testsuite/ld-mmix/bspec805.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec806.s b/ld/testsuite/ld-mmix/bspec806.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec806.s
rename to ld/testsuite/ld-mmix/bspec806.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec807.s b/ld/testsuite/ld-mmix/bspec807.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec807.s
rename to ld/testsuite/ld-mmix/bspec807.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec808.s b/ld/testsuite/ld-mmix/bspec808.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bspec808.s
rename to ld/testsuite/ld-mmix/bspec808.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-1b.d b/ld/testsuite/ld-mmix/bza-1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-1b.d
rename to ld/testsuite/ld-mmix/bza-1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-1f.d b/ld/testsuite/ld-mmix/bza-1f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-1f.d
rename to ld/testsuite/ld-mmix/bza-1f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-2b.d b/ld/testsuite/ld-mmix/bza-2b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-2b.d
rename to ld/testsuite/ld-mmix/bza-2b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-2f.d b/ld/testsuite/ld-mmix/bza-2f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-2f.d
rename to ld/testsuite/ld-mmix/bza-2f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-7b.d b/ld/testsuite/ld-mmix/bza-7b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-7b.d
rename to ld/testsuite/ld-mmix/bza-7b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-7f.d b/ld/testsuite/ld-mmix/bza-7f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-7f.d
rename to ld/testsuite/ld-mmix/bza-7f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-8b.d b/ld/testsuite/ld-mmix/bza-8b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-8b.d
rename to ld/testsuite/ld-mmix/bza-8b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-8f.d b/ld/testsuite/ld-mmix/bza-8f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza-8f.d
rename to ld/testsuite/ld-mmix/bza-8f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/bza.s b/ld/testsuite/ld-mmix/bza.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/bza.s
rename to ld/testsuite/ld-mmix/bza.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/data1.s b/ld/testsuite/ld-mmix/data1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/data1.s
rename to ld/testsuite/ld-mmix/data1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/dloc1.s b/ld/testsuite/ld-mmix/dloc1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/dloc1.s
rename to ld/testsuite/ld-mmix/dloc1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/dloc2.s b/ld/testsuite/ld-mmix/dloc2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/dloc2.s
rename to ld/testsuite/ld-mmix/dloc2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1-254.s b/ld/testsuite/ld-mmix/ext1-254.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1-254.s
rename to ld/testsuite/ld-mmix/ext1-254.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1.s b/ld/testsuite/ld-mmix/ext1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1.s
rename to ld/testsuite/ld-mmix/ext1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1g.s b/ld/testsuite/ld-mmix/ext1g.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1g.s
rename to ld/testsuite/ld-mmix/ext1g.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1l.s b/ld/testsuite/ld-mmix/ext1l.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/ext1l.s
rename to ld/testsuite/ld-mmix/ext1l.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-1b.d b/ld/testsuite/ld-mmix/getaa-1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-1b.d
rename to ld/testsuite/ld-mmix/getaa-1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-1f.d b/ld/testsuite/ld-mmix/getaa-1f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-1f.d
rename to ld/testsuite/ld-mmix/getaa-1f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-2b.d b/ld/testsuite/ld-mmix/getaa-2b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-2b.d
rename to ld/testsuite/ld-mmix/getaa-2b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-2f.d b/ld/testsuite/ld-mmix/getaa-2f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-2f.d
rename to ld/testsuite/ld-mmix/getaa-2f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-4b.d b/ld/testsuite/ld-mmix/getaa-4b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-4b.d
rename to ld/testsuite/ld-mmix/getaa-4b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-4f.d b/ld/testsuite/ld-mmix/getaa-4f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-4f.d
rename to ld/testsuite/ld-mmix/getaa-4f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-6b.d b/ld/testsuite/ld-mmix/getaa-6b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-6b.d
rename to ld/testsuite/ld-mmix/getaa-6b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-6f.d b/ld/testsuite/ld-mmix/getaa-6f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-6f.d
rename to ld/testsuite/ld-mmix/getaa-6f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-7b.d b/ld/testsuite/ld-mmix/getaa-7b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-7b.d
rename to ld/testsuite/ld-mmix/getaa-7b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-7f.d b/ld/testsuite/ld-mmix/getaa-7f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-7f.d
rename to ld/testsuite/ld-mmix/getaa-7f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-8b.d b/ld/testsuite/ld-mmix/getaa-8b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-8b.d
rename to ld/testsuite/ld-mmix/getaa-8b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-8f.d b/ld/testsuite/ld-mmix/getaa-8f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa-8f.d
rename to ld/testsuite/ld-mmix/getaa-8f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa.s b/ld/testsuite/ld-mmix/getaa.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa.s
rename to ld/testsuite/ld-mmix/getaa.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa12b.d b/ld/testsuite/ld-mmix/getaa12b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa12b.d
rename to ld/testsuite/ld-mmix/getaa12b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa12f.d b/ld/testsuite/ld-mmix/getaa12f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa12f.d
rename to ld/testsuite/ld-mmix/getaa12f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa14b.d b/ld/testsuite/ld-mmix/getaa14b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa14b.d
rename to ld/testsuite/ld-mmix/getaa14b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa14f.d b/ld/testsuite/ld-mmix/getaa14f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/getaa14f.d
rename to ld/testsuite/ld-mmix/getaa14f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-1.d b/ld/testsuite/ld-mmix/greg-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-1.d
rename to ld/testsuite/ld-mmix/greg-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-1.s b/ld/testsuite/ld-mmix/greg-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-1.s
rename to ld/testsuite/ld-mmix/greg-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-10.d b/ld/testsuite/ld-mmix/greg-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-10.d
rename to ld/testsuite/ld-mmix/greg-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-11.d b/ld/testsuite/ld-mmix/greg-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-11.d
rename to ld/testsuite/ld-mmix/greg-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-11b.d b/ld/testsuite/ld-mmix/greg-11b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-11b.d
rename to ld/testsuite/ld-mmix/greg-11b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-12.d b/ld/testsuite/ld-mmix/greg-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-12.d
rename to ld/testsuite/ld-mmix/greg-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-13.d b/ld/testsuite/ld-mmix/greg-13.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-13.d
rename to ld/testsuite/ld-mmix/greg-13.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-14.d b/ld/testsuite/ld-mmix/greg-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-14.d
rename to ld/testsuite/ld-mmix/greg-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-14s.d b/ld/testsuite/ld-mmix/greg-14s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-14s.d
rename to ld/testsuite/ld-mmix/greg-14s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-15.d b/ld/testsuite/ld-mmix/greg-15.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-15.d
rename to ld/testsuite/ld-mmix/greg-15.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-16.d b/ld/testsuite/ld-mmix/greg-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-16.d
rename to ld/testsuite/ld-mmix/greg-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-17.d b/ld/testsuite/ld-mmix/greg-17.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-17.d
rename to ld/testsuite/ld-mmix/greg-17.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-18.d b/ld/testsuite/ld-mmix/greg-18.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-18.d
rename to ld/testsuite/ld-mmix/greg-18.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-19.d b/ld/testsuite/ld-mmix/greg-19.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-19.d
rename to ld/testsuite/ld-mmix/greg-19.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-2.d b/ld/testsuite/ld-mmix/greg-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-2.d
rename to ld/testsuite/ld-mmix/greg-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-2.s b/ld/testsuite/ld-mmix/greg-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-2.s
rename to ld/testsuite/ld-mmix/greg-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-20.d b/ld/testsuite/ld-mmix/greg-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-20.d
rename to ld/testsuite/ld-mmix/greg-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-3.d b/ld/testsuite/ld-mmix/greg-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-3.d
rename to ld/testsuite/ld-mmix/greg-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-3.s b/ld/testsuite/ld-mmix/greg-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-3.s
rename to ld/testsuite/ld-mmix/greg-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-4.d b/ld/testsuite/ld-mmix/greg-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-4.d
rename to ld/testsuite/ld-mmix/greg-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-4.s b/ld/testsuite/ld-mmix/greg-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-4.s
rename to ld/testsuite/ld-mmix/greg-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-5.d b/ld/testsuite/ld-mmix/greg-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-5.d
rename to ld/testsuite/ld-mmix/greg-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-5.s b/ld/testsuite/ld-mmix/greg-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-5.s
rename to ld/testsuite/ld-mmix/greg-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-5s.d b/ld/testsuite/ld-mmix/greg-5s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-5s.d
rename to ld/testsuite/ld-mmix/greg-5s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-6.d b/ld/testsuite/ld-mmix/greg-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-6.d
rename to ld/testsuite/ld-mmix/greg-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-7.d b/ld/testsuite/ld-mmix/greg-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-7.d
rename to ld/testsuite/ld-mmix/greg-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-8.d b/ld/testsuite/ld-mmix/greg-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-8.d
rename to ld/testsuite/ld-mmix/greg-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-9.d b/ld/testsuite/ld-mmix/greg-9.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/greg-9.d
rename to ld/testsuite/ld-mmix/greg-9.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/gregbza1.s b/ld/testsuite/ld-mmix/gregbza1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/gregbza1.s
rename to ld/testsuite/ld-mmix/gregbza1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/gregget1.s b/ld/testsuite/ld-mmix/gregget1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/gregget1.s
rename to ld/testsuite/ld-mmix/gregget1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/gregget2.s b/ld/testsuite/ld-mmix/gregget2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/gregget2.s
rename to ld/testsuite/ld-mmix/gregget2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/gregldo1.s b/ld/testsuite/ld-mmix/gregldo1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/gregldo1.s
rename to ld/testsuite/ld-mmix/gregldo1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/gregpsj1.s b/ld/testsuite/ld-mmix/gregpsj1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/gregpsj1.s
rename to ld/testsuite/ld-mmix/gregpsj1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/hdr-1.d b/ld/testsuite/ld-mmix/hdr-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/hdr-1.d
rename to ld/testsuite/ld-mmix/hdr-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-1b.d b/ld/testsuite/ld-mmix/jumpa-1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-1b.d
rename to ld/testsuite/ld-mmix/jumpa-1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-1f.d b/ld/testsuite/ld-mmix/jumpa-1f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-1f.d
rename to ld/testsuite/ld-mmix/jumpa-1f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-2b.d b/ld/testsuite/ld-mmix/jumpa-2b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-2b.d
rename to ld/testsuite/ld-mmix/jumpa-2b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-2f.d b/ld/testsuite/ld-mmix/jumpa-2f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-2f.d
rename to ld/testsuite/ld-mmix/jumpa-2f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-3b.d b/ld/testsuite/ld-mmix/jumpa-3b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-3b.d
rename to ld/testsuite/ld-mmix/jumpa-3b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-3f.d b/ld/testsuite/ld-mmix/jumpa-3f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-3f.d
rename to ld/testsuite/ld-mmix/jumpa-3f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-4b.d b/ld/testsuite/ld-mmix/jumpa-4b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-4b.d
rename to ld/testsuite/ld-mmix/jumpa-4b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-4f.d b/ld/testsuite/ld-mmix/jumpa-4f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-4f.d
rename to ld/testsuite/ld-mmix/jumpa-4f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-5b.d b/ld/testsuite/ld-mmix/jumpa-5b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-5b.d
rename to ld/testsuite/ld-mmix/jumpa-5b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-5f.d b/ld/testsuite/ld-mmix/jumpa-5f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-5f.d
rename to ld/testsuite/ld-mmix/jumpa-5f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-6b.d b/ld/testsuite/ld-mmix/jumpa-6b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-6b.d
rename to ld/testsuite/ld-mmix/jumpa-6b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-6f.d b/ld/testsuite/ld-mmix/jumpa-6f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-6f.d
rename to ld/testsuite/ld-mmix/jumpa-6f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-7b.d b/ld/testsuite/ld-mmix/jumpa-7b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-7b.d
rename to ld/testsuite/ld-mmix/jumpa-7b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-7f.d b/ld/testsuite/ld-mmix/jumpa-7f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-7f.d
rename to ld/testsuite/ld-mmix/jumpa-7f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-8b.d b/ld/testsuite/ld-mmix/jumpa-8b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-8b.d
rename to ld/testsuite/ld-mmix/jumpa-8b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-8f.d b/ld/testsuite/ld-mmix/jumpa-8f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-8f.d
rename to ld/testsuite/ld-mmix/jumpa-8f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-9b.d b/ld/testsuite/ld-mmix/jumpa-9b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-9b.d
rename to ld/testsuite/ld-mmix/jumpa-9b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-9f.d b/ld/testsuite/ld-mmix/jumpa-9f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa-9f.d
rename to ld/testsuite/ld-mmix/jumpa-9f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa.s b/ld/testsuite/ld-mmix/jumpa.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa.s
rename to ld/testsuite/ld-mmix/jumpa.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa12b.d b/ld/testsuite/ld-mmix/jumpa12b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa12b.d
rename to ld/testsuite/ld-mmix/jumpa12b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa12f.d b/ld/testsuite/ld-mmix/jumpa12f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa12f.d
rename to ld/testsuite/ld-mmix/jumpa12f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa13b.d b/ld/testsuite/ld-mmix/jumpa13b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa13b.d
rename to ld/testsuite/ld-mmix/jumpa13b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa13f.d b/ld/testsuite/ld-mmix/jumpa13f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa13f.d
rename to ld/testsuite/ld-mmix/jumpa13f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa14b.d b/ld/testsuite/ld-mmix/jumpa14b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa14b.d
rename to ld/testsuite/ld-mmix/jumpa14b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa14f.d b/ld/testsuite/ld-mmix/jumpa14f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/jumpa14f.d
rename to ld/testsuite/ld-mmix/jumpa14f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc1.d b/ld/testsuite/ld-mmix/loc1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc1.d
rename to ld/testsuite/ld-mmix/loc1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc1.s b/ld/testsuite/ld-mmix/loc1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc1.s
rename to ld/testsuite/ld-mmix/loc1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc10.d b/ld/testsuite/ld-mmix/loc10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc10.d
rename to ld/testsuite/ld-mmix/loc10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc10.s b/ld/testsuite/ld-mmix/loc10.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc10.s
rename to ld/testsuite/ld-mmix/loc10.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc10m.d b/ld/testsuite/ld-mmix/loc10m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc10m.d
rename to ld/testsuite/ld-mmix/loc10m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc1m.d b/ld/testsuite/ld-mmix/loc1m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc1m.d
rename to ld/testsuite/ld-mmix/loc1m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc2.d b/ld/testsuite/ld-mmix/loc2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc2.d
rename to ld/testsuite/ld-mmix/loc2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc2.s b/ld/testsuite/ld-mmix/loc2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc2.s
rename to ld/testsuite/ld-mmix/loc2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc2m.d b/ld/testsuite/ld-mmix/loc2m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc2m.d
rename to ld/testsuite/ld-mmix/loc2m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc3.d b/ld/testsuite/ld-mmix/loc3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc3.d
rename to ld/testsuite/ld-mmix/loc3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc3m.d b/ld/testsuite/ld-mmix/loc3m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc3m.d
rename to ld/testsuite/ld-mmix/loc3m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc4.d b/ld/testsuite/ld-mmix/loc4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc4.d
rename to ld/testsuite/ld-mmix/loc4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc4m.d b/ld/testsuite/ld-mmix/loc4m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc4m.d
rename to ld/testsuite/ld-mmix/loc4m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc5.d b/ld/testsuite/ld-mmix/loc5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc5.d
rename to ld/testsuite/ld-mmix/loc5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc5m.d b/ld/testsuite/ld-mmix/loc5m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc5m.d
rename to ld/testsuite/ld-mmix/loc5m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc6.d b/ld/testsuite/ld-mmix/loc6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc6.d
rename to ld/testsuite/ld-mmix/loc6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc6m.d b/ld/testsuite/ld-mmix/loc6m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc6m.d
rename to ld/testsuite/ld-mmix/loc6m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc7.d b/ld/testsuite/ld-mmix/loc7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc7.d
rename to ld/testsuite/ld-mmix/loc7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc7m.d b/ld/testsuite/ld-mmix/loc7m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc7m.d
rename to ld/testsuite/ld-mmix/loc7m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc8.d b/ld/testsuite/ld-mmix/loc8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc8.d
rename to ld/testsuite/ld-mmix/loc8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc8.s b/ld/testsuite/ld-mmix/loc8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc8.s
rename to ld/testsuite/ld-mmix/loc8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc8m.d b/ld/testsuite/ld-mmix/loc8m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc8m.d
rename to ld/testsuite/ld-mmix/loc8m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc9.d b/ld/testsuite/ld-mmix/loc9.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc9.d
rename to ld/testsuite/ld-mmix/loc9.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc9.s b/ld/testsuite/ld-mmix/loc9.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc9.s
rename to ld/testsuite/ld-mmix/loc9.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loc9m.d b/ld/testsuite/ld-mmix/loc9m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loc9m.d
rename to ld/testsuite/ld-mmix/loc9m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local1.d b/ld/testsuite/ld-mmix/local1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local1.d
rename to ld/testsuite/ld-mmix/local1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local1.s b/ld/testsuite/ld-mmix/local1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local1.s
rename to ld/testsuite/ld-mmix/local1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local10.d b/ld/testsuite/ld-mmix/local10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local10.d
rename to ld/testsuite/ld-mmix/local10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local10m.d b/ld/testsuite/ld-mmix/local10m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local10m.d
rename to ld/testsuite/ld-mmix/local10m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local11.d b/ld/testsuite/ld-mmix/local11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local11.d
rename to ld/testsuite/ld-mmix/local11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local11m.d b/ld/testsuite/ld-mmix/local11m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local11m.d
rename to ld/testsuite/ld-mmix/local11m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local12.d b/ld/testsuite/ld-mmix/local12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local12.d
rename to ld/testsuite/ld-mmix/local12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local12m.d b/ld/testsuite/ld-mmix/local12m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local12m.d
rename to ld/testsuite/ld-mmix/local12m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local1m.d b/ld/testsuite/ld-mmix/local1m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local1m.d
rename to ld/testsuite/ld-mmix/local1m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local2.d b/ld/testsuite/ld-mmix/local2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local2.d
rename to ld/testsuite/ld-mmix/local2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local2.s b/ld/testsuite/ld-mmix/local2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local2.s
rename to ld/testsuite/ld-mmix/local2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local2m.d b/ld/testsuite/ld-mmix/local2m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local2m.d
rename to ld/testsuite/ld-mmix/local2m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local3.d b/ld/testsuite/ld-mmix/local3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local3.d
rename to ld/testsuite/ld-mmix/local3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local3m.d b/ld/testsuite/ld-mmix/local3m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local3m.d
rename to ld/testsuite/ld-mmix/local3m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local4.d b/ld/testsuite/ld-mmix/local4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local4.d
rename to ld/testsuite/ld-mmix/local4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local4m.d b/ld/testsuite/ld-mmix/local4m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local4m.d
rename to ld/testsuite/ld-mmix/local4m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local5.d b/ld/testsuite/ld-mmix/local5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local5.d
rename to ld/testsuite/ld-mmix/local5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local5m.d b/ld/testsuite/ld-mmix/local5m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local5m.d
rename to ld/testsuite/ld-mmix/local5m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local6.d b/ld/testsuite/ld-mmix/local6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local6.d
rename to ld/testsuite/ld-mmix/local6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local6m.d b/ld/testsuite/ld-mmix/local6m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local6m.d
rename to ld/testsuite/ld-mmix/local6m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local7.d b/ld/testsuite/ld-mmix/local7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local7.d
rename to ld/testsuite/ld-mmix/local7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local7m.d b/ld/testsuite/ld-mmix/local7m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local7m.d
rename to ld/testsuite/ld-mmix/local7m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local8.d b/ld/testsuite/ld-mmix/local8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local8.d
rename to ld/testsuite/ld-mmix/local8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local8m.d b/ld/testsuite/ld-mmix/local8m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local8m.d
rename to ld/testsuite/ld-mmix/local8m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local9.d b/ld/testsuite/ld-mmix/local9.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local9.d
rename to ld/testsuite/ld-mmix/local9.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/local9m.d b/ld/testsuite/ld-mmix/local9m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/local9m.d
rename to ld/testsuite/ld-mmix/local9m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/locdo-1.d b/ld/testsuite/ld-mmix/locdo-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/locdo-1.d
rename to ld/testsuite/ld-mmix/locdo-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/locdo.s b/ld/testsuite/ld-mmix/locdo.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/locdo.s
rename to ld/testsuite/ld-mmix/locdo.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loct-1.d b/ld/testsuite/ld-mmix/loct-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loct-1.d
rename to ld/testsuite/ld-mmix/loct-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/loct.s b/ld/testsuite/ld-mmix/loct.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/loct.s
rename to ld/testsuite/ld-mmix/loct.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/locto-1.d b/ld/testsuite/ld-mmix/locto-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/locto-1.d
rename to ld/testsuite/ld-mmix/locto-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/locto.s b/ld/testsuite/ld-mmix/locto.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/locto.s
rename to ld/testsuite/ld-mmix/locto.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/main1.s b/ld/testsuite/ld-mmix/main1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/main1.s
rename to ld/testsuite/ld-mmix/main1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/mmix.exp b/ld/testsuite/ld-mmix/mmix.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/mmix.exp
rename to ld/testsuite/ld-mmix/mmix.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/mmohdr1.ld b/ld/testsuite/ld-mmix/mmohdr1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/mmohdr1.ld
rename to ld/testsuite/ld-mmix/mmohdr1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/mmosec1.ld b/ld/testsuite/ld-mmix/mmosec1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/mmosec1.ld
rename to ld/testsuite/ld-mmix/mmosec1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/mmosec2.ld b/ld/testsuite/ld-mmix/mmosec2.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/mmosec2.ld
rename to ld/testsuite/ld-mmix/mmosec2.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/nop123.s b/ld/testsuite/ld-mmix/nop123.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/nop123.s
rename to ld/testsuite/ld-mmix/nop123.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pad16.s b/ld/testsuite/ld-mmix/pad16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pad16.s
rename to ld/testsuite/ld-mmix/pad16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pad2p18m32.s b/ld/testsuite/ld-mmix/pad2p18m32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pad2p18m32.s
rename to ld/testsuite/ld-mmix/pad2p18m32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pad2p26m32.s b/ld/testsuite/ld-mmix/pad2p26m32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pad2p26m32.s
rename to ld/testsuite/ld-mmix/pad2p26m32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pad4.s b/ld/testsuite/ld-mmix/pad4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pad4.s
rename to ld/testsuite/ld-mmix/pad4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja.s b/ld/testsuite/ld-mmix/pushja.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja.s
rename to ld/testsuite/ld-mmix/pushja.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1b-s.d b/ld/testsuite/ld-mmix/pushja1b-s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1b-s.d
rename to ld/testsuite/ld-mmix/pushja1b-s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1b.d b/ld/testsuite/ld-mmix/pushja1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1b.d
rename to ld/testsuite/ld-mmix/pushja1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1f-s.d b/ld/testsuite/ld-mmix/pushja1f-s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1f-s.d
rename to ld/testsuite/ld-mmix/pushja1f-s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1f.d b/ld/testsuite/ld-mmix/pushja1f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja1f.d
rename to ld/testsuite/ld-mmix/pushja1f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja2b.d b/ld/testsuite/ld-mmix/pushja2b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja2b.d
rename to ld/testsuite/ld-mmix/pushja2b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja2f.d b/ld/testsuite/ld-mmix/pushja2f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja2f.d
rename to ld/testsuite/ld-mmix/pushja2f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7b-s.d b/ld/testsuite/ld-mmix/pushja7b-s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7b-s.d
rename to ld/testsuite/ld-mmix/pushja7b-s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7b.d b/ld/testsuite/ld-mmix/pushja7b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7b.d
rename to ld/testsuite/ld-mmix/pushja7b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7f-s.d b/ld/testsuite/ld-mmix/pushja7f-s.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7f-s.d
rename to ld/testsuite/ld-mmix/pushja7f-s.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7f.d b/ld/testsuite/ld-mmix/pushja7f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja7f.d
rename to ld/testsuite/ld-mmix/pushja7f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja8b.d b/ld/testsuite/ld-mmix/pushja8b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja8b.d
rename to ld/testsuite/ld-mmix/pushja8b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja8f.d b/ld/testsuite/ld-mmix/pushja8f.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushja8f.d
rename to ld/testsuite/ld-mmix/pushja8f.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1.d b/ld/testsuite/ld-mmix/pushjs1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1.d
rename to ld/testsuite/ld-mmix/pushjs1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1b.d b/ld/testsuite/ld-mmix/pushjs1b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1b.d
rename to ld/testsuite/ld-mmix/pushjs1b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1bm.d b/ld/testsuite/ld-mmix/pushjs1bm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1bm.d
rename to ld/testsuite/ld-mmix/pushjs1bm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1m.d b/ld/testsuite/ld-mmix/pushjs1m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1m.d
rename to ld/testsuite/ld-mmix/pushjs1m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1r.d b/ld/testsuite/ld-mmix/pushjs1r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs1r.d
rename to ld/testsuite/ld-mmix/pushjs1r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2.d b/ld/testsuite/ld-mmix/pushjs2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2.d
rename to ld/testsuite/ld-mmix/pushjs2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2b.d b/ld/testsuite/ld-mmix/pushjs2b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2b.d
rename to ld/testsuite/ld-mmix/pushjs2b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2bm.d b/ld/testsuite/ld-mmix/pushjs2bm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2bm.d
rename to ld/testsuite/ld-mmix/pushjs2bm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2m.d b/ld/testsuite/ld-mmix/pushjs2m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2m.d
rename to ld/testsuite/ld-mmix/pushjs2m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2r.d b/ld/testsuite/ld-mmix/pushjs2r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs2r.d
rename to ld/testsuite/ld-mmix/pushjs2r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3.d b/ld/testsuite/ld-mmix/pushjs3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3.d
rename to ld/testsuite/ld-mmix/pushjs3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3b.d b/ld/testsuite/ld-mmix/pushjs3b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3b.d
rename to ld/testsuite/ld-mmix/pushjs3b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3bm.d b/ld/testsuite/ld-mmix/pushjs3bm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3bm.d
rename to ld/testsuite/ld-mmix/pushjs3bm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3m.d b/ld/testsuite/ld-mmix/pushjs3m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3m.d
rename to ld/testsuite/ld-mmix/pushjs3m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3r.d b/ld/testsuite/ld-mmix/pushjs3r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs3r.d
rename to ld/testsuite/ld-mmix/pushjs3r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4.d b/ld/testsuite/ld-mmix/pushjs4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4.d
rename to ld/testsuite/ld-mmix/pushjs4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4b.d b/ld/testsuite/ld-mmix/pushjs4b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4b.d
rename to ld/testsuite/ld-mmix/pushjs4b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4bm.d b/ld/testsuite/ld-mmix/pushjs4bm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4bm.d
rename to ld/testsuite/ld-mmix/pushjs4bm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4m.d b/ld/testsuite/ld-mmix/pushjs4m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4m.d
rename to ld/testsuite/ld-mmix/pushjs4m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4r.d b/ld/testsuite/ld-mmix/pushjs4r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/pushjs4r.d
rename to ld/testsuite/ld-mmix/pushjs4r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-1.d b/ld/testsuite/ld-mmix/reg-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-1.d
rename to ld/testsuite/ld-mmix/reg-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-1m.d b/ld/testsuite/ld-mmix/reg-1m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-1m.d
rename to ld/testsuite/ld-mmix/reg-1m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-2.d b/ld/testsuite/ld-mmix/reg-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-2.d
rename to ld/testsuite/ld-mmix/reg-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-2m.d b/ld/testsuite/ld-mmix/reg-2m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/reg-2m.d
rename to ld/testsuite/ld-mmix/reg-2m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/regext1.s b/ld/testsuite/ld-mmix/regext1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/regext1.s
rename to ld/testsuite/ld-mmix/regext1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-1.d b/ld/testsuite/ld-mmix/sec-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-1.d
rename to ld/testsuite/ld-mmix/sec-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-1.s b/ld/testsuite/ld-mmix/sec-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-1.s
rename to ld/testsuite/ld-mmix/sec-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-2.d b/ld/testsuite/ld-mmix/sec-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-2.d
rename to ld/testsuite/ld-mmix/sec-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-2.s b/ld/testsuite/ld-mmix/sec-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-2.s
rename to ld/testsuite/ld-mmix/sec-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-3.d b/ld/testsuite/ld-mmix/sec-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-3.d
rename to ld/testsuite/ld-mmix/sec-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-4.d b/ld/testsuite/ld-mmix/sec-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-4.d
rename to ld/testsuite/ld-mmix/sec-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-5.d b/ld/testsuite/ld-mmix/sec-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-5.d
rename to ld/testsuite/ld-mmix/sec-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-6.d b/ld/testsuite/ld-mmix/sec-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-6.d
rename to ld/testsuite/ld-mmix/sec-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-6.s b/ld/testsuite/ld-mmix/sec-6.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-6.s
rename to ld/testsuite/ld-mmix/sec-6.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-6m.d b/ld/testsuite/ld-mmix/sec-6m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-6m.d
rename to ld/testsuite/ld-mmix/sec-6m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7a.s b/ld/testsuite/ld-mmix/sec-7a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7a.s
rename to ld/testsuite/ld-mmix/sec-7a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7b.s b/ld/testsuite/ld-mmix/sec-7b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7b.s
rename to ld/testsuite/ld-mmix/sec-7b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7c.s b/ld/testsuite/ld-mmix/sec-7c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7c.s
rename to ld/testsuite/ld-mmix/sec-7c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7d.s b/ld/testsuite/ld-mmix/sec-7d.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7d.s
rename to ld/testsuite/ld-mmix/sec-7d.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7e.s b/ld/testsuite/ld-mmix/sec-7e.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7e.s
rename to ld/testsuite/ld-mmix/sec-7e.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7m.d b/ld/testsuite/ld-mmix/sec-7m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-7m.d
rename to ld/testsuite/ld-mmix/sec-7m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8a.s b/ld/testsuite/ld-mmix/sec-8a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8a.s
rename to ld/testsuite/ld-mmix/sec-8a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8b.s b/ld/testsuite/ld-mmix/sec-8b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8b.s
rename to ld/testsuite/ld-mmix/sec-8b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8d.s b/ld/testsuite/ld-mmix/sec-8d.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8d.s
rename to ld/testsuite/ld-mmix/sec-8d.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8m.d b/ld/testsuite/ld-mmix/sec-8m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8m.d
rename to ld/testsuite/ld-mmix/sec-8m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8m.s b/ld/testsuite/ld-mmix/sec-8m.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-8m.s
rename to ld/testsuite/ld-mmix/sec-8m.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-9.d b/ld/testsuite/ld-mmix/sec-9.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sec-9.d
rename to ld/testsuite/ld-mmix/sec-9.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec801.d b/ld/testsuite/ld-mmix/spec801.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec801.d
rename to ld/testsuite/ld-mmix/spec801.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec802.d b/ld/testsuite/ld-mmix/spec802.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec802.d
rename to ld/testsuite/ld-mmix/spec802.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec803.d b/ld/testsuite/ld-mmix/spec803.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec803.d
rename to ld/testsuite/ld-mmix/spec803.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec804.d b/ld/testsuite/ld-mmix/spec804.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec804.d
rename to ld/testsuite/ld-mmix/spec804.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec805.d b/ld/testsuite/ld-mmix/spec805.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec805.d
rename to ld/testsuite/ld-mmix/spec805.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec806.d b/ld/testsuite/ld-mmix/spec806.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec806.d
rename to ld/testsuite/ld-mmix/spec806.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec807.d b/ld/testsuite/ld-mmix/spec807.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec807.d
rename to ld/testsuite/ld-mmix/spec807.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/spec808.d b/ld/testsuite/ld-mmix/spec808.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/spec808.d
rename to ld/testsuite/ld-mmix/spec808.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/start-1.d b/ld/testsuite/ld-mmix/start-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/start-1.d
rename to ld/testsuite/ld-mmix/start-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/start-2.d b/ld/testsuite/ld-mmix/start-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/start-2.d
rename to ld/testsuite/ld-mmix/start-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/start.s b/ld/testsuite/ld-mmix/start.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/start.s
rename to ld/testsuite/ld-mmix/start.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/start2.s b/ld/testsuite/ld-mmix/start2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/start2.s
rename to ld/testsuite/ld-mmix/start2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/start3.s b/ld/testsuite/ld-mmix/start3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/start3.s
rename to ld/testsuite/ld-mmix/start3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/start4.s b/ld/testsuite/ld-mmix/start4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/start4.s
rename to ld/testsuite/ld-mmix/start4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sym-1.d b/ld/testsuite/ld-mmix/sym-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sym-1.d
rename to ld/testsuite/ld-mmix/sym-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sym-2.d b/ld/testsuite/ld-mmix/sym-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sym-2.d
rename to ld/testsuite/ld-mmix/sym-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/sym-2.s b/ld/testsuite/ld-mmix/sym-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/sym-2.s
rename to ld/testsuite/ld-mmix/sym-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-1.d b/ld/testsuite/ld-mmix/undef-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-1.d
rename to ld/testsuite/ld-mmix/undef-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-1.s b/ld/testsuite/ld-mmix/undef-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-1.s
rename to ld/testsuite/ld-mmix/undef-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-1m.d b/ld/testsuite/ld-mmix/undef-1m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-1m.d
rename to ld/testsuite/ld-mmix/undef-1m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-2.d b/ld/testsuite/ld-mmix/undef-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-2.d
rename to ld/testsuite/ld-mmix/undef-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-2.s b/ld/testsuite/ld-mmix/undef-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-2.s
rename to ld/testsuite/ld-mmix/undef-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-2m.d b/ld/testsuite/ld-mmix/undef-2m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-2m.d
rename to ld/testsuite/ld-mmix/undef-2m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-3.d b/ld/testsuite/ld-mmix/undef-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-3.d
rename to ld/testsuite/ld-mmix/undef-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-3m.d b/ld/testsuite/ld-mmix/undef-3m.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/undef-3m.d
rename to ld/testsuite/ld-mmix/undef-3m.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/x.s b/ld/testsuite/ld-mmix/x.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/x.s
rename to ld/testsuite/ld-mmix/x.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/y.s b/ld/testsuite/ld-mmix/y.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/y.s
rename to ld/testsuite/ld-mmix/y.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/zeroeh.ld b/ld/testsuite/ld-mmix/zeroeh.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/zeroeh.ld
rename to ld/testsuite/ld-mmix/zeroeh.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/zeroehelf.d b/ld/testsuite/ld-mmix/zeroehelf.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/zeroehelf.d
rename to ld/testsuite/ld-mmix/zeroehelf.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mmix/zeroehmmo.d b/ld/testsuite/ld-mmix/zeroehmmo.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mmix/zeroehmmo.d
rename to ld/testsuite/ld-mmix/zeroehmmo.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-1.d b/ld/testsuite/ld-mn10300/i112045-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-1.d
rename to ld/testsuite/ld-mn10300/i112045-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-1.s b/ld/testsuite/ld-mn10300/i112045-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-1.s
rename to ld/testsuite/ld-mn10300/i112045-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-2.d b/ld/testsuite/ld-mn10300/i112045-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-2.d
rename to ld/testsuite/ld-mn10300/i112045-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-2.s b/ld/testsuite/ld-mn10300/i112045-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-2.s
rename to ld/testsuite/ld-mn10300/i112045-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-3.d b/ld/testsuite/ld-mn10300/i112045-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-3.d
rename to ld/testsuite/ld-mn10300/i112045-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-3.s b/ld/testsuite/ld-mn10300/i112045-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i112045-3.s
rename to ld/testsuite/ld-mn10300/i112045-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i126256-1.c b/ld/testsuite/ld-mn10300/i126256-1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i126256-1.c
rename to ld/testsuite/ld-mn10300/i126256-1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i126256-2.c b/ld/testsuite/ld-mn10300/i126256-2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i126256-2.c
rename to ld/testsuite/ld-mn10300/i126256-2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i127740.d b/ld/testsuite/ld-mn10300/i127740.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i127740.d
rename to ld/testsuite/ld-mn10300/i127740.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i127740.s b/ld/testsuite/ld-mn10300/i127740.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i127740.s
rename to ld/testsuite/ld-mn10300/i127740.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-1.d b/ld/testsuite/ld-mn10300/i135409-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-1.d
rename to ld/testsuite/ld-mn10300/i135409-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-1.s b/ld/testsuite/ld-mn10300/i135409-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-1.s
rename to ld/testsuite/ld-mn10300/i135409-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-2.d b/ld/testsuite/ld-mn10300/i135409-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-2.d
rename to ld/testsuite/ld-mn10300/i135409-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-2.s b/ld/testsuite/ld-mn10300/i135409-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-2.s
rename to ld/testsuite/ld-mn10300/i135409-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-3.d b/ld/testsuite/ld-mn10300/i135409-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-3.d
rename to ld/testsuite/ld-mn10300/i135409-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-3.s b/ld/testsuite/ld-mn10300/i135409-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-3.s
rename to ld/testsuite/ld-mn10300/i135409-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-4.d b/ld/testsuite/ld-mn10300/i135409-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-4.d
rename to ld/testsuite/ld-mn10300/i135409-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-4.s b/ld/testsuite/ld-mn10300/i135409-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-4.s
rename to ld/testsuite/ld-mn10300/i135409-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-4.t b/ld/testsuite/ld-mn10300/i135409-4.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-4.t
rename to ld/testsuite/ld-mn10300/i135409-4.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-5.d b/ld/testsuite/ld-mn10300/i135409-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-5.d
rename to ld/testsuite/ld-mn10300/i135409-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-5.s b/ld/testsuite/ld-mn10300/i135409-5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-5.s
rename to ld/testsuite/ld-mn10300/i135409-5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-5.t b/ld/testsuite/ld-mn10300/i135409-5.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i135409-5.t
rename to ld/testsuite/ld-mn10300/i135409-5.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i143317.d b/ld/testsuite/ld-mn10300/i143317.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i143317.d
rename to ld/testsuite/ld-mn10300/i143317.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i143317.s b/ld/testsuite/ld-mn10300/i143317.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i143317.s
rename to ld/testsuite/ld-mn10300/i143317.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i143317.t b/ld/testsuite/ld-mn10300/i143317.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i143317.t
rename to ld/testsuite/ld-mn10300/i143317.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i36434-2.s b/ld/testsuite/ld-mn10300/i36434-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i36434-2.s
rename to ld/testsuite/ld-mn10300/i36434-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i36434.d b/ld/testsuite/ld-mn10300/i36434.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i36434.d
rename to ld/testsuite/ld-mn10300/i36434.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/i36434.s b/ld/testsuite/ld-mn10300/i36434.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/i36434.s
rename to ld/testsuite/ld-mn10300/i36434.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-mn10300/mn10300.exp b/ld/testsuite/ld-mn10300/mn10300.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-mn10300/mn10300.exp
rename to ld/testsuite/ld-mn10300/mn10300.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-1.c b/ld/testsuite/ld-pe/aligncomm-1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-1.c
rename to ld/testsuite/ld-pe/aligncomm-1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-2.c b/ld/testsuite/ld-pe/aligncomm-2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-2.c
rename to ld/testsuite/ld-pe/aligncomm-2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-3.c b/ld/testsuite/ld-pe/aligncomm-3.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-3.c
rename to ld/testsuite/ld-pe/aligncomm-3.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-4.c b/ld/testsuite/ld-pe/aligncomm-4.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm-4.c
rename to ld/testsuite/ld-pe/aligncomm-4.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm.d b/ld/testsuite/ld-pe/aligncomm.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/aligncomm.d
rename to ld/testsuite/ld-pe/aligncomm.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/basefile1.s b/ld/testsuite/ld-pe/basefile1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/basefile1.s
rename to ld/testsuite/ld-pe/basefile1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/direct2_client.c b/ld/testsuite/ld-pe/direct2_client.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/direct2_client.c
rename to ld/testsuite/ld-pe/direct2_client.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/direct2_dll.c b/ld/testsuite/ld-pe/direct2_dll.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/direct2_dll.c
rename to ld/testsuite/ld-pe/direct2_dll.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/direct2_dll.def b/ld/testsuite/ld-pe/direct2_dll.def
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/direct2_dll.def
rename to ld/testsuite/ld-pe/direct2_dll.def
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/direct_client.c b/ld/testsuite/ld-pe/direct_client.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/direct_client.c
rename to ld/testsuite/ld-pe/direct_client.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/direct_dll.c b/ld/testsuite/ld-pe/direct_dll.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/direct_dll.c
rename to ld/testsuite/ld-pe/direct_dll.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/export_dynamic_warning.d b/ld/testsuite/ld-pe/export_dynamic_warning.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/export_dynamic_warning.d
rename to ld/testsuite/ld-pe/export_dynamic_warning.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/export_dynamic_warning.s b/ld/testsuite/ld-pe/export_dynamic_warning.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/export_dynamic_warning.s
rename to ld/testsuite/ld-pe/export_dynamic_warning.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/exports.d b/ld/testsuite/ld-pe/exports.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/exports.d
rename to ld/testsuite/ld-pe/exports.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/exports.s b/ld/testsuite/ld-pe/exports.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/exports.s
rename to ld/testsuite/ld-pe/exports.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/exports64.d b/ld/testsuite/ld-pe/exports64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/exports64.d
rename to ld/testsuite/ld-pe/exports64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/image_size.d b/ld/testsuite/ld-pe/image_size.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/image_size.d
rename to ld/testsuite/ld-pe/image_size.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/image_size.s b/ld/testsuite/ld-pe/image_size.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/image_size.s
rename to ld/testsuite/ld-pe/image_size.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/image_size.t b/ld/testsuite/ld-pe/image_size.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/image_size.t
rename to ld/testsuite/ld-pe/image_size.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-1.d b/ld/testsuite/ld-pe/longsecn-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-1.d
rename to ld/testsuite/ld-pe/longsecn-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-2.d b/ld/testsuite/ld-pe/longsecn-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-2.d
rename to ld/testsuite/ld-pe/longsecn-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-3.d b/ld/testsuite/ld-pe/longsecn-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-3.d
rename to ld/testsuite/ld-pe/longsecn-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-4.d b/ld/testsuite/ld-pe/longsecn-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-4.d
rename to ld/testsuite/ld-pe/longsecn-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-5.d b/ld/testsuite/ld-pe/longsecn-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn-5.d
rename to ld/testsuite/ld-pe/longsecn-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn.d b/ld/testsuite/ld-pe/longsecn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn.d
rename to ld/testsuite/ld-pe/longsecn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn.s b/ld/testsuite/ld-pe/longsecn.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/longsecn.s
rename to ld/testsuite/ld-pe/longsecn.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/non-c-lang-syms.d b/ld/testsuite/ld-pe/non-c-lang-syms.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/non-c-lang-syms.d
rename to ld/testsuite/ld-pe/non-c-lang-syms.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/non-c-lang-syms.s b/ld/testsuite/ld-pe/non-c-lang-syms.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/non-c-lang-syms.s
rename to ld/testsuite/ld-pe/non-c-lang-syms.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/orphan.d b/ld/testsuite/ld-pe/orphan.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/orphan.d
rename to ld/testsuite/ld-pe/orphan.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/orphan_nu.d b/ld/testsuite/ld-pe/orphan_nu.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/orphan_nu.d
rename to ld/testsuite/ld-pe/orphan_nu.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/orphana.s b/ld/testsuite/ld-pe/orphana.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/orphana.s
rename to ld/testsuite/ld-pe/orphana.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/orphana_nu.s b/ld/testsuite/ld-pe/orphana_nu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/orphana_nu.s
rename to ld/testsuite/ld-pe/orphana_nu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/orphanb.s b/ld/testsuite/ld-pe/orphanb.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/orphanb.s
rename to ld/testsuite/ld-pe/orphanb.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/orphand.s b/ld/testsuite/ld-pe/orphand.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/orphand.s
rename to ld/testsuite/ld-pe/orphand.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/orphane.s b/ld/testsuite/ld-pe/orphane.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/orphane.s
rename to ld/testsuite/ld-pe/orphane.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/pe-compile.exp b/ld/testsuite/ld-pe/pe-compile.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/pe-compile.exp
rename to ld/testsuite/ld-pe/pe-compile.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/pe-run.exp b/ld/testsuite/ld-pe/pe-run.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/pe-run.exp
rename to ld/testsuite/ld-pe/pe-run.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/pe-run2.exp b/ld/testsuite/ld-pe/pe-run2.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/pe-run2.exp
rename to ld/testsuite/ld-pe/pe-run2.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/pe.exp b/ld/testsuite/ld-pe/pe.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/pe.exp
rename to ld/testsuite/ld-pe/pe.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/secrel.d b/ld/testsuite/ld-pe/secrel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/secrel.d
rename to ld/testsuite/ld-pe/secrel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/secrel1.s b/ld/testsuite/ld-pe/secrel1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/secrel1.s
rename to ld/testsuite/ld-pe/secrel1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/secrel2.s b/ld/testsuite/ld-pe/secrel2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/secrel2.s
rename to ld/testsuite/ld-pe/secrel2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/secrel_64.d b/ld/testsuite/ld-pe/secrel_64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/secrel_64.d
rename to ld/testsuite/ld-pe/secrel_64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-1.d b/ld/testsuite/ld-pe/vers-script-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-1.d
rename to ld/testsuite/ld-pe/vers-script-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-1.ver b/ld/testsuite/ld-pe/vers-script-1.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-1.ver
rename to ld/testsuite/ld-pe/vers-script-1.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-2.d b/ld/testsuite/ld-pe/vers-script-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-2.d
rename to ld/testsuite/ld-pe/vers-script-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-2.ver b/ld/testsuite/ld-pe/vers-script-2.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-2.ver
rename to ld/testsuite/ld-pe/vers-script-2.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-3.d b/ld/testsuite/ld-pe/vers-script-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-3.d
rename to ld/testsuite/ld-pe/vers-script-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-3.ver b/ld/testsuite/ld-pe/vers-script-3.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-3.ver
rename to ld/testsuite/ld-pe/vers-script-3.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-4.d b/ld/testsuite/ld-pe/vers-script-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-4.d
rename to ld/testsuite/ld-pe/vers-script-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-4.ver b/ld/testsuite/ld-pe/vers-script-4.ver
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-4.ver
rename to ld/testsuite/ld-pe/vers-script-4.ver
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-dll.c b/ld/testsuite/ld-pe/vers-script-dll.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pe/vers-script-dll.c
rename to ld/testsuite/ld-pe/vers-script-dll.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pie/pie.c b/ld/testsuite/ld-pie/pie.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pie/pie.c
rename to ld/testsuite/ld-pie/pie.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pie/pie.exp b/ld/testsuite/ld-pie/pie.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pie/pie.exp
rename to ld/testsuite/ld-pie/pie.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pie/start.d b/ld/testsuite/ld-pie/start.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pie/start.d
rename to ld/testsuite/ld-pie/start.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pie/start.s b/ld/testsuite/ld-pie/start.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pie/start.s
rename to ld/testsuite/ld-pie/start.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pie/weakundef-data.c b/ld/testsuite/ld-pie/weakundef-data.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pie/weakundef-data.c
rename to ld/testsuite/ld-pie/weakundef-data.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pie/weakundef.c b/ld/testsuite/ld-pie/weakundef.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pie/weakundef.c
rename to ld/testsuite/ld-pie/weakundef.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-pie/weakundef.out b/ld/testsuite/ld-pie/weakundef.out
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-pie/weakundef.out
rename to ld/testsuite/ld-pie/weakundef.out
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/func.c b/ld/testsuite/ld-plugin/func.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/func.c
rename to ld/testsuite/ld-plugin/func.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/main.c b/ld/testsuite/ld-plugin/main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/main.c
rename to ld/testsuite/ld-plugin/main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-1.d b/ld/testsuite/ld-plugin/plugin-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-1.d
rename to ld/testsuite/ld-plugin/plugin-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-10.d b/ld/testsuite/ld-plugin/plugin-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-10.d
rename to ld/testsuite/ld-plugin/plugin-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-11.d b/ld/testsuite/ld-plugin/plugin-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-11.d
rename to ld/testsuite/ld-plugin/plugin-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-2.d b/ld/testsuite/ld-plugin/plugin-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-2.d
rename to ld/testsuite/ld-plugin/plugin-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-3.d b/ld/testsuite/ld-plugin/plugin-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-3.d
rename to ld/testsuite/ld-plugin/plugin-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-4.d b/ld/testsuite/ld-plugin/plugin-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-4.d
rename to ld/testsuite/ld-plugin/plugin-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-5.d b/ld/testsuite/ld-plugin/plugin-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-5.d
rename to ld/testsuite/ld-plugin/plugin-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-6.d b/ld/testsuite/ld-plugin/plugin-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-6.d
rename to ld/testsuite/ld-plugin/plugin-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-7.d b/ld/testsuite/ld-plugin/plugin-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-7.d
rename to ld/testsuite/ld-plugin/plugin-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-8.d b/ld/testsuite/ld-plugin/plugin-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-8.d
rename to ld/testsuite/ld-plugin/plugin-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-9.d b/ld/testsuite/ld-plugin/plugin-9.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-9.d
rename to ld/testsuite/ld-plugin/plugin-9.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-ignore.d b/ld/testsuite/ld-plugin/plugin-ignore.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-ignore.d
rename to ld/testsuite/ld-plugin/plugin-ignore.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-vis-1.d b/ld/testsuite/ld-plugin/plugin-vis-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin-vis-1.d
rename to ld/testsuite/ld-plugin/plugin-vis-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin.exp b/ld/testsuite/ld-plugin/plugin.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/plugin.exp
rename to ld/testsuite/ld-plugin/plugin.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-plugin/text.c b/ld/testsuite/ld-plugin/text.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-plugin/text.c
rename to ld/testsuite/ld-plugin/text.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.dd b/ld/testsuite/ld-powerpc/aix-abs-branch-1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.dd
rename to ld/testsuite/ld-powerpc/aix-abs-branch-1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.ex b/ld/testsuite/ld-powerpc/aix-abs-branch-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.ex
rename to ld/testsuite/ld-powerpc/aix-abs-branch-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.im b/ld/testsuite/ld-powerpc/aix-abs-branch-1.im
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.im
rename to ld/testsuite/ld-powerpc/aix-abs-branch-1.im
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.nd b/ld/testsuite/ld-powerpc/aix-abs-branch-1.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.nd
rename to ld/testsuite/ld-powerpc/aix-abs-branch-1.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.s b/ld/testsuite/ld-powerpc/aix-abs-branch-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-branch-1.s
rename to ld/testsuite/ld-powerpc/aix-abs-branch-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex
rename to ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.im b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.im
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.im
rename to ld/testsuite/ld-powerpc/aix-abs-reloc-1.im
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.nd b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.nd
rename to ld/testsuite/ld-powerpc/aix-abs-reloc-1.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.od b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.od
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.od
rename to ld/testsuite/ld-powerpc/aix-abs-reloc-1.od
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.s b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-abs-reloc-1.s
rename to ld/testsuite/ld-powerpc/aix-abs-reloc-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-1.ex b/ld/testsuite/ld-powerpc/aix-core-sec-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-1.ex
rename to ld/testsuite/ld-powerpc/aix-core-sec-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-1.hd b/ld/testsuite/ld-powerpc/aix-core-sec-1.hd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-1.hd
rename to ld/testsuite/ld-powerpc/aix-core-sec-1.hd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-1.s b/ld/testsuite/ld-powerpc/aix-core-sec-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-1.s
rename to ld/testsuite/ld-powerpc/aix-core-sec-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-2.ex b/ld/testsuite/ld-powerpc/aix-core-sec-2.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-2.ex
rename to ld/testsuite/ld-powerpc/aix-core-sec-2.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-2.hd b/ld/testsuite/ld-powerpc/aix-core-sec-2.hd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-2.hd
rename to ld/testsuite/ld-powerpc/aix-core-sec-2.hd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-2.s b/ld/testsuite/ld-powerpc/aix-core-sec-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-2.s
rename to ld/testsuite/ld-powerpc/aix-core-sec-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-3.ex b/ld/testsuite/ld-powerpc/aix-core-sec-3.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-3.ex
rename to ld/testsuite/ld-powerpc/aix-core-sec-3.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-3.hd b/ld/testsuite/ld-powerpc/aix-core-sec-3.hd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-3.hd
rename to ld/testsuite/ld-powerpc/aix-core-sec-3.hd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-3.s b/ld/testsuite/ld-powerpc/aix-core-sec-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-core-sec-3.s
rename to ld/testsuite/ld-powerpc/aix-core-sec-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1-all.dd b/ld/testsuite/ld-powerpc/aix-export-1-all.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1-all.dd
rename to ld/testsuite/ld-powerpc/aix-export-1-all.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1-full.dd b/ld/testsuite/ld-powerpc/aix-export-1-full.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1-full.dd
rename to ld/testsuite/ld-powerpc/aix-export-1-full.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1a.s b/ld/testsuite/ld-powerpc/aix-export-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1a.s
rename to ld/testsuite/ld-powerpc/aix-export-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1b.s b/ld/testsuite/ld-powerpc/aix-export-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-1b.s
rename to ld/testsuite/ld-powerpc/aix-export-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-2.nd b/ld/testsuite/ld-powerpc/aix-export-2.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-2.nd
rename to ld/testsuite/ld-powerpc/aix-export-2.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-2.s b/ld/testsuite/ld-powerpc/aix-export-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-export-2.s
rename to ld/testsuite/ld-powerpc/aix-export-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1-32.dd b/ld/testsuite/ld-powerpc/aix-gc-1-32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1-32.dd
rename to ld/testsuite/ld-powerpc/aix-gc-1-32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1-64.dd b/ld/testsuite/ld-powerpc/aix-gc-1-64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1-64.dd
rename to ld/testsuite/ld-powerpc/aix-gc-1-64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1.ex b/ld/testsuite/ld-powerpc/aix-gc-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1.ex
rename to ld/testsuite/ld-powerpc/aix-gc-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1.nd b/ld/testsuite/ld-powerpc/aix-gc-1.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1.nd
rename to ld/testsuite/ld-powerpc/aix-gc-1.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1.s b/ld/testsuite/ld-powerpc/aix-gc-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-gc-1.s
rename to ld/testsuite/ld-powerpc/aix-gc-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-32.d b/ld/testsuite/ld-powerpc/aix-glink-1-32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-32.d
rename to ld/testsuite/ld-powerpc/aix-glink-1-32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-32.dd b/ld/testsuite/ld-powerpc/aix-glink-1-32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-32.dd
rename to ld/testsuite/ld-powerpc/aix-glink-1-32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-64.d b/ld/testsuite/ld-powerpc/aix-glink-1-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-64.d
rename to ld/testsuite/ld-powerpc/aix-glink-1-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-64.dd b/ld/testsuite/ld-powerpc/aix-glink-1-64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1-64.dd
rename to ld/testsuite/ld-powerpc/aix-glink-1-64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1.ex b/ld/testsuite/ld-powerpc/aix-glink-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1.ex
rename to ld/testsuite/ld-powerpc/aix-glink-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1.s b/ld/testsuite/ld-powerpc/aix-glink-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-1.s
rename to ld/testsuite/ld-powerpc/aix-glink-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2-32.dd b/ld/testsuite/ld-powerpc/aix-glink-2-32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2-32.dd
rename to ld/testsuite/ld-powerpc/aix-glink-2-32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2-64.dd b/ld/testsuite/ld-powerpc/aix-glink-2-64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2-64.dd
rename to ld/testsuite/ld-powerpc/aix-glink-2-64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2a.ex b/ld/testsuite/ld-powerpc/aix-glink-2a.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2a.ex
rename to ld/testsuite/ld-powerpc/aix-glink-2a.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2a.s b/ld/testsuite/ld-powerpc/aix-glink-2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2a.s
rename to ld/testsuite/ld-powerpc/aix-glink-2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2b.s b/ld/testsuite/ld-powerpc/aix-glink-2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2b.s
rename to ld/testsuite/ld-powerpc/aix-glink-2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2c.ex b/ld/testsuite/ld-powerpc/aix-glink-2c.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2c.ex
rename to ld/testsuite/ld-powerpc/aix-glink-2c.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2c.s b/ld/testsuite/ld-powerpc/aix-glink-2c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2c.s
rename to ld/testsuite/ld-powerpc/aix-glink-2c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2d.s b/ld/testsuite/ld-powerpc/aix-glink-2d.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-2d.s
rename to ld/testsuite/ld-powerpc/aix-glink-2d.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3-32.d b/ld/testsuite/ld-powerpc/aix-glink-3-32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3-32.d
rename to ld/testsuite/ld-powerpc/aix-glink-3-32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3-64.d b/ld/testsuite/ld-powerpc/aix-glink-3-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3-64.d
rename to ld/testsuite/ld-powerpc/aix-glink-3-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3.dd b/ld/testsuite/ld-powerpc/aix-glink-3.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3.dd
rename to ld/testsuite/ld-powerpc/aix-glink-3.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3.s b/ld/testsuite/ld-powerpc/aix-glink-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3.s
rename to ld/testsuite/ld-powerpc/aix-glink-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3a.s b/ld/testsuite/ld-powerpc/aix-glink-3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3a.s
rename to ld/testsuite/ld-powerpc/aix-glink-3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3b.s b/ld/testsuite/ld-powerpc/aix-glink-3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-glink-3b.s
rename to ld/testsuite/ld-powerpc/aix-glink-3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1.s b/ld/testsuite/ld-powerpc/aix-lineno-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1.s
rename to ld/testsuite/ld-powerpc/aix-lineno-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1.txt b/ld/testsuite/ld-powerpc/aix-lineno-1.txt
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1.txt
rename to ld/testsuite/ld-powerpc/aix-lineno-1.txt
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1a.dd b/ld/testsuite/ld-powerpc/aix-lineno-1a.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1a.dd
rename to ld/testsuite/ld-powerpc/aix-lineno-1a.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1a.nd b/ld/testsuite/ld-powerpc/aix-lineno-1a.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1a.nd
rename to ld/testsuite/ld-powerpc/aix-lineno-1a.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1b.dd b/ld/testsuite/ld-powerpc/aix-lineno-1b.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1b.dd
rename to ld/testsuite/ld-powerpc/aix-lineno-1b.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1b.nd b/ld/testsuite/ld-powerpc/aix-lineno-1b.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-lineno-1b.nd
rename to ld/testsuite/ld-powerpc/aix-lineno-1b.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.dnd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.dnd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.dnd
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.dnd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.drd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.drd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.drd
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.drd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.nd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.nd
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.rd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.rd
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.nd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.nd
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1.ex b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1.ex
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1.im b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1.im
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1.im
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1.im
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1a.s b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1a.s
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1b.s b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-no-dup-syms-1b.s
rename to ld/testsuite/ld-powerpc/aix-no-dup-syms-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-ref-1-32.od b/ld/testsuite/ld-powerpc/aix-ref-1-32.od
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-ref-1-32.od
rename to ld/testsuite/ld-powerpc/aix-ref-1-32.od
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-ref-1-64.od b/ld/testsuite/ld-powerpc/aix-ref-1-64.od
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-ref-1-64.od
rename to ld/testsuite/ld-powerpc/aix-ref-1-64.od
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-ref-1.s b/ld/testsuite/ld-powerpc/aix-ref-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-ref-1.s
rename to ld/testsuite/ld-powerpc/aix-ref-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-rel-1.od b/ld/testsuite/ld-powerpc/aix-rel-1.od
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-rel-1.od
rename to ld/testsuite/ld-powerpc/aix-rel-1.od
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-rel-1.s b/ld/testsuite/ld-powerpc/aix-rel-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-rel-1.s
rename to ld/testsuite/ld-powerpc/aix-rel-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1-32.dd b/ld/testsuite/ld-powerpc/aix-toc-1-32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1-32.dd
rename to ld/testsuite/ld-powerpc/aix-toc-1-32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1-64.dd b/ld/testsuite/ld-powerpc/aix-toc-1-64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1-64.dd
rename to ld/testsuite/ld-powerpc/aix-toc-1-64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1.ex b/ld/testsuite/ld-powerpc/aix-toc-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1.ex
rename to ld/testsuite/ld-powerpc/aix-toc-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1a.s b/ld/testsuite/ld-powerpc/aix-toc-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1a.s
rename to ld/testsuite/ld-powerpc/aix-toc-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1b.s b/ld/testsuite/ld-powerpc/aix-toc-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-toc-1b.s
rename to ld/testsuite/ld-powerpc/aix-toc-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-dso.dnd b/ld/testsuite/ld-powerpc/aix-weak-1-dso.dnd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-dso.dnd
rename to ld/testsuite/ld-powerpc/aix-weak-1-dso.dnd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-dso.hd b/ld/testsuite/ld-powerpc/aix-weak-1-dso.hd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-dso.hd
rename to ld/testsuite/ld-powerpc/aix-weak-1-dso.hd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-dso.nd b/ld/testsuite/ld-powerpc/aix-weak-1-dso.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-dso.nd
rename to ld/testsuite/ld-powerpc/aix-weak-1-dso.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.dnd b/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.dnd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.dnd
rename to ld/testsuite/ld-powerpc/aix-weak-1-gcdso.dnd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.hd b/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.hd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.hd
rename to ld/testsuite/ld-powerpc/aix-weak-1-gcdso.hd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.nd b/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-gcdso.nd
rename to ld/testsuite/ld-powerpc/aix-weak-1-gcdso.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-rel.hd b/ld/testsuite/ld-powerpc/aix-weak-1-rel.hd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-rel.hd
rename to ld/testsuite/ld-powerpc/aix-weak-1-rel.hd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-rel.nd b/ld/testsuite/ld-powerpc/aix-weak-1-rel.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1-rel.nd
rename to ld/testsuite/ld-powerpc/aix-weak-1-rel.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1.ex b/ld/testsuite/ld-powerpc/aix-weak-1.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1.ex
rename to ld/testsuite/ld-powerpc/aix-weak-1.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1a.s b/ld/testsuite/ld-powerpc/aix-weak-1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1a.s
rename to ld/testsuite/ld-powerpc/aix-weak-1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1b.s b/ld/testsuite/ld-powerpc/aix-weak-1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-1b.s
rename to ld/testsuite/ld-powerpc/aix-weak-1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2a.ex b/ld/testsuite/ld-powerpc/aix-weak-2a.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2a.ex
rename to ld/testsuite/ld-powerpc/aix-weak-2a.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2a.nd b/ld/testsuite/ld-powerpc/aix-weak-2a.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2a.nd
rename to ld/testsuite/ld-powerpc/aix-weak-2a.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2a.s b/ld/testsuite/ld-powerpc/aix-weak-2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2a.s
rename to ld/testsuite/ld-powerpc/aix-weak-2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2b.nd b/ld/testsuite/ld-powerpc/aix-weak-2b.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2b.nd
rename to ld/testsuite/ld-powerpc/aix-weak-2b.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2b.s b/ld/testsuite/ld-powerpc/aix-weak-2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2b.s
rename to ld/testsuite/ld-powerpc/aix-weak-2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.ex b/ld/testsuite/ld-powerpc/aix-weak-2c.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.ex
rename to ld/testsuite/ld-powerpc/aix-weak-2c.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.nd b/ld/testsuite/ld-powerpc/aix-weak-2c.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.nd
rename to ld/testsuite/ld-powerpc/aix-weak-2c.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.od b/ld/testsuite/ld-powerpc/aix-weak-2c.od
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.od
rename to ld/testsuite/ld-powerpc/aix-weak-2c.od
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.s b/ld/testsuite/ld-powerpc/aix-weak-2c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-2c.s
rename to ld/testsuite/ld-powerpc/aix-weak-2c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-32.d b/ld/testsuite/ld-powerpc/aix-weak-3-32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-32.d
rename to ld/testsuite/ld-powerpc/aix-weak-3-32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-32.dd b/ld/testsuite/ld-powerpc/aix-weak-3-32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-32.dd
rename to ld/testsuite/ld-powerpc/aix-weak-3-32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-64.d b/ld/testsuite/ld-powerpc/aix-weak-3-64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-64.d
rename to ld/testsuite/ld-powerpc/aix-weak-3-64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-64.dd b/ld/testsuite/ld-powerpc/aix-weak-3-64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3-64.dd
rename to ld/testsuite/ld-powerpc/aix-weak-3-64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3a.ex b/ld/testsuite/ld-powerpc/aix-weak-3a.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3a.ex
rename to ld/testsuite/ld-powerpc/aix-weak-3a.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3a.s b/ld/testsuite/ld-powerpc/aix-weak-3a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3a.s
rename to ld/testsuite/ld-powerpc/aix-weak-3a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3b.ex b/ld/testsuite/ld-powerpc/aix-weak-3b.ex
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3b.ex
rename to ld/testsuite/ld-powerpc/aix-weak-3b.ex
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3b.s b/ld/testsuite/ld-powerpc/aix-weak-3b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix-weak-3b.s
rename to ld/testsuite/ld-powerpc/aix-weak-3b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix52.exp b/ld/testsuite/ld-powerpc/aix52.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/aix52.exp
rename to ld/testsuite/ld-powerpc/aix52.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo-nul.rd b/ld/testsuite/ld-powerpc/apuinfo-nul.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo-nul.rd
rename to ld/testsuite/ld-powerpc/apuinfo-nul.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo-nul.s b/ld/testsuite/ld-powerpc/apuinfo-nul.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo-nul.s
rename to ld/testsuite/ld-powerpc/apuinfo-nul.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo-nul1.s b/ld/testsuite/ld-powerpc/apuinfo-nul1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo-nul1.s
rename to ld/testsuite/ld-powerpc/apuinfo-nul1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo.rd b/ld/testsuite/ld-powerpc/apuinfo.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo.rd
rename to ld/testsuite/ld-powerpc/apuinfo.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo1.s b/ld/testsuite/ld-powerpc/apuinfo1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo1.s
rename to ld/testsuite/ld-powerpc/apuinfo1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo2.s b/ld/testsuite/ld-powerpc/apuinfo2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/apuinfo2.s
rename to ld/testsuite/ld-powerpc/apuinfo2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-1.s b/ld/testsuite/ld-powerpc/attr-gnu-12-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-1.s
rename to ld/testsuite/ld-powerpc/attr-gnu-12-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-11.d b/ld/testsuite/ld-powerpc/attr-gnu-12-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-11.d
rename to ld/testsuite/ld-powerpc/attr-gnu-12-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-2.s b/ld/testsuite/ld-powerpc/attr-gnu-12-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-2.s
rename to ld/testsuite/ld-powerpc/attr-gnu-12-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-21.d b/ld/testsuite/ld-powerpc/attr-gnu-12-21.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-12-21.d
rename to ld/testsuite/ld-powerpc/attr-gnu-12-21.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-0.s b/ld/testsuite/ld-powerpc/attr-gnu-4-0.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-0.s
rename to ld/testsuite/ld-powerpc/attr-gnu-4-0.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-00.d b/ld/testsuite/ld-powerpc/attr-gnu-4-00.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-00.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-00.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-01.d b/ld/testsuite/ld-powerpc/attr-gnu-4-01.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-01.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-01.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-02.d b/ld/testsuite/ld-powerpc/attr-gnu-4-02.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-02.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-02.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-03.d b/ld/testsuite/ld-powerpc/attr-gnu-4-03.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-03.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-03.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-1.s b/ld/testsuite/ld-powerpc/attr-gnu-4-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-1.s
rename to ld/testsuite/ld-powerpc/attr-gnu-4-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-10.d b/ld/testsuite/ld-powerpc/attr-gnu-4-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-10.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-11.d b/ld/testsuite/ld-powerpc/attr-gnu-4-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-11.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-12.d b/ld/testsuite/ld-powerpc/attr-gnu-4-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-12.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-13.d b/ld/testsuite/ld-powerpc/attr-gnu-4-13.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-13.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-13.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-14.d b/ld/testsuite/ld-powerpc/attr-gnu-4-14.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-14.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-14.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-2.s b/ld/testsuite/ld-powerpc/attr-gnu-4-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-2.s
rename to ld/testsuite/ld-powerpc/attr-gnu-4-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-20.d b/ld/testsuite/ld-powerpc/attr-gnu-4-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-20.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-21.d b/ld/testsuite/ld-powerpc/attr-gnu-4-21.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-21.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-21.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-22.d b/ld/testsuite/ld-powerpc/attr-gnu-4-22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-22.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-23.d b/ld/testsuite/ld-powerpc/attr-gnu-4-23.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-23.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-23.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-24.d b/ld/testsuite/ld-powerpc/attr-gnu-4-24.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-24.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-24.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-3.s b/ld/testsuite/ld-powerpc/attr-gnu-4-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-3.s
rename to ld/testsuite/ld-powerpc/attr-gnu-4-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-31.d b/ld/testsuite/ld-powerpc/attr-gnu-4-31.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-31.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-31.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-32.d b/ld/testsuite/ld-powerpc/attr-gnu-4-32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-32.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-33.d b/ld/testsuite/ld-powerpc/attr-gnu-4-33.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-33.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-33.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-34.d b/ld/testsuite/ld-powerpc/attr-gnu-4-34.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-34.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-34.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-4.s b/ld/testsuite/ld-powerpc/attr-gnu-4-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-4.s
rename to ld/testsuite/ld-powerpc/attr-gnu-4-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-41.d b/ld/testsuite/ld-powerpc/attr-gnu-4-41.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-4-41.d
rename to ld/testsuite/ld-powerpc/attr-gnu-4-41.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-1.s b/ld/testsuite/ld-powerpc/attr-gnu-8-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-1.s
rename to ld/testsuite/ld-powerpc/attr-gnu-8-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-11.d b/ld/testsuite/ld-powerpc/attr-gnu-8-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-11.d
rename to ld/testsuite/ld-powerpc/attr-gnu-8-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-2.s b/ld/testsuite/ld-powerpc/attr-gnu-8-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-2.s
rename to ld/testsuite/ld-powerpc/attr-gnu-8-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-23.d b/ld/testsuite/ld-powerpc/attr-gnu-8-23.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-23.d
rename to ld/testsuite/ld-powerpc/attr-gnu-8-23.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-3.s b/ld/testsuite/ld-powerpc/attr-gnu-8-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-3.s
rename to ld/testsuite/ld-powerpc/attr-gnu-8-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-31.d b/ld/testsuite/ld-powerpc/attr-gnu-8-31.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/attr-gnu-8-31.d
rename to ld/testsuite/ld-powerpc/attr-gnu-8-31.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/oldtlslib.s b/ld/testsuite/ld-powerpc/oldtlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/oldtlslib.s
rename to ld/testsuite/ld-powerpc/oldtlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/plt1.d b/ld/testsuite/ld-powerpc/plt1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/plt1.d
rename to ld/testsuite/ld-powerpc/plt1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/plt1.s b/ld/testsuite/ld-powerpc/plt1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/plt1.s
rename to ld/testsuite/ld-powerpc/plt1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/powerpc.exp
rename to ld/testsuite/ld-powerpc/powerpc.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/relax.d b/ld/testsuite/ld-powerpc/relax.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/relax.d
rename to ld/testsuite/ld-powerpc/relax.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/relax.s b/ld/testsuite/ld-powerpc/relax.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/relax.s
rename to ld/testsuite/ld-powerpc/relax.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/relaxr.d b/ld/testsuite/ld-powerpc/relaxr.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/relaxr.d
rename to ld/testsuite/ld-powerpc/relaxr.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/relbrlt.d b/ld/testsuite/ld-powerpc/relbrlt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/relbrlt.d
rename to ld/testsuite/ld-powerpc/relbrlt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/relbrlt.s b/ld/testsuite/ld-powerpc/relbrlt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/relbrlt.s
rename to ld/testsuite/ld-powerpc/relbrlt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/reloc.d b/ld/testsuite/ld-powerpc/reloc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/reloc.d
rename to ld/testsuite/ld-powerpc/reloc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/reloc.s b/ld/testsuite/ld-powerpc/reloc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/reloc.s
rename to ld/testsuite/ld-powerpc/reloc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/sdadyn.d b/ld/testsuite/ld-powerpc/sdadyn.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/sdadyn.d
rename to ld/testsuite/ld-powerpc/sdadyn.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/sdadyn.s b/ld/testsuite/ld-powerpc/sdadyn.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/sdadyn.s
rename to ld/testsuite/ld-powerpc/sdadyn.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/sdalib.s b/ld/testsuite/ld-powerpc/sdalib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/sdalib.s
rename to ld/testsuite/ld-powerpc/sdalib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/symtocbase-1.s b/ld/testsuite/ld-powerpc/symtocbase-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/symtocbase-1.s
rename to ld/testsuite/ld-powerpc/symtocbase-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/symtocbase-2.s b/ld/testsuite/ld-powerpc/symtocbase-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/symtocbase-2.s
rename to ld/testsuite/ld-powerpc/symtocbase-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/symtocbase.d b/ld/testsuite/ld-powerpc/symtocbase.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/symtocbase.d
rename to ld/testsuite/ld-powerpc/symtocbase.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.d b/ld/testsuite/ld-powerpc/tls.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.d
rename to ld/testsuite/ld-powerpc/tls.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.g b/ld/testsuite/ld-powerpc/tls.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.g
rename to ld/testsuite/ld-powerpc/tls.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.s b/ld/testsuite/ld-powerpc/tls.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.s
rename to ld/testsuite/ld-powerpc/tls.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.t b/ld/testsuite/ld-powerpc/tls.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls.t
rename to ld/testsuite/ld-powerpc/tls.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.d b/ld/testsuite/ld-powerpc/tls32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.d
rename to ld/testsuite/ld-powerpc/tls32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.g b/ld/testsuite/ld-powerpc/tls32.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.g
rename to ld/testsuite/ld-powerpc/tls32.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.s b/ld/testsuite/ld-powerpc/tls32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.s
rename to ld/testsuite/ld-powerpc/tls32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.t b/ld/testsuite/ld-powerpc/tls32.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tls32.t
rename to ld/testsuite/ld-powerpc/tls32.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.d b/ld/testsuite/ld-powerpc/tlsexe.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.d
rename to ld/testsuite/ld-powerpc/tlsexe.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.g b/ld/testsuite/ld-powerpc/tlsexe.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.g
rename to ld/testsuite/ld-powerpc/tlsexe.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.r
rename to ld/testsuite/ld-powerpc/tlsexe.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.t b/ld/testsuite/ld-powerpc/tlsexe.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe.t
rename to ld/testsuite/ld-powerpc/tlsexe.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.d b/ld/testsuite/ld-powerpc/tlsexe32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.d
rename to ld/testsuite/ld-powerpc/tlsexe32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.g b/ld/testsuite/ld-powerpc/tlsexe32.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.g
rename to ld/testsuite/ld-powerpc/tlsexe32.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.r
rename to ld/testsuite/ld-powerpc/tlsexe32.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.t b/ld/testsuite/ld-powerpc/tlsexe32.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexe32.t
rename to ld/testsuite/ld-powerpc/tlsexe32.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.d b/ld/testsuite/ld-powerpc/tlsexetoc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.d
rename to ld/testsuite/ld-powerpc/tlsexetoc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.g b/ld/testsuite/ld-powerpc/tlsexetoc.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.g
rename to ld/testsuite/ld-powerpc/tlsexetoc.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.r
rename to ld/testsuite/ld-powerpc/tlsexetoc.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.t b/ld/testsuite/ld-powerpc/tlsexetoc.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsexetoc.t
rename to ld/testsuite/ld-powerpc/tlsexetoc.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlslib.s b/ld/testsuite/ld-powerpc/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlslib.s
rename to ld/testsuite/ld-powerpc/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlslib32.s b/ld/testsuite/ld-powerpc/tlslib32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlslib32.s
rename to ld/testsuite/ld-powerpc/tlslib32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark.d b/ld/testsuite/ld-powerpc/tlsmark.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark.d
rename to ld/testsuite/ld-powerpc/tlsmark.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark.s b/ld/testsuite/ld-powerpc/tlsmark.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark.s
rename to ld/testsuite/ld-powerpc/tlsmark.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark32.d b/ld/testsuite/ld-powerpc/tlsmark32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark32.d
rename to ld/testsuite/ld-powerpc/tlsmark32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark32.s b/ld/testsuite/ld-powerpc/tlsmark32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsmark32.s
rename to ld/testsuite/ld-powerpc/tlsmark32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.d b/ld/testsuite/ld-powerpc/tlsso.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.d
rename to ld/testsuite/ld-powerpc/tlsso.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.g b/ld/testsuite/ld-powerpc/tlsso.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.g
rename to ld/testsuite/ld-powerpc/tlsso.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.r
rename to ld/testsuite/ld-powerpc/tlsso.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.t b/ld/testsuite/ld-powerpc/tlsso.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso.t
rename to ld/testsuite/ld-powerpc/tlsso.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.d b/ld/testsuite/ld-powerpc/tlsso32.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.d
rename to ld/testsuite/ld-powerpc/tlsso32.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.g b/ld/testsuite/ld-powerpc/tlsso32.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.g
rename to ld/testsuite/ld-powerpc/tlsso32.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.r
rename to ld/testsuite/ld-powerpc/tlsso32.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.t b/ld/testsuite/ld-powerpc/tlsso32.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlsso32.t
rename to ld/testsuite/ld-powerpc/tlsso32.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.d b/ld/testsuite/ld-powerpc/tlstoc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.d
rename to ld/testsuite/ld-powerpc/tlstoc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.g b/ld/testsuite/ld-powerpc/tlstoc.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.g
rename to ld/testsuite/ld-powerpc/tlstoc.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.s b/ld/testsuite/ld-powerpc/tlstoc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.s
rename to ld/testsuite/ld-powerpc/tlstoc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.t b/ld/testsuite/ld-powerpc/tlstoc.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstoc.t
rename to ld/testsuite/ld-powerpc/tlstoc.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.d b/ld/testsuite/ld-powerpc/tlstocso.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.d
rename to ld/testsuite/ld-powerpc/tlstocso.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.g b/ld/testsuite/ld-powerpc/tlstocso.g
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.g
rename to ld/testsuite/ld-powerpc/tlstocso.g
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.r
rename to ld/testsuite/ld-powerpc/tlstocso.r
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.t b/ld/testsuite/ld-powerpc/tlstocso.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tlstocso.t
rename to ld/testsuite/ld-powerpc/tlstocso.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tocopt.d b/ld/testsuite/ld-powerpc/tocopt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tocopt.d
rename to ld/testsuite/ld-powerpc/tocopt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/tocopt.s b/ld/testsuite/ld-powerpc/tocopt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/tocopt.s
rename to ld/testsuite/ld-powerpc/tocopt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax-2.rd b/ld/testsuite/ld-powerpc/vxworks-relax-2.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax-2.rd
rename to ld/testsuite/ld-powerpc/vxworks-relax-2.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax-2.s b/ld/testsuite/ld-powerpc/vxworks-relax-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax-2.s
rename to ld/testsuite/ld-powerpc/vxworks-relax-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax.rd b/ld/testsuite/ld-powerpc/vxworks-relax.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax.rd
rename to ld/testsuite/ld-powerpc/vxworks-relax.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax.s b/ld/testsuite/ld-powerpc/vxworks-relax.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks-relax.s
rename to ld/testsuite/ld-powerpc/vxworks-relax.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.dd b/ld/testsuite/ld-powerpc/vxworks1-lib.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.dd
rename to ld/testsuite/ld-powerpc/vxworks1-lib.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.nd b/ld/testsuite/ld-powerpc/vxworks1-lib.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.nd
rename to ld/testsuite/ld-powerpc/vxworks1-lib.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.rd b/ld/testsuite/ld-powerpc/vxworks1-lib.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.rd
rename to ld/testsuite/ld-powerpc/vxworks1-lib.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.s b/ld/testsuite/ld-powerpc/vxworks1-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.s
rename to ld/testsuite/ld-powerpc/vxworks1-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.sd b/ld/testsuite/ld-powerpc/vxworks1-lib.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.sd
rename to ld/testsuite/ld-powerpc/vxworks1-lib.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.td b/ld/testsuite/ld-powerpc/vxworks1-lib.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-lib.td
rename to ld/testsuite/ld-powerpc/vxworks1-lib.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-static.d b/ld/testsuite/ld-powerpc/vxworks1-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1-static.d
rename to ld/testsuite/ld-powerpc/vxworks1-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.dd b/ld/testsuite/ld-powerpc/vxworks1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.dd
rename to ld/testsuite/ld-powerpc/vxworks1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.ld b/ld/testsuite/ld-powerpc/vxworks1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.ld
rename to ld/testsuite/ld-powerpc/vxworks1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.rd b/ld/testsuite/ld-powerpc/vxworks1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.rd
rename to ld/testsuite/ld-powerpc/vxworks1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.s b/ld/testsuite/ld-powerpc/vxworks1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks1.s
rename to ld/testsuite/ld-powerpc/vxworks1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks2-static.sd b/ld/testsuite/ld-powerpc/vxworks2-static.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks2-static.sd
rename to ld/testsuite/ld-powerpc/vxworks2-static.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks2.s b/ld/testsuite/ld-powerpc/vxworks2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks2.s
rename to ld/testsuite/ld-powerpc/vxworks2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks2.sd b/ld/testsuite/ld-powerpc/vxworks2.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-powerpc/vxworks2.sd
rename to ld/testsuite/ld-powerpc/vxworks2.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/s390.exp b/ld/testsuite/ld-s390/s390.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/s390.exp
rename to ld/testsuite/ld-s390/s390.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.dd b/ld/testsuite/ld-s390/tlsbin.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.dd
rename to ld/testsuite/ld-s390/tlsbin.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.rd
rename to ld/testsuite/ld-s390/tlsbin.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.s b/ld/testsuite/ld-s390/tlsbin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.s
rename to ld/testsuite/ld-s390/tlsbin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.sd b/ld/testsuite/ld-s390/tlsbin.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.sd
rename to ld/testsuite/ld-s390/tlsbin.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.td b/ld/testsuite/ld-s390/tlsbin.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin.td
rename to ld/testsuite/ld-s390/tlsbin.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.dd b/ld/testsuite/ld-s390/tlsbin_64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.dd
rename to ld/testsuite/ld-s390/tlsbin_64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.rd
rename to ld/testsuite/ld-s390/tlsbin_64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.s b/ld/testsuite/ld-s390/tlsbin_64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.s
rename to ld/testsuite/ld-s390/tlsbin_64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.sd b/ld/testsuite/ld-s390/tlsbin_64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.sd
rename to ld/testsuite/ld-s390/tlsbin_64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.td b/ld/testsuite/ld-s390/tlsbin_64.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbin_64.td
rename to ld/testsuite/ld-s390/tlsbin_64.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbinpic.s b/ld/testsuite/ld-s390/tlsbinpic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbinpic.s
rename to ld/testsuite/ld-s390/tlsbinpic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbinpic_64.s b/ld/testsuite/ld-s390/tlsbinpic_64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlsbinpic_64.s
rename to ld/testsuite/ld-s390/tlsbinpic_64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlslib.s b/ld/testsuite/ld-s390/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlslib.s
rename to ld/testsuite/ld-s390/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlslib_64.s b/ld/testsuite/ld-s390/tlslib_64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlslib_64.s
rename to ld/testsuite/ld-s390/tlslib_64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.dd b/ld/testsuite/ld-s390/tlspic.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.dd
rename to ld/testsuite/ld-s390/tlspic.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.rd
rename to ld/testsuite/ld-s390/tlspic.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.sd b/ld/testsuite/ld-s390/tlspic.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.sd
rename to ld/testsuite/ld-s390/tlspic.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.td b/ld/testsuite/ld-s390/tlspic.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic.td
rename to ld/testsuite/ld-s390/tlspic.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic1.s b/ld/testsuite/ld-s390/tlspic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic1.s
rename to ld/testsuite/ld-s390/tlspic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic1_64.s b/ld/testsuite/ld-s390/tlspic1_64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic1_64.s
rename to ld/testsuite/ld-s390/tlspic1_64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic2.s b/ld/testsuite/ld-s390/tlspic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic2.s
rename to ld/testsuite/ld-s390/tlspic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic2_64.s b/ld/testsuite/ld-s390/tlspic2_64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic2_64.s
rename to ld/testsuite/ld-s390/tlspic2_64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.dd b/ld/testsuite/ld-s390/tlspic_64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.dd
rename to ld/testsuite/ld-s390/tlspic_64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.rd
rename to ld/testsuite/ld-s390/tlspic_64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.sd b/ld/testsuite/ld-s390/tlspic_64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.sd
rename to ld/testsuite/ld-s390/tlspic_64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.td b/ld/testsuite/ld-s390/tlspic_64.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-s390/tlspic_64.td
rename to ld/testsuite/ld-s390/tlspic_64.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align.exp b/ld/testsuite/ld-scripts/align.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align.exp
rename to ld/testsuite/ld-scripts/align.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align.s b/ld/testsuite/ld-scripts/align.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align.s
rename to ld/testsuite/ld-scripts/align.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align.t b/ld/testsuite/ld-scripts/align.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align.t
rename to ld/testsuite/ld-scripts/align.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align2.t b/ld/testsuite/ld-scripts/align2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align2.t
rename to ld/testsuite/ld-scripts/align2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align2a.d b/ld/testsuite/ld-scripts/align2a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align2a.d
rename to ld/testsuite/ld-scripts/align2a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align2a.s b/ld/testsuite/ld-scripts/align2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align2a.s
rename to ld/testsuite/ld-scripts/align2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align2b.d b/ld/testsuite/ld-scripts/align2b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align2b.d
rename to ld/testsuite/ld-scripts/align2b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align2b.s b/ld/testsuite/ld-scripts/align2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align2b.s
rename to ld/testsuite/ld-scripts/align2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align2c.d b/ld/testsuite/ld-scripts/align2c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align2c.d
rename to ld/testsuite/ld-scripts/align2c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/align2c.s b/ld/testsuite/ld-scripts/align2c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/align2c.s
rename to ld/testsuite/ld-scripts/align2c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/alignof.exp b/ld/testsuite/ld-scripts/alignof.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/alignof.exp
rename to ld/testsuite/ld-scripts/alignof.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/alignof.s b/ld/testsuite/ld-scripts/alignof.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/alignof.s
rename to ld/testsuite/ld-scripts/alignof.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/alignof.t b/ld/testsuite/ld-scripts/alignof.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/alignof.t
rename to ld/testsuite/ld-scripts/alignof.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/assert.exp b/ld/testsuite/ld-scripts/assert.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/assert.exp
rename to ld/testsuite/ld-scripts/assert.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/assert.s b/ld/testsuite/ld-scripts/assert.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/assert.s
rename to ld/testsuite/ld-scripts/assert.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/assert.t b/ld/testsuite/ld-scripts/assert.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/assert.t
rename to ld/testsuite/ld-scripts/assert.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/cross1.c b/ld/testsuite/ld-scripts/cross1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/cross1.c
rename to ld/testsuite/ld-scripts/cross1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/cross1.t b/ld/testsuite/ld-scripts/cross1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/cross1.t
rename to ld/testsuite/ld-scripts/cross1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/cross2.c b/ld/testsuite/ld-scripts/cross2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/cross2.c
rename to ld/testsuite/ld-scripts/cross2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/cross2.t b/ld/testsuite/ld-scripts/cross2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/cross2.t
rename to ld/testsuite/ld-scripts/cross2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/cross3.c b/ld/testsuite/ld-scripts/cross3.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/cross3.c
rename to ld/testsuite/ld-scripts/cross3.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/cross3.t b/ld/testsuite/ld-scripts/cross3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/cross3.t
rename to ld/testsuite/ld-scripts/cross3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/cross4.c b/ld/testsuite/ld-scripts/cross4.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/cross4.c
rename to ld/testsuite/ld-scripts/cross4.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/crossref.exp b/ld/testsuite/ld-scripts/crossref.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/crossref.exp
rename to ld/testsuite/ld-scripts/crossref.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/data.d b/ld/testsuite/ld-scripts/data.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/data.d
rename to ld/testsuite/ld-scripts/data.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/data.exp b/ld/testsuite/ld-scripts/data.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/data.exp
rename to ld/testsuite/ld-scripts/data.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/data.s b/ld/testsuite/ld-scripts/data.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/data.s
rename to ld/testsuite/ld-scripts/data.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/data.t b/ld/testsuite/ld-scripts/data.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/data.t
rename to ld/testsuite/ld-scripts/data.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script.exp b/ld/testsuite/ld-scripts/default-script.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script.exp
rename to ld/testsuite/ld-scripts/default-script.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script.s b/ld/testsuite/ld-scripts/default-script.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script.s
rename to ld/testsuite/ld-scripts/default-script.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script.t b/ld/testsuite/ld-scripts/default-script.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script.t
rename to ld/testsuite/ld-scripts/default-script.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script1.d b/ld/testsuite/ld-scripts/default-script1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script1.d
rename to ld/testsuite/ld-scripts/default-script1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script2.d b/ld/testsuite/ld-scripts/default-script2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script2.d
rename to ld/testsuite/ld-scripts/default-script2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script3.d b/ld/testsuite/ld-scripts/default-script3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script3.d
rename to ld/testsuite/ld-scripts/default-script3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script4.d b/ld/testsuite/ld-scripts/default-script4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/default-script4.d
rename to ld/testsuite/ld-scripts/default-script4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/defined.exp b/ld/testsuite/ld-scripts/defined.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/defined.exp
rename to ld/testsuite/ld-scripts/defined.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/defined.s b/ld/testsuite/ld-scripts/defined.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/defined.s
rename to ld/testsuite/ld-scripts/defined.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/defined.t b/ld/testsuite/ld-scripts/defined.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/defined.t
rename to ld/testsuite/ld-scripts/defined.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/defined2.d b/ld/testsuite/ld-scripts/defined2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/defined2.d
rename to ld/testsuite/ld-scripts/defined2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/defined2.t b/ld/testsuite/ld-scripts/defined2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/defined2.t
rename to ld/testsuite/ld-scripts/defined2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/defined3.d b/ld/testsuite/ld-scripts/defined3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/defined3.d
rename to ld/testsuite/ld-scripts/defined3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/defined3.t b/ld/testsuite/ld-scripts/defined3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/defined3.t
rename to ld/testsuite/ld-scripts/defined3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections-1.s b/ld/testsuite/ld-scripts/dynamic-sections-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections-1.s
rename to ld/testsuite/ld-scripts/dynamic-sections-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections-2.s b/ld/testsuite/ld-scripts/dynamic-sections-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections-2.s
rename to ld/testsuite/ld-scripts/dynamic-sections-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections.d b/ld/testsuite/ld-scripts/dynamic-sections.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections.d
rename to ld/testsuite/ld-scripts/dynamic-sections.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections.exp b/ld/testsuite/ld-scripts/dynamic-sections.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections.exp
rename to ld/testsuite/ld-scripts/dynamic-sections.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections.t b/ld/testsuite/ld-scripts/dynamic-sections.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/dynamic-sections.t
rename to ld/testsuite/ld-scripts/dynamic-sections.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-1.d b/ld/testsuite/ld-scripts/empty-address-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-1.d
rename to ld/testsuite/ld-scripts/empty-address-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-1.s b/ld/testsuite/ld-scripts/empty-address-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-1.s
rename to ld/testsuite/ld-scripts/empty-address-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-1.t b/ld/testsuite/ld-scripts/empty-address-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-1.t
rename to ld/testsuite/ld-scripts/empty-address-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2.s b/ld/testsuite/ld-scripts/empty-address-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2.s
rename to ld/testsuite/ld-scripts/empty-address-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2a.d b/ld/testsuite/ld-scripts/empty-address-2a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2a.d
rename to ld/testsuite/ld-scripts/empty-address-2a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2a.t b/ld/testsuite/ld-scripts/empty-address-2a.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2a.t
rename to ld/testsuite/ld-scripts/empty-address-2a.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2b.d b/ld/testsuite/ld-scripts/empty-address-2b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2b.d
rename to ld/testsuite/ld-scripts/empty-address-2b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2b.t b/ld/testsuite/ld-scripts/empty-address-2b.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-2b.t
rename to ld/testsuite/ld-scripts/empty-address-2b.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3.s b/ld/testsuite/ld-scripts/empty-address-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3.s
rename to ld/testsuite/ld-scripts/empty-address-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3a.d b/ld/testsuite/ld-scripts/empty-address-3a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3a.d
rename to ld/testsuite/ld-scripts/empty-address-3a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3a.t b/ld/testsuite/ld-scripts/empty-address-3a.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3a.t
rename to ld/testsuite/ld-scripts/empty-address-3a.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3b.d b/ld/testsuite/ld-scripts/empty-address-3b.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3b.d
rename to ld/testsuite/ld-scripts/empty-address-3b.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3b.t b/ld/testsuite/ld-scripts/empty-address-3b.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3b.t
rename to ld/testsuite/ld-scripts/empty-address-3b.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3c.d b/ld/testsuite/ld-scripts/empty-address-3c.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3c.d
rename to ld/testsuite/ld-scripts/empty-address-3c.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3c.t b/ld/testsuite/ld-scripts/empty-address-3c.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address-3c.t
rename to ld/testsuite/ld-scripts/empty-address-3c.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address.exp b/ld/testsuite/ld-scripts/empty-address.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-address.exp
rename to ld/testsuite/ld-scripts/empty-address.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.d b/ld/testsuite/ld-scripts/empty-aligned.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.d
rename to ld/testsuite/ld-scripts/empty-aligned.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.exp b/ld/testsuite/ld-scripts/empty-aligned.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.exp
rename to ld/testsuite/ld-scripts/empty-aligned.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.s b/ld/testsuite/ld-scripts/empty-aligned.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.s
rename to ld/testsuite/ld-scripts/empty-aligned.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.t b/ld/testsuite/ld-scripts/empty-aligned.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-aligned.t
rename to ld/testsuite/ld-scripts/empty-aligned.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.d b/ld/testsuite/ld-scripts/empty-orphan.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.d
rename to ld/testsuite/ld-scripts/empty-orphan.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.exp b/ld/testsuite/ld-scripts/empty-orphan.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.exp
rename to ld/testsuite/ld-scripts/empty-orphan.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.s b/ld/testsuite/ld-scripts/empty-orphan.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.s
rename to ld/testsuite/ld-scripts/empty-orphan.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.t b/ld/testsuite/ld-scripts/empty-orphan.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/empty-orphan.t
rename to ld/testsuite/ld-scripts/empty-orphan.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/expr.exp b/ld/testsuite/ld-scripts/expr.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/expr.exp
rename to ld/testsuite/ld-scripts/expr.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/expr1.d b/ld/testsuite/ld-scripts/expr1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/expr1.d
rename to ld/testsuite/ld-scripts/expr1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/expr1.s b/ld/testsuite/ld-scripts/expr1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/expr1.s
rename to ld/testsuite/ld-scripts/expr1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/expr1.t b/ld/testsuite/ld-scripts/expr1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/expr1.t
rename to ld/testsuite/ld-scripts/expr1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/extern.exp b/ld/testsuite/ld-scripts/extern.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/extern.exp
rename to ld/testsuite/ld-scripts/extern.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/extern.s b/ld/testsuite/ld-scripts/extern.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/extern.s
rename to ld/testsuite/ld-scripts/extern.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/extern.t b/ld/testsuite/ld-scripts/extern.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/extern.t
rename to ld/testsuite/ld-scripts/extern.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include-1.d b/ld/testsuite/ld-scripts/include-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include-1.d
rename to ld/testsuite/ld-scripts/include-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include-1.t b/ld/testsuite/ld-scripts/include-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include-1.t
rename to ld/testsuite/ld-scripts/include-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include-data.t b/ld/testsuite/ld-scripts/include-data.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include-data.t
rename to ld/testsuite/ld-scripts/include-data.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include-mem.t b/ld/testsuite/ld-scripts/include-mem.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include-mem.t
rename to ld/testsuite/ld-scripts/include-mem.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include-ram.t b/ld/testsuite/ld-scripts/include-ram.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include-ram.t
rename to ld/testsuite/ld-scripts/include-ram.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include-sections.t b/ld/testsuite/ld-scripts/include-sections.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include-sections.t
rename to ld/testsuite/ld-scripts/include-sections.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include-subdata.t b/ld/testsuite/ld-scripts/include-subdata.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include-subdata.t
rename to ld/testsuite/ld-scripts/include-subdata.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include.exp b/ld/testsuite/ld-scripts/include.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include.exp
rename to ld/testsuite/ld-scripts/include.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/include.s b/ld/testsuite/ld-scripts/include.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/include.s
rename to ld/testsuite/ld-scripts/include.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/map-address.d b/ld/testsuite/ld-scripts/map-address.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/map-address.d
rename to ld/testsuite/ld-scripts/map-address.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/map-address.exp b/ld/testsuite/ld-scripts/map-address.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/map-address.exp
rename to ld/testsuite/ld-scripts/map-address.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/map-address.t b/ld/testsuite/ld-scripts/map-address.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/map-address.t
rename to ld/testsuite/ld-scripts/map-address.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/memory.t b/ld/testsuite/ld-scripts/memory.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/memory.t
rename to ld/testsuite/ld-scripts/memory.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size-map.d b/ld/testsuite/ld-scripts/overlay-size-map.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size-map.d
rename to ld/testsuite/ld-scripts/overlay-size-map.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.d b/ld/testsuite/ld-scripts/overlay-size.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.d
rename to ld/testsuite/ld-scripts/overlay-size.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.exp b/ld/testsuite/ld-scripts/overlay-size.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.exp
rename to ld/testsuite/ld-scripts/overlay-size.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.s b/ld/testsuite/ld-scripts/overlay-size.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.s
rename to ld/testsuite/ld-scripts/overlay-size.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.t b/ld/testsuite/ld-scripts/overlay-size.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/overlay-size.t
rename to ld/testsuite/ld-scripts/overlay-size.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs.exp b/ld/testsuite/ld-scripts/phdrs.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs.exp
rename to ld/testsuite/ld-scripts/phdrs.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs.s b/ld/testsuite/ld-scripts/phdrs.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs.s
rename to ld/testsuite/ld-scripts/phdrs.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs.t b/ld/testsuite/ld-scripts/phdrs.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs.t
rename to ld/testsuite/ld-scripts/phdrs.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs2.exp b/ld/testsuite/ld-scripts/phdrs2.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs2.exp
rename to ld/testsuite/ld-scripts/phdrs2.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs2.s b/ld/testsuite/ld-scripts/phdrs2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs2.s
rename to ld/testsuite/ld-scripts/phdrs2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs2.t b/ld/testsuite/ld-scripts/phdrs2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs2.t
rename to ld/testsuite/ld-scripts/phdrs2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3.d b/ld/testsuite/ld-scripts/phdrs3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3.d
rename to ld/testsuite/ld-scripts/phdrs3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3.exp b/ld/testsuite/ld-scripts/phdrs3.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3.exp
rename to ld/testsuite/ld-scripts/phdrs3.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3.t b/ld/testsuite/ld-scripts/phdrs3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3.t
rename to ld/testsuite/ld-scripts/phdrs3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3a.d b/ld/testsuite/ld-scripts/phdrs3a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3a.d
rename to ld/testsuite/ld-scripts/phdrs3a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3a.t b/ld/testsuite/ld-scripts/phdrs3a.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/phdrs3a.t
rename to ld/testsuite/ld-scripts/phdrs3a.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-1.d b/ld/testsuite/ld-scripts/provide-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-1.d
rename to ld/testsuite/ld-scripts/provide-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-1.s b/ld/testsuite/ld-scripts/provide-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-1.s
rename to ld/testsuite/ld-scripts/provide-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-1.t b/ld/testsuite/ld-scripts/provide-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-1.t
rename to ld/testsuite/ld-scripts/provide-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-2.d b/ld/testsuite/ld-scripts/provide-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-2.d
rename to ld/testsuite/ld-scripts/provide-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-2.s b/ld/testsuite/ld-scripts/provide-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-2.s
rename to ld/testsuite/ld-scripts/provide-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-2.t b/ld/testsuite/ld-scripts/provide-2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-2.t
rename to ld/testsuite/ld-scripts/provide-2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-3.d b/ld/testsuite/ld-scripts/provide-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-3.d
rename to ld/testsuite/ld-scripts/provide-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-3.s b/ld/testsuite/ld-scripts/provide-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-3.s
rename to ld/testsuite/ld-scripts/provide-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-3.t b/ld/testsuite/ld-scripts/provide-3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide-3.t
rename to ld/testsuite/ld-scripts/provide-3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/provide.exp b/ld/testsuite/ld-scripts/provide.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/provide.exp
rename to ld/testsuite/ld-scripts/provide.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-1.t b/ld/testsuite/ld-scripts/region-alias-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-1.t
rename to ld/testsuite/ld-scripts/region-alias-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-2.t b/ld/testsuite/ld-scripts/region-alias-2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-2.t
rename to ld/testsuite/ld-scripts/region-alias-2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-3.t b/ld/testsuite/ld-scripts/region-alias-3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-3.t
rename to ld/testsuite/ld-scripts/region-alias-3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-4.t b/ld/testsuite/ld-scripts/region-alias-4.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/region-alias-4.t
rename to ld/testsuite/ld-scripts/region-alias-4.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at.exp b/ld/testsuite/ld-scripts/rgn-at.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at.exp
rename to ld/testsuite/ld-scripts/rgn-at.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at.s b/ld/testsuite/ld-scripts/rgn-at.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at.s
rename to ld/testsuite/ld-scripts/rgn-at.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at1.d b/ld/testsuite/ld-scripts/rgn-at1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at1.d
rename to ld/testsuite/ld-scripts/rgn-at1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at1.t b/ld/testsuite/ld-scripts/rgn-at1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at1.t
rename to ld/testsuite/ld-scripts/rgn-at1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at2.d b/ld/testsuite/ld-scripts/rgn-at2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at2.d
rename to ld/testsuite/ld-scripts/rgn-at2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at2.t b/ld/testsuite/ld-scripts/rgn-at2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at2.t
rename to ld/testsuite/ld-scripts/rgn-at2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at3.d b/ld/testsuite/ld-scripts/rgn-at3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at3.d
rename to ld/testsuite/ld-scripts/rgn-at3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at3.t b/ld/testsuite/ld-scripts/rgn-at3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at3.t
rename to ld/testsuite/ld-scripts/rgn-at3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at4.d b/ld/testsuite/ld-scripts/rgn-at4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at4.d
rename to ld/testsuite/ld-scripts/rgn-at4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at4.t b/ld/testsuite/ld-scripts/rgn-at4.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at4.t
rename to ld/testsuite/ld-scripts/rgn-at4.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at5.d b/ld/testsuite/ld-scripts/rgn-at5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at5.d
rename to ld/testsuite/ld-scripts/rgn-at5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at5.s b/ld/testsuite/ld-scripts/rgn-at5.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at5.s
rename to ld/testsuite/ld-scripts/rgn-at5.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at5.t b/ld/testsuite/ld-scripts/rgn-at5.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-at5.t
rename to ld/testsuite/ld-scripts/rgn-at5.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over.exp b/ld/testsuite/ld-scripts/rgn-over.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over.exp
rename to ld/testsuite/ld-scripts/rgn-over.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over.s b/ld/testsuite/ld-scripts/rgn-over.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over.s
rename to ld/testsuite/ld-scripts/rgn-over.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over1.d b/ld/testsuite/ld-scripts/rgn-over1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over1.d
rename to ld/testsuite/ld-scripts/rgn-over1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over1.t b/ld/testsuite/ld-scripts/rgn-over1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over1.t
rename to ld/testsuite/ld-scripts/rgn-over1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over2.d b/ld/testsuite/ld-scripts/rgn-over2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over2.d
rename to ld/testsuite/ld-scripts/rgn-over2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over2.t b/ld/testsuite/ld-scripts/rgn-over2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over2.t
rename to ld/testsuite/ld-scripts/rgn-over2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over3.d b/ld/testsuite/ld-scripts/rgn-over3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over3.d
rename to ld/testsuite/ld-scripts/rgn-over3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over3.t b/ld/testsuite/ld-scripts/rgn-over3.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over3.t
rename to ld/testsuite/ld-scripts/rgn-over3.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over4.d b/ld/testsuite/ld-scripts/rgn-over4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over4.d
rename to ld/testsuite/ld-scripts/rgn-over4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over4.t b/ld/testsuite/ld-scripts/rgn-over4.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over4.t
rename to ld/testsuite/ld-scripts/rgn-over4.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over5.d b/ld/testsuite/ld-scripts/rgn-over5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over5.d
rename to ld/testsuite/ld-scripts/rgn-over5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over5.t b/ld/testsuite/ld-scripts/rgn-over5.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over5.t
rename to ld/testsuite/ld-scripts/rgn-over5.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over6.d b/ld/testsuite/ld-scripts/rgn-over6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over6.d
rename to ld/testsuite/ld-scripts/rgn-over6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over6.t b/ld/testsuite/ld-scripts/rgn-over6.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over6.t
rename to ld/testsuite/ld-scripts/rgn-over6.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over7.d b/ld/testsuite/ld-scripts/rgn-over7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over7.d
rename to ld/testsuite/ld-scripts/rgn-over7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over7.t b/ld/testsuite/ld-scripts/rgn-over7.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over7.t
rename to ld/testsuite/ld-scripts/rgn-over7.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over8-ok.d b/ld/testsuite/ld-scripts/rgn-over8-ok.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over8-ok.d
rename to ld/testsuite/ld-scripts/rgn-over8-ok.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over8.s b/ld/testsuite/ld-scripts/rgn-over8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over8.s
rename to ld/testsuite/ld-scripts/rgn-over8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over8.t b/ld/testsuite/ld-scripts/rgn-over8.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/rgn-over8.t
rename to ld/testsuite/ld-scripts/rgn-over8.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/script.exp b/ld/testsuite/ld-scripts/script.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/script.exp
rename to ld/testsuite/ld-scripts/script.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/script.s b/ld/testsuite/ld-scripts/script.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/script.s
rename to ld/testsuite/ld-scripts/script.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/script.t b/ld/testsuite/ld-scripts/script.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/script.t
rename to ld/testsuite/ld-scripts/script.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/scriptm.t b/ld/testsuite/ld-scripts/scriptm.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/scriptm.t
rename to ld/testsuite/ld-scripts/scriptm.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match-1.d b/ld/testsuite/ld-scripts/section-match-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match-1.d
rename to ld/testsuite/ld-scripts/section-match-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match-1.s b/ld/testsuite/ld-scripts/section-match-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match-1.s
rename to ld/testsuite/ld-scripts/section-match-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match-1.t b/ld/testsuite/ld-scripts/section-match-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match-1.t
rename to ld/testsuite/ld-scripts/section-match-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match.exp b/ld/testsuite/ld-scripts/section-match.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/section-match.exp
rename to ld/testsuite/ld-scripts/section-match.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/size-1.d b/ld/testsuite/ld-scripts/size-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/size-1.d
rename to ld/testsuite/ld-scripts/size-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/size-1.s b/ld/testsuite/ld-scripts/size-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/size-1.s
rename to ld/testsuite/ld-scripts/size-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/size-1.t b/ld/testsuite/ld-scripts/size-1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/size-1.t
rename to ld/testsuite/ld-scripts/size-1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/size-2.d b/ld/testsuite/ld-scripts/size-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/size-2.d
rename to ld/testsuite/ld-scripts/size-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/size-2.s b/ld/testsuite/ld-scripts/size-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/size-2.s
rename to ld/testsuite/ld-scripts/size-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/size-2.t
rename to ld/testsuite/ld-scripts/size-2.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/size.exp b/ld/testsuite/ld-scripts/size.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/size.exp
rename to ld/testsuite/ld-scripts/size.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sizeof.exp b/ld/testsuite/ld-scripts/sizeof.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sizeof.exp
rename to ld/testsuite/ld-scripts/sizeof.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sizeof.s b/ld/testsuite/ld-scripts/sizeof.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sizeof.s
rename to ld/testsuite/ld-scripts/sizeof.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sizeof.t b/ld/testsuite/ld-scripts/sizeof.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sizeof.t
rename to ld/testsuite/ld-scripts/sizeof.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort.exp b/ld/testsuite/ld-scripts/sort.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort.exp
rename to ld/testsuite/ld-scripts/sort.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort.t b/ld/testsuite/ld-scripts/sort.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort.t
rename to ld/testsuite/ld-scripts/sort.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a-1.d b/ld/testsuite/ld-scripts/sort_b_a-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a-1.d
rename to ld/testsuite/ld-scripts/sort_b_a-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a-1.s b/ld/testsuite/ld-scripts/sort_b_a-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a-1.s
rename to ld/testsuite/ld-scripts/sort_b_a-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a.d b/ld/testsuite/ld-scripts/sort_b_a.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a.d
rename to ld/testsuite/ld-scripts/sort_b_a.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a.s b/ld/testsuite/ld-scripts/sort_b_a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a.s
rename to ld/testsuite/ld-scripts/sort_b_a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a.t b/ld/testsuite/ld-scripts/sort_b_a.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a.t
rename to ld/testsuite/ld-scripts/sort_b_a.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a-1.d b/ld/testsuite/ld-scripts/sort_b_a_a-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a-1.d
rename to ld/testsuite/ld-scripts/sort_b_a_a-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a-2.d b/ld/testsuite/ld-scripts/sort_b_a_a-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a-2.d
rename to ld/testsuite/ld-scripts/sort_b_a_a-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a-3.d b/ld/testsuite/ld-scripts/sort_b_a_a-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a-3.d
rename to ld/testsuite/ld-scripts/sort_b_a_a-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a.t b/ld/testsuite/ld-scripts/sort_b_a_a.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_a.t
rename to ld/testsuite/ld-scripts/sort_b_a_a.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n-1.d b/ld/testsuite/ld-scripts/sort_b_a_n-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n-1.d
rename to ld/testsuite/ld-scripts/sort_b_a_n-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n-2.d b/ld/testsuite/ld-scripts/sort_b_a_n-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n-2.d
rename to ld/testsuite/ld-scripts/sort_b_a_n-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n-3.d b/ld/testsuite/ld-scripts/sort_b_a_n-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n-3.d
rename to ld/testsuite/ld-scripts/sort_b_a_n-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n.t b/ld/testsuite/ld-scripts/sort_b_a_n.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_a_n.t
rename to ld/testsuite/ld-scripts/sort_b_a_n.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n-1.d b/ld/testsuite/ld-scripts/sort_b_n-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n-1.d
rename to ld/testsuite/ld-scripts/sort_b_n-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n-1.s b/ld/testsuite/ld-scripts/sort_b_n-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n-1.s
rename to ld/testsuite/ld-scripts/sort_b_n-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n.d b/ld/testsuite/ld-scripts/sort_b_n.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n.d
rename to ld/testsuite/ld-scripts/sort_b_n.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n.s b/ld/testsuite/ld-scripts/sort_b_n.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n.s
rename to ld/testsuite/ld-scripts/sort_b_n.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n.t b/ld/testsuite/ld-scripts/sort_b_n.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n.t
rename to ld/testsuite/ld-scripts/sort_b_n.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a-1.d b/ld/testsuite/ld-scripts/sort_b_n_a-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a-1.d
rename to ld/testsuite/ld-scripts/sort_b_n_a-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a-2.d b/ld/testsuite/ld-scripts/sort_b_n_a-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a-2.d
rename to ld/testsuite/ld-scripts/sort_b_n_a-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a-3.d b/ld/testsuite/ld-scripts/sort_b_n_a-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a-3.d
rename to ld/testsuite/ld-scripts/sort_b_n_a-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a.t b/ld/testsuite/ld-scripts/sort_b_n_a.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_a.t
rename to ld/testsuite/ld-scripts/sort_b_n_a.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n-1.d b/ld/testsuite/ld-scripts/sort_b_n_n-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n-1.d
rename to ld/testsuite/ld-scripts/sort_b_n_n-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n-2.d b/ld/testsuite/ld-scripts/sort_b_n_n-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n-2.d
rename to ld/testsuite/ld-scripts/sort_b_n_n-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n-3.d b/ld/testsuite/ld-scripts/sort_b_n_n-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n-3.d
rename to ld/testsuite/ld-scripts/sort_b_n_n-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n.t b/ld/testsuite/ld-scripts/sort_b_n_n.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_b_n_n.t
rename to ld/testsuite/ld-scripts/sort_b_n_n.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_n_a-a.s b/ld/testsuite/ld-scripts/sort_n_a-a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_n_a-a.s
rename to ld/testsuite/ld-scripts/sort_n_a-a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_n_a-b.s b/ld/testsuite/ld-scripts/sort_n_a-b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_n_a-b.s
rename to ld/testsuite/ld-scripts/sort_n_a-b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_no-1.d b/ld/testsuite/ld-scripts/sort_no-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_no-1.d
rename to ld/testsuite/ld-scripts/sort_no-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_no-2.d b/ld/testsuite/ld-scripts/sort_no-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_no-2.d
rename to ld/testsuite/ld-scripts/sort_no-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_no.t b/ld/testsuite/ld-scripts/sort_no.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/sort_no.t
rename to ld/testsuite/ld-scripts/sort_no.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/weak.exp
rename to ld/testsuite/ld-scripts/weak.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/weak.t b/ld/testsuite/ld-scripts/weak.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/weak.t
rename to ld/testsuite/ld-scripts/weak.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/weak1.s b/ld/testsuite/ld-scripts/weak1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/weak1.s
rename to ld/testsuite/ld-scripts/weak1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-scripts/weak2.s b/ld/testsuite/ld-scripts/weak2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-scripts/weak2.s
rename to ld/testsuite/ld-scripts/weak2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/1.c b/ld/testsuite/ld-selective/1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/1.c
rename to ld/testsuite/ld-selective/1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/2.c b/ld/testsuite/ld-selective/2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/2.c
rename to ld/testsuite/ld-selective/2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/3.cc b/ld/testsuite/ld-selective/3.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/3.cc
rename to ld/testsuite/ld-selective/3.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/4.cc b/ld/testsuite/ld-selective/4.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/4.cc
rename to ld/testsuite/ld-selective/4.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/5.cc b/ld/testsuite/ld-selective/5.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/5.cc
rename to ld/testsuite/ld-selective/5.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot.d b/ld/testsuite/ld-selective/keepdot.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot.d
rename to ld/testsuite/ld-selective/keepdot.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot.ld b/ld/testsuite/ld-selective/keepdot.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot.ld
rename to ld/testsuite/ld-selective/keepdot.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot.s b/ld/testsuite/ld-selective/keepdot.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot.s
rename to ld/testsuite/ld-selective/keepdot.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot0.d b/ld/testsuite/ld-selective/keepdot0.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot0.d
rename to ld/testsuite/ld-selective/keepdot0.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot0.ld b/ld/testsuite/ld-selective/keepdot0.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/keepdot0.ld
rename to ld/testsuite/ld-selective/keepdot0.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/sel-dump.exp b/ld/testsuite/ld-selective/sel-dump.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/sel-dump.exp
rename to ld/testsuite/ld-selective/sel-dump.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-selective/selective.exp
rename to ld/testsuite/ld-selective/selective.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/arch.exp b/ld/testsuite/ld-sh/arch/arch.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/arch.exp
rename to ld/testsuite/ld-sh/arch/arch.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/arch_expected.txt b/ld/testsuite/ld-sh/arch/arch_expected.txt
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/arch_expected.txt
rename to ld/testsuite/ld-sh/arch/arch_expected.txt
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh-dsp.s b/ld/testsuite/ld-sh/arch/sh-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh-dsp.s
rename to ld/testsuite/ld-sh/arch/sh-dsp.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh.s b/ld/testsuite/ld-sh/arch/sh.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh.s
rename to ld/testsuite/ld-sh/arch/sh.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2.s b/ld/testsuite/ld-sh/arch/sh2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2.s
rename to ld/testsuite/ld-sh/arch/sh2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh3-nommu.s b/ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh3-nommu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh3-nommu.s
rename to ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh3-nommu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s b/ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
rename to ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-nofpu.s b/ld/testsuite/ld-sh/arch/sh2a-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-nofpu.s
rename to ld/testsuite/ld-sh/arch/sh2a-nofpu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-or-sh3e.s b/ld/testsuite/ld-sh/arch/sh2a-or-sh3e.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-or-sh3e.s
rename to ld/testsuite/ld-sh/arch/sh2a-or-sh3e.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-or-sh4.s b/ld/testsuite/ld-sh/arch/sh2a-or-sh4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a-or-sh4.s
rename to ld/testsuite/ld-sh/arch/sh2a-or-sh4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a.s b/ld/testsuite/ld-sh/arch/sh2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2a.s
rename to ld/testsuite/ld-sh/arch/sh2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2e.s b/ld/testsuite/ld-sh/arch/sh2e.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh2e.s
rename to ld/testsuite/ld-sh/arch/sh2e.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3-dsp.s b/ld/testsuite/ld-sh/arch/sh3-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3-dsp.s
rename to ld/testsuite/ld-sh/arch/sh3-dsp.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3-nommu.s b/ld/testsuite/ld-sh/arch/sh3-nommu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3-nommu.s
rename to ld/testsuite/ld-sh/arch/sh3-nommu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3.s b/ld/testsuite/ld-sh/arch/sh3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3.s
rename to ld/testsuite/ld-sh/arch/sh3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3e.s b/ld/testsuite/ld-sh/arch/sh3e.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh3e.s
rename to ld/testsuite/ld-sh/arch/sh3e.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4-nofpu.s b/ld/testsuite/ld-sh/arch/sh4-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4-nofpu.s
rename to ld/testsuite/ld-sh/arch/sh4-nofpu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4-nommu-nofpu.s b/ld/testsuite/ld-sh/arch/sh4-nommu-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4-nommu-nofpu.s
rename to ld/testsuite/ld-sh/arch/sh4-nommu-nofpu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4.s b/ld/testsuite/ld-sh/arch/sh4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4.s
rename to ld/testsuite/ld-sh/arch/sh4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4a-nofpu.s b/ld/testsuite/ld-sh/arch/sh4a-nofpu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4a-nofpu.s
rename to ld/testsuite/ld-sh/arch/sh4a-nofpu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4a.s b/ld/testsuite/ld-sh/arch/sh4a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4a.s
rename to ld/testsuite/ld-sh/arch/sh4a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4al-dsp.s b/ld/testsuite/ld-sh/arch/sh4al-dsp.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/arch/sh4al-dsp.s
rename to ld/testsuite/ld-sh/arch/sh4al-dsp.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-shared.d b/ld/testsuite/ld-sh/fdpic-funcdesc-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-shared.d
rename to ld/testsuite/ld-sh/fdpic-funcdesc-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-shared.s b/ld/testsuite/ld-sh/fdpic-funcdesc-shared.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-shared.s
rename to ld/testsuite/ld-sh/fdpic-funcdesc-shared.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-static.d b/ld/testsuite/ld-sh/fdpic-funcdesc-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-static.d
rename to ld/testsuite/ld-sh/fdpic-funcdesc-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-static.s b/ld/testsuite/ld-sh/fdpic-funcdesc-static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-funcdesc-static.s
rename to ld/testsuite/ld-sh/fdpic-funcdesc-static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.d b/ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.d
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.s b/ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.s
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.d b/ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.d
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.s b/ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.s
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.d b/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.d
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.s b/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.s
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.d b/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.d
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.s b/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.s
rename to ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-shared.d b/ld/testsuite/ld-sh/fdpic-goti20-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-shared.d
rename to ld/testsuite/ld-sh/fdpic-goti20-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-shared.s b/ld/testsuite/ld-sh/fdpic-goti20-shared.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-shared.s
rename to ld/testsuite/ld-sh/fdpic-goti20-shared.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-static.d b/ld/testsuite/ld-sh/fdpic-goti20-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-static.d
rename to ld/testsuite/ld-sh/fdpic-goti20-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-static.s b/ld/testsuite/ld-sh/fdpic-goti20-static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-goti20-static.s
rename to ld/testsuite/ld-sh/fdpic-goti20-static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.d b/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.d
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.s b/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.s
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.d b/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.d
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.s b/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.s
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.d b/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.d
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.s b/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.s
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.d b/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.d
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.s b/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.s
rename to ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-shared.d b/ld/testsuite/ld-sh/fdpic-gotoffi20-shared.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-shared.d
rename to ld/testsuite/ld-sh/fdpic-gotoffi20-shared.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-shared.s b/ld/testsuite/ld-sh/fdpic-gotoffi20-shared.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-shared.s
rename to ld/testsuite/ld-sh/fdpic-gotoffi20-shared.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-static.d b/ld/testsuite/ld-sh/fdpic-gotoffi20-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-static.d
rename to ld/testsuite/ld-sh/fdpic-gotoffi20-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-static.s b/ld/testsuite/ld-sh/fdpic-gotoffi20-static.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-gotoffi20-static.s
rename to ld/testsuite/ld-sh/fdpic-gotoffi20-static.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plt-be.d b/ld/testsuite/ld-sh/fdpic-plt-be.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plt-be.d
rename to ld/testsuite/ld-sh/fdpic-plt-be.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plt-le.d b/ld/testsuite/ld-sh/fdpic-plt-le.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plt-le.d
rename to ld/testsuite/ld-sh/fdpic-plt-le.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plt.s b/ld/testsuite/ld-sh/fdpic-plt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plt.s
rename to ld/testsuite/ld-sh/fdpic-plt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plti20-be.d b/ld/testsuite/ld-sh/fdpic-plti20-be.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plti20-be.d
rename to ld/testsuite/ld-sh/fdpic-plti20-be.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plti20-le.d b/ld/testsuite/ld-sh/fdpic-plti20-le.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-plti20-le.d
rename to ld/testsuite/ld-sh/fdpic-plti20-le.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-stack-default.d b/ld/testsuite/ld-sh/fdpic-stack-default.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-stack-default.d
rename to ld/testsuite/ld-sh/fdpic-stack-default.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-stack-size.d b/ld/testsuite/ld-sh/fdpic-stack-size.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-stack-size.d
rename to ld/testsuite/ld-sh/fdpic-stack-size.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-stack.s b/ld/testsuite/ld-sh/fdpic-stack.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/fdpic-stack.s
rename to ld/testsuite/ld-sh/fdpic-stack.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/ld-r-1.d b/ld/testsuite/ld-sh/ld-r-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/ld-r-1.d
rename to ld/testsuite/ld-sh/ld-r-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/ldr1.s b/ld/testsuite/ld-sh/ldr1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/ldr1.s
rename to ld/testsuite/ld-sh/ldr1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/ldr2.s b/ld/testsuite/ld-sh/ldr2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/ldr2.s
rename to ld/testsuite/ld-sh/ldr2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/rd-sh.exp b/ld/testsuite/ld-sh/rd-sh.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/rd-sh.exp
rename to ld/testsuite/ld-sh/rd-sh.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/refdbg-0-dso.d b/ld/testsuite/ld-sh/refdbg-0-dso.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/refdbg-0-dso.d
rename to ld/testsuite/ld-sh/refdbg-0-dso.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/refdbg-1.d b/ld/testsuite/ld-sh/refdbg-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/refdbg-1.d
rename to ld/testsuite/ld-sh/refdbg-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/refdbg.s b/ld/testsuite/ld-sh/refdbg.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/refdbg.s
rename to ld/testsuite/ld-sh/refdbg.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/refdbglib.s b/ld/testsuite/ld-sh/refdbglib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/refdbglib.s
rename to ld/testsuite/ld-sh/refdbglib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/reloc1.d b/ld/testsuite/ld-sh/reloc1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/reloc1.d
rename to ld/testsuite/ld-sh/reloc1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/reloc1.s b/ld/testsuite/ld-sh/reloc1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/reloc1.s
rename to ld/testsuite/ld-sh/reloc1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh-vxworks.exp b/ld/testsuite/ld-sh/sh-vxworks.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh-vxworks.exp
rename to ld/testsuite/ld-sh/sh-vxworks.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh.exp b/ld/testsuite/ld-sh/sh.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh.exp
rename to ld/testsuite/ld-sh/sh.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh1.s b/ld/testsuite/ld-sh/sh1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh1.s
rename to ld/testsuite/ld-sh/sh1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh2.c b/ld/testsuite/ld-sh/sh2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh2.c
rename to ld/testsuite/ld-sh/sh2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi32.sd b/ld/testsuite/ld-sh/sh64/abi32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi32.sd
rename to ld/testsuite/ld-sh/sh64/abi32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi32.xd b/ld/testsuite/ld-sh/sh64/abi32.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi32.xd
rename to ld/testsuite/ld-sh/sh64/abi32.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi64.sd b/ld/testsuite/ld-sh/sh64/abi64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi64.sd
rename to ld/testsuite/ld-sh/sh64/abi64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi64.xd b/ld/testsuite/ld-sh/sh64/abi64.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abi64.xd
rename to ld/testsuite/ld-sh/sh64/abi64.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abixx-noexp.sd b/ld/testsuite/ld-sh/sh64/abixx-noexp.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/abixx-noexp.sd
rename to ld/testsuite/ld-sh/sh64/abixx-noexp.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/cmpct1.sd b/ld/testsuite/ld-sh/sh64/cmpct1.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/cmpct1.sd
rename to ld/testsuite/ld-sh/sh64/cmpct1.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/cmpct1.xd b/ld/testsuite/ld-sh/sh64/cmpct1.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/cmpct1.xd
rename to ld/testsuite/ld-sh/sh64/cmpct1.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-1.s b/ld/testsuite/ld-sh/sh64/crange-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-1.s
rename to ld/testsuite/ld-sh/sh64/crange-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2a.s b/ld/testsuite/ld-sh/sh64/crange-2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2a.s
rename to ld/testsuite/ld-sh/sh64/crange-2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2b.s b/ld/testsuite/ld-sh/sh64/crange-2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2b.s
rename to ld/testsuite/ld-sh/sh64/crange-2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2c.s b/ld/testsuite/ld-sh/sh64/crange-2c.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2c.s
rename to ld/testsuite/ld-sh/sh64/crange-2c.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2d.s b/ld/testsuite/ld-sh/sh64/crange-2d.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2d.s
rename to ld/testsuite/ld-sh/sh64/crange-2d.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2e.s b/ld/testsuite/ld-sh/sh64/crange-2e.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2e.s
rename to ld/testsuite/ld-sh/sh64/crange-2e.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2f.s b/ld/testsuite/ld-sh/sh64/crange-2f.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2f.s
rename to ld/testsuite/ld-sh/sh64/crange-2f.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2g.s b/ld/testsuite/ld-sh/sh64/crange-2g.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2g.s
rename to ld/testsuite/ld-sh/sh64/crange-2g.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2h.s b/ld/testsuite/ld-sh/sh64/crange-2h.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2h.s
rename to ld/testsuite/ld-sh/sh64/crange-2h.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2i.s b/ld/testsuite/ld-sh/sh64/crange-2i.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange-2i.s
rename to ld/testsuite/ld-sh/sh64/crange-2i.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange1.rd
rename to ld/testsuite/ld-sh/sh64/crange1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange2.rd b/ld/testsuite/ld-sh/sh64/crange2.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange2.rd
rename to ld/testsuite/ld-sh/sh64/crange2.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
rename to ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3-media.rd b/ld/testsuite/ld-sh/sh64/crange3-media.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3-media.rd
rename to ld/testsuite/ld-sh/sh64/crange3-media.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3.dd b/ld/testsuite/ld-sh/sh64/crange3.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3.dd
rename to ld/testsuite/ld-sh/sh64/crange3.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3.rd b/ld/testsuite/ld-sh/sh64/crange3.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crange3.rd
rename to ld/testsuite/ld-sh/sh64/crange3.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crangerel1.rd b/ld/testsuite/ld-sh/sh64/crangerel1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crangerel1.rd
rename to ld/testsuite/ld-sh/sh64/crangerel1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crangerel2.rd b/ld/testsuite/ld-sh/sh64/crangerel2.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/crangerel2.rd
rename to ld/testsuite/ld-sh/sh64/crangerel2.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/dlsection-1.s b/ld/testsuite/ld-sh/sh64/dlsection-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/dlsection-1.s
rename to ld/testsuite/ld-sh/sh64/dlsection-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/dlsection.sd b/ld/testsuite/ld-sh/sh64/dlsection.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/dlsection.sd
rename to ld/testsuite/ld-sh/sh64/dlsection.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.dbd b/ld/testsuite/ld-sh/sh64/endian.dbd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.dbd
rename to ld/testsuite/ld-sh/sh64/endian.dbd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.dld b/ld/testsuite/ld-sh/sh64/endian.dld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.dld
rename to ld/testsuite/ld-sh/sh64/endian.dld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.ld b/ld/testsuite/ld-sh/sh64/endian.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.ld
rename to ld/testsuite/ld-sh/sh64/endian.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.s b/ld/testsuite/ld-sh/sh64/endian.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.s
rename to ld/testsuite/ld-sh/sh64/endian.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.sbd b/ld/testsuite/ld-sh/sh64/endian.sbd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.sbd
rename to ld/testsuite/ld-sh/sh64/endian.sbd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.sld b/ld/testsuite/ld-sh/sh64/endian.sld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/endian.sld
rename to ld/testsuite/ld-sh/sh64/endian.sld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/gotplt.d b/ld/testsuite/ld-sh/sh64/gotplt.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/gotplt.d
rename to ld/testsuite/ld-sh/sh64/gotplt.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/gotplt.map b/ld/testsuite/ld-sh/sh64/gotplt.map
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/gotplt.map
rename to ld/testsuite/ld-sh/sh64/gotplt.map
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/gotplt.s b/ld/testsuite/ld-sh/sh64/gotplt.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/gotplt.s
rename to ld/testsuite/ld-sh/sh64/gotplt.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init-cmpct.d b/ld/testsuite/ld-sh/sh64/init-cmpct.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init-cmpct.d
rename to ld/testsuite/ld-sh/sh64/init-cmpct.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init-media.d b/ld/testsuite/ld-sh/sh64/init-media.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init-media.d
rename to ld/testsuite/ld-sh/sh64/init-media.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init.s b/ld/testsuite/ld-sh/sh64/init.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init.s
rename to ld/testsuite/ld-sh/sh64/init.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init64.d b/ld/testsuite/ld-sh/sh64/init64.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/init64.d
rename to ld/testsuite/ld-sh/sh64/init64.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix1-noexp.sd b/ld/testsuite/ld-sh/sh64/mix1-noexp.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix1-noexp.sd
rename to ld/testsuite/ld-sh/sh64/mix1-noexp.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix1.sd b/ld/testsuite/ld-sh/sh64/mix1.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix1.sd
rename to ld/testsuite/ld-sh/sh64/mix1.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix1.xd b/ld/testsuite/ld-sh/sh64/mix1.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix1.xd
rename to ld/testsuite/ld-sh/sh64/mix1.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix2-noexp.sd b/ld/testsuite/ld-sh/sh64/mix2-noexp.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix2-noexp.sd
rename to ld/testsuite/ld-sh/sh64/mix2-noexp.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix2.sd b/ld/testsuite/ld-sh/sh64/mix2.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix2.sd
rename to ld/testsuite/ld-sh/sh64/mix2.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix2.xd b/ld/testsuite/ld-sh/sh64/mix2.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/mix2.xd
rename to ld/testsuite/ld-sh/sh64/mix2.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rd-sh64.exp b/ld/testsuite/ld-sh/sh64/rd-sh64.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rd-sh64.exp
rename to ld/testsuite/ld-sh/sh64/rd-sh64.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel-1.s b/ld/testsuite/ld-sh/sh64/rel-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel-1.s
rename to ld/testsuite/ld-sh/sh64/rel-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel-2.s b/ld/testsuite/ld-sh/sh64/rel-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel-2.s
rename to ld/testsuite/ld-sh/sh64/rel-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel32.xd b/ld/testsuite/ld-sh/sh64/rel32.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel32.xd
rename to ld/testsuite/ld-sh/sh64/rel32.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel64.xd b/ld/testsuite/ld-sh/sh64/rel64.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/rel64.xd
rename to ld/testsuite/ld-sh/sh64/rel64.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax.exp b/ld/testsuite/ld-sh/sh64/relax.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax.exp
rename to ld/testsuite/ld-sh/sh64/relax.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax1.s b/ld/testsuite/ld-sh/sh64/relax1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax1.s
rename to ld/testsuite/ld-sh/sh64/relax1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax2.s b/ld/testsuite/ld-sh/sh64/relax2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax2.s
rename to ld/testsuite/ld-sh/sh64/relax2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax3.s b/ld/testsuite/ld-sh/sh64/relax3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax3.s
rename to ld/testsuite/ld-sh/sh64/relax3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax4.s b/ld/testsuite/ld-sh/sh64/relax4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relax4.s
rename to ld/testsuite/ld-sh/sh64/relax4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl-1.s b/ld/testsuite/ld-sh/sh64/reldl-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl-1.s
rename to ld/testsuite/ld-sh/sh64/reldl-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl-2.s b/ld/testsuite/ld-sh/sh64/reldl-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl-2.s
rename to ld/testsuite/ld-sh/sh64/reldl-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl32.rd b/ld/testsuite/ld-sh/sh64/reldl32.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl32.rd
rename to ld/testsuite/ld-sh/sh64/reldl32.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl64.rd b/ld/testsuite/ld-sh/sh64/reldl64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/reldl64.rd
rename to ld/testsuite/ld-sh/sh64/reldl64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relfail.exp b/ld/testsuite/ld-sh/sh64/relfail.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relfail.exp
rename to ld/testsuite/ld-sh/sh64/relfail.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relfail.s b/ld/testsuite/ld-sh/sh64/relfail.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/relfail.s
rename to ld/testsuite/ld-sh/sh64/relfail.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/sh64-1.s b/ld/testsuite/ld-sh/sh64/sh64-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/sh64-1.s
rename to ld/testsuite/ld-sh/sh64/sh64-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/sh64-2.s b/ld/testsuite/ld-sh/sh64/sh64-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/sh64-2.s
rename to ld/testsuite/ld-sh/sh64/sh64-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/sh64.exp b/ld/testsuite/ld-sh/sh64/sh64.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/sh64.exp
rename to ld/testsuite/ld-sh/sh64/sh64.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shcmp-1.s b/ld/testsuite/ld-sh/sh64/shcmp-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shcmp-1.s
rename to ld/testsuite/ld-sh/sh64/shcmp-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl-1.s b/ld/testsuite/ld-sh/sh64/shdl-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl-1.s
rename to ld/testsuite/ld-sh/sh64/shdl-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl-2.s b/ld/testsuite/ld-sh/sh64/shdl-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl-2.s
rename to ld/testsuite/ld-sh/sh64/shdl-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl32.xd b/ld/testsuite/ld-sh/sh64/shdl32.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl32.xd
rename to ld/testsuite/ld-sh/sh64/shdl32.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl64.sd b/ld/testsuite/ld-sh/sh64/shdl64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl64.sd
rename to ld/testsuite/ld-sh/sh64/shdl64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl64.xd b/ld/testsuite/ld-sh/sh64/shdl64.xd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shdl64.xd
rename to ld/testsuite/ld-sh/sh64/shdl64.xd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shmix-1.s b/ld/testsuite/ld-sh/sh64/shmix-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shmix-1.s
rename to ld/testsuite/ld-sh/sh64/shmix-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shmix-2.s b/ld/testsuite/ld-sh/sh64/shmix-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shmix-2.s
rename to ld/testsuite/ld-sh/sh64/shmix-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shmix-3.s b/ld/testsuite/ld-sh/sh64/shmix-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/shmix-3.s
rename to ld/testsuite/ld-sh/sh64/shmix-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stobin-0-dso.d b/ld/testsuite/ld-sh/sh64/stobin-0-dso.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stobin-0-dso.d
rename to ld/testsuite/ld-sh/sh64/stobin-0-dso.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stobin-1.d b/ld/testsuite/ld-sh/sh64/stobin-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stobin-1.d
rename to ld/testsuite/ld-sh/sh64/stobin-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stobin.s b/ld/testsuite/ld-sh/sh64/stobin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stobin.s
rename to ld/testsuite/ld-sh/sh64/stobin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stolib.s b/ld/testsuite/ld-sh/sh64/stolib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sh64/stolib.s
rename to ld/testsuite/ld-sh/sh64/stolib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/shared-1.d b/ld/testsuite/ld-sh/shared-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/shared-1.d
rename to ld/testsuite/ld-sh/shared-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/shared-2.d b/ld/testsuite/ld-sh/shared-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/shared-2.d
rename to ld/testsuite/ld-sh/shared-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/start.s b/ld/testsuite/ld-sh/start.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/start.s
rename to ld/testsuite/ld-sh/start.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sub2l-1.d b/ld/testsuite/ld-sh/sub2l-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sub2l-1.d
rename to ld/testsuite/ld-sh/sub2l-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/sub2l.s b/ld/testsuite/ld-sh/sub2l.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/sub2l.s
rename to ld/testsuite/ld-sh/sub2l.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/textrel1.s b/ld/testsuite/ld-sh/textrel1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/textrel1.s
rename to ld/testsuite/ld-sh/textrel1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/textrel2.s b/ld/testsuite/ld-sh/textrel2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/textrel2.s
rename to ld/testsuite/ld-sh/textrel2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-0-dso.d b/ld/testsuite/ld-sh/tlsbin-0-dso.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-0-dso.d
rename to ld/testsuite/ld-sh/tlsbin-0-dso.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-1.d b/ld/testsuite/ld-sh/tlsbin-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-1.d
rename to ld/testsuite/ld-sh/tlsbin-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-2.d b/ld/testsuite/ld-sh/tlsbin-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-2.d
rename to ld/testsuite/ld-sh/tlsbin-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-3.d b/ld/testsuite/ld-sh/tlsbin-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-3.d
rename to ld/testsuite/ld-sh/tlsbin-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-4.d b/ld/testsuite/ld-sh/tlsbin-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin-4.d
rename to ld/testsuite/ld-sh/tlsbin-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin.s b/ld/testsuite/ld-sh/tlsbin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbin.s
rename to ld/testsuite/ld-sh/tlsbin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbinpic.s b/ld/testsuite/ld-sh/tlsbinpic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlsbinpic.s
rename to ld/testsuite/ld-sh/tlsbinpic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlslib.s b/ld/testsuite/ld-sh/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlslib.s
rename to ld/testsuite/ld-sh/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-1.d b/ld/testsuite/ld-sh/tlspic-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-1.d
rename to ld/testsuite/ld-sh/tlspic-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-2.d
rename to ld/testsuite/ld-sh/tlspic-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-3.d b/ld/testsuite/ld-sh/tlspic-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-3.d
rename to ld/testsuite/ld-sh/tlspic-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-4.d b/ld/testsuite/ld-sh/tlspic-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic-4.d
rename to ld/testsuite/ld-sh/tlspic-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic1.s b/ld/testsuite/ld-sh/tlspic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic1.s
rename to ld/testsuite/ld-sh/tlspic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic2.s b/ld/testsuite/ld-sh/tlspic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlspic2.s
rename to ld/testsuite/ld-sh/tlspic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff-1.d b/ld/testsuite/ld-sh/tlstpoff-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff-1.d
rename to ld/testsuite/ld-sh/tlstpoff-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff-2.d b/ld/testsuite/ld-sh/tlstpoff-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff-2.d
rename to ld/testsuite/ld-sh/tlstpoff-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff1.s b/ld/testsuite/ld-sh/tlstpoff1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff1.s
rename to ld/testsuite/ld-sh/tlstpoff1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff2.s b/ld/testsuite/ld-sh/tlstpoff2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/tlstpoff2.s
rename to ld/testsuite/ld-sh/tlstpoff2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-le.dd b/ld/testsuite/ld-sh/vxworks1-le.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-le.dd
rename to ld/testsuite/ld-sh/vxworks1-le.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib-le.dd b/ld/testsuite/ld-sh/vxworks1-lib-le.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib-le.dd
rename to ld/testsuite/ld-sh/vxworks1-lib-le.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.dd b/ld/testsuite/ld-sh/vxworks1-lib.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.dd
rename to ld/testsuite/ld-sh/vxworks1-lib.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.nd b/ld/testsuite/ld-sh/vxworks1-lib.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.nd
rename to ld/testsuite/ld-sh/vxworks1-lib.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.rd b/ld/testsuite/ld-sh/vxworks1-lib.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.rd
rename to ld/testsuite/ld-sh/vxworks1-lib.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.s b/ld/testsuite/ld-sh/vxworks1-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.s
rename to ld/testsuite/ld-sh/vxworks1-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.td b/ld/testsuite/ld-sh/vxworks1-lib.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-lib.td
rename to ld/testsuite/ld-sh/vxworks1-lib.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-static.d b/ld/testsuite/ld-sh/vxworks1-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1-static.d
rename to ld/testsuite/ld-sh/vxworks1-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.dd b/ld/testsuite/ld-sh/vxworks1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.dd
rename to ld/testsuite/ld-sh/vxworks1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.ld b/ld/testsuite/ld-sh/vxworks1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.ld
rename to ld/testsuite/ld-sh/vxworks1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.rd b/ld/testsuite/ld-sh/vxworks1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.rd
rename to ld/testsuite/ld-sh/vxworks1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.s b/ld/testsuite/ld-sh/vxworks1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks1.s
rename to ld/testsuite/ld-sh/vxworks1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks2-static.sd b/ld/testsuite/ld-sh/vxworks2-static.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks2-static.sd
rename to ld/testsuite/ld-sh/vxworks2-static.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks2.s b/ld/testsuite/ld-sh/vxworks2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks2.s
rename to ld/testsuite/ld-sh/vxworks2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks2.sd b/ld/testsuite/ld-sh/vxworks2.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks2.sd
rename to ld/testsuite/ld-sh/vxworks2.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-le.dd b/ld/testsuite/ld-sh/vxworks3-le.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-le.dd
rename to ld/testsuite/ld-sh/vxworks3-le.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-lib-le.dd b/ld/testsuite/ld-sh/vxworks3-lib-le.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-lib-le.dd
rename to ld/testsuite/ld-sh/vxworks3-lib-le.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-lib.dd b/ld/testsuite/ld-sh/vxworks3-lib.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-lib.dd
rename to ld/testsuite/ld-sh/vxworks3-lib.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-lib.s b/ld/testsuite/ld-sh/vxworks3-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3-lib.s
rename to ld/testsuite/ld-sh/vxworks3-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3.dd b/ld/testsuite/ld-sh/vxworks3.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3.dd
rename to ld/testsuite/ld-sh/vxworks3.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3.s b/ld/testsuite/ld-sh/vxworks3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks3.s
rename to ld/testsuite/ld-sh/vxworks3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks4.d b/ld/testsuite/ld-sh/vxworks4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks4.d
rename to ld/testsuite/ld-sh/vxworks4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks4a.s b/ld/testsuite/ld-sh/vxworks4a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks4a.s
rename to ld/testsuite/ld-sh/vxworks4a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks4b.s b/ld/testsuite/ld-sh/vxworks4b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/vxworks4b.s
rename to ld/testsuite/ld-sh/vxworks4b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/weak1.d b/ld/testsuite/ld-sh/weak1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/weak1.d
rename to ld/testsuite/ld-sh/weak1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sh/weak1.s b/ld/testsuite/ld-sh/weak1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sh/weak1.s
rename to ld/testsuite/ld-sh/weak1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/elf-offset.ld b/ld/testsuite/ld-shared/elf-offset.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/elf-offset.ld
rename to ld/testsuite/ld-shared/elf-offset.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/main.c b/ld/testsuite/ld-shared/main.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/main.c
rename to ld/testsuite/ld-shared/main.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/sh1.c b/ld/testsuite/ld-shared/sh1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/sh1.c
rename to ld/testsuite/ld-shared/sh1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/sh2.c b/ld/testsuite/ld-shared/sh2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/sh2.c
rename to ld/testsuite/ld-shared/sh2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/shared.dat b/ld/testsuite/ld-shared/shared.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/shared.dat
rename to ld/testsuite/ld-shared/shared.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/shared.exp
rename to ld/testsuite/ld-shared/shared.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/sun4.dat b/ld/testsuite/ld-shared/sun4.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/sun4.dat
rename to ld/testsuite/ld-shared/sun4.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/symbolic.dat b/ld/testsuite/ld-shared/symbolic.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/symbolic.dat
rename to ld/testsuite/ld-shared/symbolic.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-shared/xcoff.dat b/ld/testsuite/ld-shared/xcoff.dat
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-shared/xcoff.dat
rename to ld/testsuite/ld-shared/xcoff.dat
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.dd b/ld/testsuite/ld-sparc/gotop32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.dd
rename to ld/testsuite/ld-sparc/gotop32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.rd b/ld/testsuite/ld-sparc/gotop32.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.rd
rename to ld/testsuite/ld-sparc/gotop32.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.s b/ld/testsuite/ld-sparc/gotop32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.s
rename to ld/testsuite/ld-sparc/gotop32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.sd b/ld/testsuite/ld-sparc/gotop32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.sd
rename to ld/testsuite/ld-sparc/gotop32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.td b/ld/testsuite/ld-sparc/gotop32.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop32.td
rename to ld/testsuite/ld-sparc/gotop32.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.dd b/ld/testsuite/ld-sparc/gotop64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.dd
rename to ld/testsuite/ld-sparc/gotop64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.rd b/ld/testsuite/ld-sparc/gotop64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.rd
rename to ld/testsuite/ld-sparc/gotop64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.s b/ld/testsuite/ld-sparc/gotop64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.s
rename to ld/testsuite/ld-sparc/gotop64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.sd b/ld/testsuite/ld-sparc/gotop64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.sd
rename to ld/testsuite/ld-sparc/gotop64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.td b/ld/testsuite/ld-sparc/gotop64.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/gotop64.td
rename to ld/testsuite/ld-sparc/gotop64.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/sparc.exp b/ld/testsuite/ld-sparc/sparc.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/sparc.exp
rename to ld/testsuite/ld-sparc/sparc.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg32.s b/ld/testsuite/ld-sparc/tlsg32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg32.s
rename to ld/testsuite/ld-sparc/tlsg32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg32.sd b/ld/testsuite/ld-sparc/tlsg32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg32.sd
rename to ld/testsuite/ld-sparc/tlsg32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg64.s b/ld/testsuite/ld-sparc/tlsg64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg64.s
rename to ld/testsuite/ld-sparc/tlsg64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg64.sd b/ld/testsuite/ld-sparc/tlsg64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsg64.sd
rename to ld/testsuite/ld-sparc/tlsg64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlslib.s b/ld/testsuite/ld-sparc/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlslib.s
rename to ld/testsuite/ld-sparc/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsnopic.s b/ld/testsuite/ld-sparc/tlsnopic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlsnopic.s
rename to ld/testsuite/ld-sparc/tlsnopic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlspic.s b/ld/testsuite/ld-sparc/tlspic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlspic.s
rename to ld/testsuite/ld-sparc/tlspic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.dd b/ld/testsuite/ld-sparc/tlssunbin32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.dd
rename to ld/testsuite/ld-sparc/tlssunbin32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.rd
rename to ld/testsuite/ld-sparc/tlssunbin32.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.s b/ld/testsuite/ld-sparc/tlssunbin32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.s
rename to ld/testsuite/ld-sparc/tlssunbin32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.sd b/ld/testsuite/ld-sparc/tlssunbin32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.sd
rename to ld/testsuite/ld-sparc/tlssunbin32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.td b/ld/testsuite/ld-sparc/tlssunbin32.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin32.td
rename to ld/testsuite/ld-sparc/tlssunbin32.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.dd b/ld/testsuite/ld-sparc/tlssunbin64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.dd
rename to ld/testsuite/ld-sparc/tlssunbin64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.rd b/ld/testsuite/ld-sparc/tlssunbin64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.rd
rename to ld/testsuite/ld-sparc/tlssunbin64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.s b/ld/testsuite/ld-sparc/tlssunbin64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.s
rename to ld/testsuite/ld-sparc/tlssunbin64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.sd b/ld/testsuite/ld-sparc/tlssunbin64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.sd
rename to ld/testsuite/ld-sparc/tlssunbin64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.td b/ld/testsuite/ld-sparc/tlssunbin64.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbin64.td
rename to ld/testsuite/ld-sparc/tlssunbin64.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbinpic32.s b/ld/testsuite/ld-sparc/tlssunbinpic32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbinpic32.s
rename to ld/testsuite/ld-sparc/tlssunbinpic32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbinpic64.s b/ld/testsuite/ld-sparc/tlssunbinpic64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunbinpic64.s
rename to ld/testsuite/ld-sparc/tlssunbinpic64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.dd b/ld/testsuite/ld-sparc/tlssunnopic32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.dd
rename to ld/testsuite/ld-sparc/tlssunnopic32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.rd
rename to ld/testsuite/ld-sparc/tlssunnopic32.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.s b/ld/testsuite/ld-sparc/tlssunnopic32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.s
rename to ld/testsuite/ld-sparc/tlssunnopic32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.sd b/ld/testsuite/ld-sparc/tlssunnopic32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic32.sd
rename to ld/testsuite/ld-sparc/tlssunnopic32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.dd b/ld/testsuite/ld-sparc/tlssunnopic64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.dd
rename to ld/testsuite/ld-sparc/tlssunnopic64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.rd
rename to ld/testsuite/ld-sparc/tlssunnopic64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.s b/ld/testsuite/ld-sparc/tlssunnopic64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.s
rename to ld/testsuite/ld-sparc/tlssunnopic64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.sd b/ld/testsuite/ld-sparc/tlssunnopic64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunnopic64.sd
rename to ld/testsuite/ld-sparc/tlssunnopic64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.dd b/ld/testsuite/ld-sparc/tlssunpic32.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.dd
rename to ld/testsuite/ld-sparc/tlssunpic32.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.rd
rename to ld/testsuite/ld-sparc/tlssunpic32.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.s b/ld/testsuite/ld-sparc/tlssunpic32.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.s
rename to ld/testsuite/ld-sparc/tlssunpic32.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.sd b/ld/testsuite/ld-sparc/tlssunpic32.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.sd
rename to ld/testsuite/ld-sparc/tlssunpic32.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.td b/ld/testsuite/ld-sparc/tlssunpic32.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic32.td
rename to ld/testsuite/ld-sparc/tlssunpic32.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.dd b/ld/testsuite/ld-sparc/tlssunpic64.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.dd
rename to ld/testsuite/ld-sparc/tlssunpic64.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.rd
rename to ld/testsuite/ld-sparc/tlssunpic64.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.s b/ld/testsuite/ld-sparc/tlssunpic64.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.s
rename to ld/testsuite/ld-sparc/tlssunpic64.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.sd b/ld/testsuite/ld-sparc/tlssunpic64.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.sd
rename to ld/testsuite/ld-sparc/tlssunpic64.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.td b/ld/testsuite/ld-sparc/tlssunpic64.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/tlssunpic64.td
rename to ld/testsuite/ld-sparc/tlssunpic64.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.dd b/ld/testsuite/ld-sparc/vxworks1-lib.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.dd
rename to ld/testsuite/ld-sparc/vxworks1-lib.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.nd b/ld/testsuite/ld-sparc/vxworks1-lib.nd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.nd
rename to ld/testsuite/ld-sparc/vxworks1-lib.nd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.rd b/ld/testsuite/ld-sparc/vxworks1-lib.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.rd
rename to ld/testsuite/ld-sparc/vxworks1-lib.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.s b/ld/testsuite/ld-sparc/vxworks1-lib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.s
rename to ld/testsuite/ld-sparc/vxworks1-lib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.td b/ld/testsuite/ld-sparc/vxworks1-lib.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-lib.td
rename to ld/testsuite/ld-sparc/vxworks1-lib.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-static.d b/ld/testsuite/ld-sparc/vxworks1-static.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1-static.d
rename to ld/testsuite/ld-sparc/vxworks1-static.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.dd b/ld/testsuite/ld-sparc/vxworks1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.dd
rename to ld/testsuite/ld-sparc/vxworks1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.ld b/ld/testsuite/ld-sparc/vxworks1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.ld
rename to ld/testsuite/ld-sparc/vxworks1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.rd b/ld/testsuite/ld-sparc/vxworks1.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.rd
rename to ld/testsuite/ld-sparc/vxworks1.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.s b/ld/testsuite/ld-sparc/vxworks1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks1.s
rename to ld/testsuite/ld-sparc/vxworks1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks2-static.sd b/ld/testsuite/ld-sparc/vxworks2-static.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks2-static.sd
rename to ld/testsuite/ld-sparc/vxworks2-static.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks2.s b/ld/testsuite/ld-sparc/vxworks2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks2.s
rename to ld/testsuite/ld-sparc/vxworks2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks2.sd b/ld/testsuite/ld-sparc/vxworks2.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-sparc/vxworks2.sd
rename to ld/testsuite/ld-sparc/vxworks2.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ear.d b/ld/testsuite/ld-spu/ear.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ear.d
rename to ld/testsuite/ld-spu/ear.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ear.s b/ld/testsuite/ld-spu/ear.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ear.s
rename to ld/testsuite/ld-spu/ear.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/embed.rd b/ld/testsuite/ld-spu/embed.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/embed.rd
rename to ld/testsuite/ld-spu/embed.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/fixup.d b/ld/testsuite/ld-spu/fixup.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/fixup.d
rename to ld/testsuite/ld-spu/fixup.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/fixup.s b/ld/testsuite/ld-spu/fixup.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/fixup.s
rename to ld/testsuite/ld-spu/fixup.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/icache1.d b/ld/testsuite/ld-spu/icache1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/icache1.d
rename to ld/testsuite/ld-spu/icache1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/icache1.s b/ld/testsuite/ld-spu/icache1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/icache1.s
rename to ld/testsuite/ld-spu/icache1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ovl.d b/ld/testsuite/ld-spu/ovl.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ovl.d
rename to ld/testsuite/ld-spu/ovl.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ovl.lnk b/ld/testsuite/ld-spu/ovl.lnk
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ovl.lnk
rename to ld/testsuite/ld-spu/ovl.lnk
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ovl.s b/ld/testsuite/ld-spu/ovl.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ovl.s
rename to ld/testsuite/ld-spu/ovl.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ovl1.lnk b/ld/testsuite/ld-spu/ovl1.lnk
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ovl1.lnk
rename to ld/testsuite/ld-spu/ovl1.lnk
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ovl2.d b/ld/testsuite/ld-spu/ovl2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ovl2.d
rename to ld/testsuite/ld-spu/ovl2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ovl2.lnk b/ld/testsuite/ld-spu/ovl2.lnk
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ovl2.lnk
rename to ld/testsuite/ld-spu/ovl2.lnk
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/ovl2.s b/ld/testsuite/ld-spu/ovl2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/ovl2.s
rename to ld/testsuite/ld-spu/ovl2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/pic.d b/ld/testsuite/ld-spu/pic.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/pic.d
rename to ld/testsuite/ld-spu/pic.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/pic.s b/ld/testsuite/ld-spu/pic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/pic.s
rename to ld/testsuite/ld-spu/pic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/picdef.s b/ld/testsuite/ld-spu/picdef.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/picdef.s
rename to ld/testsuite/ld-spu/picdef.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-spu/spu.exp b/ld/testsuite/ld-spu/spu.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-spu/spu.exp
rename to ld/testsuite/ld-spu/spu.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-srec/sr1.c b/ld/testsuite/ld-srec/sr1.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-srec/sr1.c
rename to ld/testsuite/ld-srec/sr1.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-srec/sr2.c b/ld/testsuite/ld-srec/sr2.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-srec/sr2.c
rename to ld/testsuite/ld-srec/sr2.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-srec/sr3.cc b/ld/testsuite/ld-srec/sr3.cc
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-srec/sr3.cc
rename to ld/testsuite/ld-srec/sr3.cc
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-srec/srec.exp
rename to ld/testsuite/ld-srec/srec.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x.s b/ld/testsuite/ld-tic6x/attr-arch-c62x.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c62x.s
rename to ld/testsuite/ld-tic6x/attr-arch-c62x.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+.s b/ld/testsuite/ld-tic6x/attr-arch-c64x+.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x+.s
rename to ld/testsuite/ld-tic6x/attr-arch-c64x+.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x.s b/ld/testsuite/ld-tic6x/attr-arch-c64x.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c64x.s
rename to ld/testsuite/ld-tic6x/attr-arch-c64x.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x.s b/ld/testsuite/ld-tic6x/attr-arch-c674x.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c674x.s
rename to ld/testsuite/ld-tic6x/attr-arch-c674x.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+.s b/ld/testsuite/ld-tic6x/attr-arch-c67x+.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x+.s
rename to ld/testsuite/ld-tic6x/attr-arch-c67x+.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d b/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d
rename to ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x.s b/ld/testsuite/ld-tic6x/attr-arch-c67x.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-arch-c67x.s
rename to ld/testsuite/ld-tic6x/attr-arch-c67x.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-16.d b/ld/testsuite/ld-tic6x/attr-array-16-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-16.d
rename to ld/testsuite/ld-tic6x/attr-array-16-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-4.d b/ld/testsuite/ld-tic6x/attr-array-16-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-4.d
rename to ld/testsuite/ld-tic6x/attr-array-16-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-416.d b/ld/testsuite/ld-tic6x/attr-array-16-416.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-416.d
rename to ld/testsuite/ld-tic6x/attr-array-16-416.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-48.d b/ld/testsuite/ld-tic6x/attr-array-16-48.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-48.d
rename to ld/testsuite/ld-tic6x/attr-array-16-48.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-8.d b/ld/testsuite/ld-tic6x/attr-array-16-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-8.d
rename to ld/testsuite/ld-tic6x/attr-array-16-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-816.d b/ld/testsuite/ld-tic6x/attr-array-16-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16-816.d
rename to ld/testsuite/ld-tic6x/attr-array-16-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16.s b/ld/testsuite/ld-tic6x/attr-array-16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-16.s
rename to ld/testsuite/ld-tic6x/attr-array-16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-16.d b/ld/testsuite/ld-tic6x/attr-array-4-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-16.d
rename to ld/testsuite/ld-tic6x/attr-array-4-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-4.d b/ld/testsuite/ld-tic6x/attr-array-4-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-4.d
rename to ld/testsuite/ld-tic6x/attr-array-4-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-416.d b/ld/testsuite/ld-tic6x/attr-array-4-416.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-416.d
rename to ld/testsuite/ld-tic6x/attr-array-4-416.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-48.d b/ld/testsuite/ld-tic6x/attr-array-4-48.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-48.d
rename to ld/testsuite/ld-tic6x/attr-array-4-48.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-8.d b/ld/testsuite/ld-tic6x/attr-array-4-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-8.d
rename to ld/testsuite/ld-tic6x/attr-array-4-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-816.d b/ld/testsuite/ld-tic6x/attr-array-4-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4-816.d
rename to ld/testsuite/ld-tic6x/attr-array-4-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4.s b/ld/testsuite/ld-tic6x/attr-array-4.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-4.s
rename to ld/testsuite/ld-tic6x/attr-array-4.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-16.d b/ld/testsuite/ld-tic6x/attr-array-416-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-16.d
rename to ld/testsuite/ld-tic6x/attr-array-416-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-4.d b/ld/testsuite/ld-tic6x/attr-array-416-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-4.d
rename to ld/testsuite/ld-tic6x/attr-array-416-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-416.d b/ld/testsuite/ld-tic6x/attr-array-416-416.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-416.d
rename to ld/testsuite/ld-tic6x/attr-array-416-416.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-48.d b/ld/testsuite/ld-tic6x/attr-array-416-48.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-48.d
rename to ld/testsuite/ld-tic6x/attr-array-416-48.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-8.d b/ld/testsuite/ld-tic6x/attr-array-416-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-8.d
rename to ld/testsuite/ld-tic6x/attr-array-416-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-816.d b/ld/testsuite/ld-tic6x/attr-array-416-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416-816.d
rename to ld/testsuite/ld-tic6x/attr-array-416-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416.s b/ld/testsuite/ld-tic6x/attr-array-416.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-416.s
rename to ld/testsuite/ld-tic6x/attr-array-416.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-16.d b/ld/testsuite/ld-tic6x/attr-array-48-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-16.d
rename to ld/testsuite/ld-tic6x/attr-array-48-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-4.d b/ld/testsuite/ld-tic6x/attr-array-48-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-4.d
rename to ld/testsuite/ld-tic6x/attr-array-48-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-416.d b/ld/testsuite/ld-tic6x/attr-array-48-416.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-416.d
rename to ld/testsuite/ld-tic6x/attr-array-48-416.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-48.d b/ld/testsuite/ld-tic6x/attr-array-48-48.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-48.d
rename to ld/testsuite/ld-tic6x/attr-array-48-48.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-8.d b/ld/testsuite/ld-tic6x/attr-array-48-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-8.d
rename to ld/testsuite/ld-tic6x/attr-array-48-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-816.d b/ld/testsuite/ld-tic6x/attr-array-48-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48-816.d
rename to ld/testsuite/ld-tic6x/attr-array-48-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48.s b/ld/testsuite/ld-tic6x/attr-array-48.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-48.s
rename to ld/testsuite/ld-tic6x/attr-array-48.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-16.d b/ld/testsuite/ld-tic6x/attr-array-8-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-16.d
rename to ld/testsuite/ld-tic6x/attr-array-8-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-4.d b/ld/testsuite/ld-tic6x/attr-array-8-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-4.d
rename to ld/testsuite/ld-tic6x/attr-array-8-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-416.d b/ld/testsuite/ld-tic6x/attr-array-8-416.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-416.d
rename to ld/testsuite/ld-tic6x/attr-array-8-416.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-48.d b/ld/testsuite/ld-tic6x/attr-array-8-48.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-48.d
rename to ld/testsuite/ld-tic6x/attr-array-8-48.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-8.d b/ld/testsuite/ld-tic6x/attr-array-8-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-8.d
rename to ld/testsuite/ld-tic6x/attr-array-8-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-816.d b/ld/testsuite/ld-tic6x/attr-array-8-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8-816.d
rename to ld/testsuite/ld-tic6x/attr-array-8-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8.s b/ld/testsuite/ld-tic6x/attr-array-8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-8.s
rename to ld/testsuite/ld-tic6x/attr-array-8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-16.d b/ld/testsuite/ld-tic6x/attr-array-816-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-16.d
rename to ld/testsuite/ld-tic6x/attr-array-816-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-4.d b/ld/testsuite/ld-tic6x/attr-array-816-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-4.d
rename to ld/testsuite/ld-tic6x/attr-array-816-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-416.d b/ld/testsuite/ld-tic6x/attr-array-816-416.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-416.d
rename to ld/testsuite/ld-tic6x/attr-array-816-416.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-48.d b/ld/testsuite/ld-tic6x/attr-array-816-48.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-48.d
rename to ld/testsuite/ld-tic6x/attr-array-816-48.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-8.d b/ld/testsuite/ld-tic6x/attr-array-816-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-8.d
rename to ld/testsuite/ld-tic6x/attr-array-816-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-816.d b/ld/testsuite/ld-tic6x/attr-array-816-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816-816.d
rename to ld/testsuite/ld-tic6x/attr-array-816-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816.s b/ld/testsuite/ld-tic6x/attr-array-816.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-array-816.s
rename to ld/testsuite/ld-tic6x/attr-array-816.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-gnu-gnu.d b/ld/testsuite/ld-tic6x/attr-compatibility-gnu-gnu.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-gnu-gnu.d
rename to ld/testsuite/ld-tic6x/attr-compatibility-gnu-gnu.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-gnu-other.d b/ld/testsuite/ld-tic6x/attr-compatibility-gnu-other.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-gnu-other.d
rename to ld/testsuite/ld-tic6x/attr-compatibility-gnu-other.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-gnu.s b/ld/testsuite/ld-tic6x/attr-compatibility-gnu.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-gnu.s
rename to ld/testsuite/ld-tic6x/attr-compatibility-gnu.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-other-gnu.d b/ld/testsuite/ld-tic6x/attr-compatibility-other-gnu.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-other-gnu.d
rename to ld/testsuite/ld-tic6x/attr-compatibility-other-gnu.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-other-other.d b/ld/testsuite/ld-tic6x/attr-compatibility-other-other.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-other-other.d
rename to ld/testsuite/ld-tic6x/attr-compatibility-other-other.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-other.s b/ld/testsuite/ld-tic6x/attr-compatibility-other.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-compatibility-other.s
rename to ld/testsuite/ld-tic6x/attr-compatibility-other.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10-10.d b/ld/testsuite/ld-tic6x/attr-conformance-10-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10-10.d
rename to ld/testsuite/ld-tic6x/attr-conformance-10-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10-11.d b/ld/testsuite/ld-tic6x/attr-conformance-10-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10-11.d
rename to ld/testsuite/ld-tic6x/attr-conformance-10-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10-none.d b/ld/testsuite/ld-tic6x/attr-conformance-10-none.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10-none.d
rename to ld/testsuite/ld-tic6x/attr-conformance-10-none.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10.s b/ld/testsuite/ld-tic6x/attr-conformance-10.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-10.s
rename to ld/testsuite/ld-tic6x/attr-conformance-10.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11-10.d b/ld/testsuite/ld-tic6x/attr-conformance-11-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11-10.d
rename to ld/testsuite/ld-tic6x/attr-conformance-11-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11-11.d b/ld/testsuite/ld-tic6x/attr-conformance-11-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11-11.d
rename to ld/testsuite/ld-tic6x/attr-conformance-11-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11-none.d b/ld/testsuite/ld-tic6x/attr-conformance-11-none.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11-none.d
rename to ld/testsuite/ld-tic6x/attr-conformance-11-none.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11.s b/ld/testsuite/ld-tic6x/attr-conformance-11.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-11.s
rename to ld/testsuite/ld-tic6x/attr-conformance-11.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none-10.d b/ld/testsuite/ld-tic6x/attr-conformance-none-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none-10.d
rename to ld/testsuite/ld-tic6x/attr-conformance-none-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none-11.d b/ld/testsuite/ld-tic6x/attr-conformance-none-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none-11.d
rename to ld/testsuite/ld-tic6x/attr-conformance-none-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none-none.d b/ld/testsuite/ld-tic6x/attr-conformance-none-none.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none-none.d
rename to ld/testsuite/ld-tic6x/attr-conformance-none-none.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none.s b/ld/testsuite/ld-tic6x/attr-conformance-none.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-conformance-none.s
rename to ld/testsuite/ld-tic6x/attr-conformance-none.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-0.s b/ld/testsuite/ld-tic6x/attr-dsbt-0.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-0.s
rename to ld/testsuite/ld-tic6x/attr-dsbt-0.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-00.d b/ld/testsuite/ld-tic6x/attr-dsbt-00.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-00.d
rename to ld/testsuite/ld-tic6x/attr-dsbt-00.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-01.d b/ld/testsuite/ld-tic6x/attr-dsbt-01.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-01.d
rename to ld/testsuite/ld-tic6x/attr-dsbt-01.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-1.s b/ld/testsuite/ld-tic6x/attr-dsbt-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-1.s
rename to ld/testsuite/ld-tic6x/attr-dsbt-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-10.d b/ld/testsuite/ld-tic6x/attr-dsbt-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-10.d
rename to ld/testsuite/ld-tic6x/attr-dsbt-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-11.d b/ld/testsuite/ld-tic6x/attr-dsbt-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-dsbt-11.d
rename to ld/testsuite/ld-tic6x/attr-dsbt-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-0.s b/ld/testsuite/ld-tic6x/attr-pic-0.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-0.s
rename to ld/testsuite/ld-tic6x/attr-pic-0.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-00.d b/ld/testsuite/ld-tic6x/attr-pic-00.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-00.d
rename to ld/testsuite/ld-tic6x/attr-pic-00.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-01.d b/ld/testsuite/ld-tic6x/attr-pic-01.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-01.d
rename to ld/testsuite/ld-tic6x/attr-pic-01.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-1.s b/ld/testsuite/ld-tic6x/attr-pic-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-1.s
rename to ld/testsuite/ld-tic6x/attr-pic-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-10.d b/ld/testsuite/ld-tic6x/attr-pic-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-10.d
rename to ld/testsuite/ld-tic6x/attr-pic-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-11.d b/ld/testsuite/ld-tic6x/attr-pic-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pic-11.d
rename to ld/testsuite/ld-tic6x/attr-pic-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-0.s b/ld/testsuite/ld-tic6x/attr-pid-0.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-0.s
rename to ld/testsuite/ld-tic6x/attr-pid-0.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-00.d b/ld/testsuite/ld-tic6x/attr-pid-00.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-00.d
rename to ld/testsuite/ld-tic6x/attr-pid-00.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-01.d b/ld/testsuite/ld-tic6x/attr-pid-01.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-01.d
rename to ld/testsuite/ld-tic6x/attr-pid-01.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-02.d b/ld/testsuite/ld-tic6x/attr-pid-02.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-02.d
rename to ld/testsuite/ld-tic6x/attr-pid-02.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-1.s b/ld/testsuite/ld-tic6x/attr-pid-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-1.s
rename to ld/testsuite/ld-tic6x/attr-pid-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-10.d b/ld/testsuite/ld-tic6x/attr-pid-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-10.d
rename to ld/testsuite/ld-tic6x/attr-pid-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-11.d b/ld/testsuite/ld-tic6x/attr-pid-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-11.d
rename to ld/testsuite/ld-tic6x/attr-pid-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-12.d b/ld/testsuite/ld-tic6x/attr-pid-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-12.d
rename to ld/testsuite/ld-tic6x/attr-pid-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-2.s b/ld/testsuite/ld-tic6x/attr-pid-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-2.s
rename to ld/testsuite/ld-tic6x/attr-pid-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-20.d b/ld/testsuite/ld-tic6x/attr-pid-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-20.d
rename to ld/testsuite/ld-tic6x/attr-pid-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-21.d b/ld/testsuite/ld-tic6x/attr-pid-21.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-21.d
rename to ld/testsuite/ld-tic6x/attr-pid-21.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-22.d b/ld/testsuite/ld-tic6x/attr-pid-22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-pid-22.d
rename to ld/testsuite/ld-tic6x/attr-pid-22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16-16.d b/ld/testsuite/ld-tic6x/attr-stack-16-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16-16.d
rename to ld/testsuite/ld-tic6x/attr-stack-16-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16-8.d b/ld/testsuite/ld-tic6x/attr-stack-16-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16-8.d
rename to ld/testsuite/ld-tic6x/attr-stack-16-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16-816.d b/ld/testsuite/ld-tic6x/attr-stack-16-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16-816.d
rename to ld/testsuite/ld-tic6x/attr-stack-16-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16.s b/ld/testsuite/ld-tic6x/attr-stack-16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-16.s
rename to ld/testsuite/ld-tic6x/attr-stack-16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8-16.d b/ld/testsuite/ld-tic6x/attr-stack-8-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8-16.d
rename to ld/testsuite/ld-tic6x/attr-stack-8-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8-8.d b/ld/testsuite/ld-tic6x/attr-stack-8-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8-8.d
rename to ld/testsuite/ld-tic6x/attr-stack-8-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8-816.d b/ld/testsuite/ld-tic6x/attr-stack-8-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8-816.d
rename to ld/testsuite/ld-tic6x/attr-stack-8-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8.s b/ld/testsuite/ld-tic6x/attr-stack-8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-8.s
rename to ld/testsuite/ld-tic6x/attr-stack-8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816-16.d b/ld/testsuite/ld-tic6x/attr-stack-816-16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816-16.d
rename to ld/testsuite/ld-tic6x/attr-stack-816-16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816-8.d b/ld/testsuite/ld-tic6x/attr-stack-816-8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816-8.d
rename to ld/testsuite/ld-tic6x/attr-stack-816-8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816-816.d b/ld/testsuite/ld-tic6x/attr-stack-816-816.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816-816.d
rename to ld/testsuite/ld-tic6x/attr-stack-816-816.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816.s b/ld/testsuite/ld-tic6x/attr-stack-816.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-stack-816.s
rename to ld/testsuite/ld-tic6x/attr-stack-816.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-0.s b/ld/testsuite/ld-tic6x/attr-wchar-0.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-0.s
rename to ld/testsuite/ld-tic6x/attr-wchar-0.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-00.d b/ld/testsuite/ld-tic6x/attr-wchar-00.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-00.d
rename to ld/testsuite/ld-tic6x/attr-wchar-00.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-01.d b/ld/testsuite/ld-tic6x/attr-wchar-01.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-01.d
rename to ld/testsuite/ld-tic6x/attr-wchar-01.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-02.d b/ld/testsuite/ld-tic6x/attr-wchar-02.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-02.d
rename to ld/testsuite/ld-tic6x/attr-wchar-02.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-1.s b/ld/testsuite/ld-tic6x/attr-wchar-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-1.s
rename to ld/testsuite/ld-tic6x/attr-wchar-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-10.d b/ld/testsuite/ld-tic6x/attr-wchar-10.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-10.d
rename to ld/testsuite/ld-tic6x/attr-wchar-10.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-11.d b/ld/testsuite/ld-tic6x/attr-wchar-11.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-11.d
rename to ld/testsuite/ld-tic6x/attr-wchar-11.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-12.d b/ld/testsuite/ld-tic6x/attr-wchar-12.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-12.d
rename to ld/testsuite/ld-tic6x/attr-wchar-12.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-2.s b/ld/testsuite/ld-tic6x/attr-wchar-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-2.s
rename to ld/testsuite/ld-tic6x/attr-wchar-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-20.d b/ld/testsuite/ld-tic6x/attr-wchar-20.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-20.d
rename to ld/testsuite/ld-tic6x/attr-wchar-20.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-21.d b/ld/testsuite/ld-tic6x/attr-wchar-21.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-21.d
rename to ld/testsuite/ld-tic6x/attr-wchar-21.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-22.d b/ld/testsuite/ld-tic6x/attr-wchar-22.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/attr-wchar-22.d
rename to ld/testsuite/ld-tic6x/attr-wchar-22.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global-rel.d b/ld/testsuite/ld-tic6x/data-reloc-global-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global-rel.d
rename to ld/testsuite/ld-tic6x/data-reloc-global-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global-rel.s b/ld/testsuite/ld-tic6x/data-reloc-global-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global-rel.s
rename to ld/testsuite/ld-tic6x/data-reloc-global-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global.d b/ld/testsuite/ld-tic6x/data-reloc-global.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global.d
rename to ld/testsuite/ld-tic6x/data-reloc-global.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global.s b/ld/testsuite/ld-tic6x/data-reloc-global.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-global.s
rename to ld/testsuite/ld-tic6x/data-reloc-global.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-1.s b/ld/testsuite/ld-tic6x/data-reloc-local-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-1.s
rename to ld/testsuite/ld-tic6x/data-reloc-local-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-2.s b/ld/testsuite/ld-tic6x/data-reloc-local-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-2.s
rename to ld/testsuite/ld-tic6x/data-reloc-local-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d b/ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d
rename to ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-r.d b/ld/testsuite/ld-tic6x/data-reloc-local-r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-r.d
rename to ld/testsuite/ld-tic6x/data-reloc-local-r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-rel.d b/ld/testsuite/ld-tic6x/data-reloc-local-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local-rel.d
rename to ld/testsuite/ld-tic6x/data-reloc-local-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local.d b/ld/testsuite/ld-tic6x/data-reloc-local.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/data-reloc-local.d
rename to ld/testsuite/ld-tic6x/data-reloc-local.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/generic.ld b/ld/testsuite/ld-tic6x/generic.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/generic.ld
rename to ld/testsuite/ld-tic6x/generic.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global-rel.d b/ld/testsuite/ld-tic6x/mvk-reloc-global-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global-rel.d
rename to ld/testsuite/ld-tic6x/mvk-reloc-global-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global-rel.s b/ld/testsuite/ld-tic6x/mvk-reloc-global-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global-rel.s
rename to ld/testsuite/ld-tic6x/mvk-reloc-global-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global.d b/ld/testsuite/ld-tic6x/mvk-reloc-global.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global.d
rename to ld/testsuite/ld-tic6x/mvk-reloc-global.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global.s b/ld/testsuite/ld-tic6x/mvk-reloc-global.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-global.s
rename to ld/testsuite/ld-tic6x/mvk-reloc-global.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-1-rel.s b/ld/testsuite/ld-tic6x/mvk-reloc-local-1-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-1-rel.s
rename to ld/testsuite/ld-tic6x/mvk-reloc-local-1-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-1.s b/ld/testsuite/ld-tic6x/mvk-reloc-local-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-1.s
rename to ld/testsuite/ld-tic6x/mvk-reloc-local-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-2-rel.s b/ld/testsuite/ld-tic6x/mvk-reloc-local-2-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-2-rel.s
rename to ld/testsuite/ld-tic6x/mvk-reloc-local-2-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-2.s b/ld/testsuite/ld-tic6x/mvk-reloc-local-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-2.s
rename to ld/testsuite/ld-tic6x/mvk-reloc-local-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-r-rel.d b/ld/testsuite/ld-tic6x/mvk-reloc-local-r-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-r-rel.d
rename to ld/testsuite/ld-tic6x/mvk-reloc-local-r-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-r.d b/ld/testsuite/ld-tic6x/mvk-reloc-local-r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-r.d
rename to ld/testsuite/ld-tic6x/mvk-reloc-local-r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-rel.d b/ld/testsuite/ld-tic6x/mvk-reloc-local-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local-rel.d
rename to ld/testsuite/ld-tic6x/mvk-reloc-local-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local.d b/ld/testsuite/ld-tic6x/mvk-reloc-local.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/mvk-reloc-local.d
rename to ld/testsuite/ld-tic6x/mvk-reloc-local.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-global-rel.d b/ld/testsuite/ld-tic6x/pcrel-reloc-global-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-global-rel.d
rename to ld/testsuite/ld-tic6x/pcrel-reloc-global-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-global.d b/ld/testsuite/ld-tic6x/pcrel-reloc-global.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-global.d
rename to ld/testsuite/ld-tic6x/pcrel-reloc-global.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-global.s b/ld/testsuite/ld-tic6x/pcrel-reloc-global.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-global.s
rename to ld/testsuite/ld-tic6x/pcrel-reloc-global.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-1.s b/ld/testsuite/ld-tic6x/pcrel-reloc-local-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-1.s
rename to ld/testsuite/ld-tic6x/pcrel-reloc-local-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-2.s b/ld/testsuite/ld-tic6x/pcrel-reloc-local-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-2.s
rename to ld/testsuite/ld-tic6x/pcrel-reloc-local-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel-rela.d b/ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel-rela.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel-rela.d
rename to ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel-rela.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel.d b/ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel.d
rename to ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-r.d b/ld/testsuite/ld-tic6x/pcrel-reloc-local-r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-r.d
rename to ld/testsuite/ld-tic6x/pcrel-reloc-local-r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-rel.d b/ld/testsuite/ld-tic6x/pcrel-reloc-local-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local-rel.d
rename to ld/testsuite/ld-tic6x/pcrel-reloc-local-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local.d b/ld/testsuite/ld-tic6x/pcrel-reloc-local.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/pcrel-reloc-local.d
rename to ld/testsuite/ld-tic6x/pcrel-reloc-local.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16.s b/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs-s16.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs-s16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs16-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-abs16-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs16-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs16-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs16-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-abs16-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs16-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs16-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs16.s b/ld/testsuite/ld-tic6x/reloc-overflow-abs16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs16.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs8-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-abs8-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs8-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs8-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs8-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-abs8-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs8-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs8-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs8.s b/ld/testsuite/ld-tic6x/reloc-overflow-abs8.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-abs8.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-abs8.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10.s b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12.s b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21.s b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7.s b/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16.s b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b.s b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h.s b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-1.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-1.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-2.d b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-2.d
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w.s b/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w.s
rename to ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global-rel.d b/ld/testsuite/ld-tic6x/sbr-reloc-global-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global-rel.d
rename to ld/testsuite/ld-tic6x/sbr-reloc-global-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global-rel.s b/ld/testsuite/ld-tic6x/sbr-reloc-global-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global-rel.s
rename to ld/testsuite/ld-tic6x/sbr-reloc-global-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global.d b/ld/testsuite/ld-tic6x/sbr-reloc-global.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global.d
rename to ld/testsuite/ld-tic6x/sbr-reloc-global.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global.s b/ld/testsuite/ld-tic6x/sbr-reloc-global.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-global.s
rename to ld/testsuite/ld-tic6x/sbr-reloc-global.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-1-rel.s b/ld/testsuite/ld-tic6x/sbr-reloc-local-1-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-1-rel.s
rename to ld/testsuite/ld-tic6x/sbr-reloc-local-1-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-1.s b/ld/testsuite/ld-tic6x/sbr-reloc-local-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-1.s
rename to ld/testsuite/ld-tic6x/sbr-reloc-local-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-2-rel.s b/ld/testsuite/ld-tic6x/sbr-reloc-local-2-rel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-2-rel.s
rename to ld/testsuite/ld-tic6x/sbr-reloc-local-2-rel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-2.s b/ld/testsuite/ld-tic6x/sbr-reloc-local-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-2.s
rename to ld/testsuite/ld-tic6x/sbr-reloc-local-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-r-rel.d b/ld/testsuite/ld-tic6x/sbr-reloc-local-r-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-r-rel.d
rename to ld/testsuite/ld-tic6x/sbr-reloc-local-r-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-r.d b/ld/testsuite/ld-tic6x/sbr-reloc-local-r.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-r.d
rename to ld/testsuite/ld-tic6x/sbr-reloc-local-r.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-rel.d b/ld/testsuite/ld-tic6x/sbr-reloc-local-rel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local-rel.d
rename to ld/testsuite/ld-tic6x/sbr-reloc-local-rel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local.d b/ld/testsuite/ld-tic6x/sbr-reloc-local.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr-reloc-local.d
rename to ld/testsuite/ld-tic6x/sbr-reloc-local.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr.ld b/ld/testsuite/ld-tic6x/sbr.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/sbr.ld
rename to ld/testsuite/ld-tic6x/sbr.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-tic6x/tic6x.exp b/ld/testsuite/ld-tic6x/tic6x.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-tic6x/tic6x.exp
rename to ld/testsuite/ld-tic6x/tic6x.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/dummy.s b/ld/testsuite/ld-undefined/dummy.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/dummy.s
rename to ld/testsuite/ld-undefined/dummy.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-1.d b/ld/testsuite/ld-undefined/entry-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-1.d
rename to ld/testsuite/ld-undefined/entry-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-2.d b/ld/testsuite/ld-undefined/entry-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-2.d
rename to ld/testsuite/ld-undefined/entry-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-3.d b/ld/testsuite/ld-undefined/entry-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-3.d
rename to ld/testsuite/ld-undefined/entry-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-4.d b/ld/testsuite/ld-undefined/entry-4.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-4.d
rename to ld/testsuite/ld-undefined/entry-4.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-5.d b/ld/testsuite/ld-undefined/entry-5.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-5.d
rename to ld/testsuite/ld-undefined/entry-5.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-6.d b/ld/testsuite/ld-undefined/entry-6.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-6.d
rename to ld/testsuite/ld-undefined/entry-6.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-7.d b/ld/testsuite/ld-undefined/entry-7.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry-7.d
rename to ld/testsuite/ld-undefined/entry-7.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry.exp b/ld/testsuite/ld-undefined/entry.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry.exp
rename to ld/testsuite/ld-undefined/entry.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/entry.s b/ld/testsuite/ld-undefined/entry.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/entry.s
rename to ld/testsuite/ld-undefined/entry.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/undefined.c b/ld/testsuite/ld-undefined/undefined.c
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/undefined.c
rename to ld/testsuite/ld-undefined/undefined.c
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/undefined.exp b/ld/testsuite/ld-undefined/undefined.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/undefined.exp
rename to ld/testsuite/ld-undefined/undefined.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/weak-undef.exp b/ld/testsuite/ld-undefined/weak-undef.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/weak-undef.exp
rename to ld/testsuite/ld-undefined/weak-undef.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/weak-undef.s b/ld/testsuite/ld-undefined/weak-undef.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/weak-undef.s
rename to ld/testsuite/ld-undefined/weak-undef.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-undefined/weak-undef.t b/ld/testsuite/ld-undefined/weak-undef.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-undefined/weak-undef.t
rename to ld/testsuite/ld-undefined/weak-undef.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-v850/split-lo16.d b/ld/testsuite/ld-v850/split-lo16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-v850/split-lo16.d
rename to ld/testsuite/ld-v850/split-lo16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-v850/split-lo16.ld b/ld/testsuite/ld-v850/split-lo16.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-v850/split-lo16.ld
rename to ld/testsuite/ld-v850/split-lo16.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-v850/split-lo16.s b/ld/testsuite/ld-v850/split-lo16.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-v850/split-lo16.s
rename to ld/testsuite/ld-v850/split-lo16.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-v850/v850.exp b/ld/testsuite/ld-v850/v850.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-v850/v850.exp
rename to ld/testsuite/ld-v850/v850.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t1-1.ro b/ld/testsuite/ld-versados/t1-1.ro
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t1-1.ro
rename to ld/testsuite/ld-versados/t1-1.ro
Binary files differ
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t1-2.ro b/ld/testsuite/ld-versados/t1-2.ro
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t1-2.ro
rename to ld/testsuite/ld-versados/t1-2.ro
Binary files differ
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t1.ld b/ld/testsuite/ld-versados/t1.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t1.ld
rename to ld/testsuite/ld-versados/t1.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t1.ook b/ld/testsuite/ld-versados/t1.ook
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t1.ook
rename to ld/testsuite/ld-versados/t1.ook
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t2-1.ro b/ld/testsuite/ld-versados/t2-1.ro
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t2-1.ro
rename to ld/testsuite/ld-versados/t2-1.ro
Binary files differ
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t2-2.ro b/ld/testsuite/ld-versados/t2-2.ro
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t2-2.ro
rename to ld/testsuite/ld-versados/t2-2.ro
Binary files differ
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t2-3.ro b/ld/testsuite/ld-versados/t2-3.ro
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t2-3.ro
rename to ld/testsuite/ld-versados/t2-3.ro
Binary files differ
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t2.ld b/ld/testsuite/ld-versados/t2.ld
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t2.ld
rename to ld/testsuite/ld-versados/t2.ld
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/t2.ook b/ld/testsuite/ld-versados/t2.ook
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/t2.ook
rename to ld/testsuite/ld-versados/t2.ook
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-versados/versados.exp b/ld/testsuite/ld-versados/versados.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-versados/versados.exp
rename to ld/testsuite/ld-versados/versados.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/plt-mips1.d b/ld/testsuite/ld-vxworks/plt-mips1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/plt-mips1.d
rename to ld/testsuite/ld-vxworks/plt-mips1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/plt-mips1.s b/ld/testsuite/ld-vxworks/plt-mips1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/plt-mips1.s
rename to ld/testsuite/ld-vxworks/plt-mips1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/rpath-1.d b/ld/testsuite/ld-vxworks/rpath-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/rpath-1.d
rename to ld/testsuite/ld-vxworks/rpath-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/rpath-1.s b/ld/testsuite/ld-vxworks/rpath-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/rpath-1.s
rename to ld/testsuite/ld-vxworks/rpath-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-1.d b/ld/testsuite/ld-vxworks/tls-1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-1.d
rename to ld/testsuite/ld-vxworks/tls-1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-1.s b/ld/testsuite/ld-vxworks/tls-1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-1.s
rename to ld/testsuite/ld-vxworks/tls-1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-2.d b/ld/testsuite/ld-vxworks/tls-2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-2.d
rename to ld/testsuite/ld-vxworks/tls-2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-2.s b/ld/testsuite/ld-vxworks/tls-2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-2.s
rename to ld/testsuite/ld-vxworks/tls-2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-3.d b/ld/testsuite/ld-vxworks/tls-3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-3.d
rename to ld/testsuite/ld-vxworks/tls-3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-3.s b/ld/testsuite/ld-vxworks/tls-3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/tls-3.s
rename to ld/testsuite/ld-vxworks/tls-3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-vxworks/vxworks.exp b/ld/testsuite/ld-vxworks/vxworks.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-vxworks/vxworks.exp
rename to ld/testsuite/ld-vxworks/vxworks.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/abs-l1om.d
rename to ld/testsuite/ld-x86-64/abs-l1om.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/abs.d
rename to ld/testsuite/ld-x86-64/abs.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/compressed1.d b/ld/testsuite/ld-x86-64/compressed1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/compressed1.d
rename to ld/testsuite/ld-x86-64/compressed1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/compressed1.s b/ld/testsuite/ld-x86-64/compressed1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/compressed1.s
rename to ld/testsuite/ld-x86-64/compressed1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/discarded1.d b/ld/testsuite/ld-x86-64/discarded1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/discarded1.d
rename to ld/testsuite/ld-x86-64/discarded1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/discarded1.s b/ld/testsuite/ld-x86-64/discarded1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/discarded1.s
rename to ld/testsuite/ld-x86-64/discarded1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/discarded1.t b/ld/testsuite/ld-x86-64/discarded1.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/discarded1.t
rename to ld/testsuite/ld-x86-64/discarded1.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc.exp b/ld/testsuite/ld-x86-64/dwarfreloc.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc.exp
rename to ld/testsuite/ld-x86-64/dwarfreloc.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc.rd b/ld/testsuite/ld-x86-64/dwarfreloc.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc.rd
rename to ld/testsuite/ld-x86-64/dwarfreloc.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc1.s b/ld/testsuite/ld-x86-64/dwarfreloc1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc1.s
rename to ld/testsuite/ld-x86-64/dwarfreloc1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc2.s b/ld/testsuite/ld-x86-64/dwarfreloc2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/dwarfreloc2.s
rename to ld/testsuite/ld-x86-64/dwarfreloc2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden1.d b/ld/testsuite/ld-x86-64/hidden1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden1.d
rename to ld/testsuite/ld-x86-64/hidden1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden1.s b/ld/testsuite/ld-x86-64/hidden1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden1.s
rename to ld/testsuite/ld-x86-64/hidden1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden2.d b/ld/testsuite/ld-x86-64/hidden2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden2.d
rename to ld/testsuite/ld-x86-64/hidden2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden2.s b/ld/testsuite/ld-x86-64/hidden2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden2.s
rename to ld/testsuite/ld-x86-64/hidden2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden3.d b/ld/testsuite/ld-x86-64/hidden3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden3.d
rename to ld/testsuite/ld-x86-64/hidden3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden3.s b/ld/testsuite/ld-x86-64/hidden3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/hidden3.s
rename to ld/testsuite/ld-x86-64/hidden3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/line.exp b/ld/testsuite/ld-x86-64/line.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/line.exp
rename to ld/testsuite/ld-x86-64/line.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed1a.s b/ld/testsuite/ld-x86-64/mixed1a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed1a.s
rename to ld/testsuite/ld-x86-64/mixed1a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed1b.s b/ld/testsuite/ld-x86-64/mixed1b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed1b.s
rename to ld/testsuite/ld-x86-64/mixed1b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed2a.s b/ld/testsuite/ld-x86-64/mixed2a.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed2a.s
rename to ld/testsuite/ld-x86-64/mixed2a.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed2b.s b/ld/testsuite/ld-x86-64/mixed2b.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/mixed2b.s
rename to ld/testsuite/ld-x86-64/mixed2b.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot1.d b/ld/testsuite/ld-x86-64/nogot1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot1.d
rename to ld/testsuite/ld-x86-64/nogot1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot1.s b/ld/testsuite/ld-x86-64/nogot1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot1.s
rename to ld/testsuite/ld-x86-64/nogot1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot2.d b/ld/testsuite/ld-x86-64/nogot2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot2.d
rename to ld/testsuite/ld-x86-64/nogot2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot2.s b/ld/testsuite/ld-x86-64/nogot2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/nogot2.s
rename to ld/testsuite/ld-x86-64/nogot2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/pcrel16.d b/ld/testsuite/ld-x86-64/pcrel16.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/pcrel16.d
rename to ld/testsuite/ld-x86-64/pcrel16.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/pcrel8.d b/ld/testsuite/ld-x86-64/pcrel8.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/pcrel8.d
rename to ld/testsuite/ld-x86-64/pcrel8.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected1.d b/ld/testsuite/ld-x86-64/protected1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected1.d
rename to ld/testsuite/ld-x86-64/protected1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected1.s b/ld/testsuite/ld-x86-64/protected1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected1.s
rename to ld/testsuite/ld-x86-64/protected1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected2-l1om.d b/ld/testsuite/ld-x86-64/protected2-l1om.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected2-l1om.d
rename to ld/testsuite/ld-x86-64/protected2-l1om.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected2.d b/ld/testsuite/ld-x86-64/protected2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected2.d
rename to ld/testsuite/ld-x86-64/protected2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected2.s b/ld/testsuite/ld-x86-64/protected2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected2.s
rename to ld/testsuite/ld-x86-64/protected2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected3-l1om.d b/ld/testsuite/ld-x86-64/protected3-l1om.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected3-l1om.d
rename to ld/testsuite/ld-x86-64/protected3-l1om.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected3.d b/ld/testsuite/ld-x86-64/protected3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected3.d
rename to ld/testsuite/ld-x86-64/protected3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected3.s b/ld/testsuite/ld-x86-64/protected3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/protected3.s
rename to ld/testsuite/ld-x86-64/protected3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/split-by-file.rd b/ld/testsuite/ld-x86-64/split-by-file.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/split-by-file.rd
rename to ld/testsuite/ld-x86-64/split-by-file.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/split-by-file1.s b/ld/testsuite/ld-x86-64/split-by-file1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/split-by-file1.s
rename to ld/testsuite/ld-x86-64/split-by-file1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/split-by-file2.s b/ld/testsuite/ld-x86-64/split-by-file2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/split-by-file2.s
rename to ld/testsuite/ld-x86-64/split-by-file2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.dd b/ld/testsuite/ld-x86-64/tlsbin.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.dd
rename to ld/testsuite/ld-x86-64/tlsbin.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.rd
rename to ld/testsuite/ld-x86-64/tlsbin.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.s b/ld/testsuite/ld-x86-64/tlsbin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.s
rename to ld/testsuite/ld-x86-64/tlsbin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.sd b/ld/testsuite/ld-x86-64/tlsbin.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.sd
rename to ld/testsuite/ld-x86-64/tlsbin.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.td b/ld/testsuite/ld-x86-64/tlsbin.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbin.td
rename to ld/testsuite/ld-x86-64/tlsbin.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.dd b/ld/testsuite/ld-x86-64/tlsbindesc.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.dd
rename to ld/testsuite/ld-x86-64/tlsbindesc.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.rd
rename to ld/testsuite/ld-x86-64/tlsbindesc.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.s b/ld/testsuite/ld-x86-64/tlsbindesc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.s
rename to ld/testsuite/ld-x86-64/tlsbindesc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.sd b/ld/testsuite/ld-x86-64/tlsbindesc.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.sd
rename to ld/testsuite/ld-x86-64/tlsbindesc.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.td b/ld/testsuite/ld-x86-64/tlsbindesc.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbindesc.td
rename to ld/testsuite/ld-x86-64/tlsbindesc.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbinpic.s b/ld/testsuite/ld-x86-64/tlsbinpic.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsbinpic.s
rename to ld/testsuite/ld-x86-64/tlsbinpic.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.dd b/ld/testsuite/ld-x86-64/tlsdesc.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.dd
rename to ld/testsuite/ld-x86-64/tlsdesc.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.pd b/ld/testsuite/ld-x86-64/tlsdesc.pd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.pd
rename to ld/testsuite/ld-x86-64/tlsdesc.pd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.rd b/ld/testsuite/ld-x86-64/tlsdesc.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.rd
rename to ld/testsuite/ld-x86-64/tlsdesc.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.s b/ld/testsuite/ld-x86-64/tlsdesc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.s
rename to ld/testsuite/ld-x86-64/tlsdesc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.sd b/ld/testsuite/ld-x86-64/tlsdesc.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.sd
rename to ld/testsuite/ld-x86-64/tlsdesc.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.td b/ld/testsuite/ld-x86-64/tlsdesc.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsdesc.td
rename to ld/testsuite/ld-x86-64/tlsdesc.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsg.s b/ld/testsuite/ld-x86-64/tlsg.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsg.s
rename to ld/testsuite/ld-x86-64/tlsg.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsg.sd b/ld/testsuite/ld-x86-64/tlsg.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsg.sd
rename to ld/testsuite/ld-x86-64/tlsg.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd1.dd b/ld/testsuite/ld-x86-64/tlsgd1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd1.dd
rename to ld/testsuite/ld-x86-64/tlsgd1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd1.s b/ld/testsuite/ld-x86-64/tlsgd1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd1.s
rename to ld/testsuite/ld-x86-64/tlsgd1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd2.d b/ld/testsuite/ld-x86-64/tlsgd2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd2.d
rename to ld/testsuite/ld-x86-64/tlsgd2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd2.s b/ld/testsuite/ld-x86-64/tlsgd2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd2.s
rename to ld/testsuite/ld-x86-64/tlsgd2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd3.d b/ld/testsuite/ld-x86-64/tlsgd3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd3.d
rename to ld/testsuite/ld-x86-64/tlsgd3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd3.s b/ld/testsuite/ld-x86-64/tlsgd3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgd3.s
rename to ld/testsuite/ld-x86-64/tlsgd3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgdesc.dd b/ld/testsuite/ld-x86-64/tlsgdesc.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgdesc.dd
rename to ld/testsuite/ld-x86-64/tlsgdesc.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgdesc.rd b/ld/testsuite/ld-x86-64/tlsgdesc.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgdesc.rd
rename to ld/testsuite/ld-x86-64/tlsgdesc.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgdesc.s b/ld/testsuite/ld-x86-64/tlsgdesc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsgdesc.s
rename to ld/testsuite/ld-x86-64/tlsgdesc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie1.dd b/ld/testsuite/ld-x86-64/tlsie1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie1.dd
rename to ld/testsuite/ld-x86-64/tlsie1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie1.s b/ld/testsuite/ld-x86-64/tlsie1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie1.s
rename to ld/testsuite/ld-x86-64/tlsie1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie2.d b/ld/testsuite/ld-x86-64/tlsie2.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie2.d
rename to ld/testsuite/ld-x86-64/tlsie2.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie2.s b/ld/testsuite/ld-x86-64/tlsie2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie2.s
rename to ld/testsuite/ld-x86-64/tlsie2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie3.d b/ld/testsuite/ld-x86-64/tlsie3.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie3.d
rename to ld/testsuite/ld-x86-64/tlsie3.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie3.s b/ld/testsuite/ld-x86-64/tlsie3.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsie3.s
rename to ld/testsuite/ld-x86-64/tlsie3.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsld1.dd b/ld/testsuite/ld-x86-64/tlsld1.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsld1.dd
rename to ld/testsuite/ld-x86-64/tlsld1.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsld1.s b/ld/testsuite/ld-x86-64/tlsld1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsld1.s
rename to ld/testsuite/ld-x86-64/tlsld1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsle1.d b/ld/testsuite/ld-x86-64/tlsle1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsle1.d
rename to ld/testsuite/ld-x86-64/tlsle1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsle1.s b/ld/testsuite/ld-x86-64/tlsle1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlsle1.s
rename to ld/testsuite/ld-x86-64/tlsle1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlslib.s b/ld/testsuite/ld-x86-64/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlslib.s
rename to ld/testsuite/ld-x86-64/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.dd b/ld/testsuite/ld-x86-64/tlspic.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.dd
rename to ld/testsuite/ld-x86-64/tlspic.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.rd
rename to ld/testsuite/ld-x86-64/tlspic.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.sd b/ld/testsuite/ld-x86-64/tlspic.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.sd
rename to ld/testsuite/ld-x86-64/tlspic.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.td b/ld/testsuite/ld-x86-64/tlspic.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic.td
rename to ld/testsuite/ld-x86-64/tlspic.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic1.s b/ld/testsuite/ld-x86-64/tlspic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic1.s
rename to ld/testsuite/ld-x86-64/tlspic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic2.s b/ld/testsuite/ld-x86-64/tlspic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspic2.s
rename to ld/testsuite/ld-x86-64/tlspic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspie1.d b/ld/testsuite/ld-x86-64/tlspie1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspie1.d
rename to ld/testsuite/ld-x86-64/tlspie1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspie1.s b/ld/testsuite/ld-x86-64/tlspie1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/tlspie1.s
rename to ld/testsuite/ld-x86-64/tlspie1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/undefined.s b/ld/testsuite/ld-x86-64/undefined.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/undefined.s
rename to ld/testsuite/ld-x86-64/undefined.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/unique1.d b/ld/testsuite/ld-x86-64/unique1.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/unique1.d
rename to ld/testsuite/ld-x86-64/unique1.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/unique1.s b/ld/testsuite/ld-x86-64/unique1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/unique1.s
rename to ld/testsuite/ld-x86-64/unique1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-x86-64/x86-64.exp
rename to ld/testsuite/ld-x86-64/x86-64.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/absrel.d b/ld/testsuite/ld-xc16x/absrel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/absrel.d
rename to ld/testsuite/ld-xc16x/absrel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/absrel.s b/ld/testsuite/ld-xc16x/absrel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/absrel.s
rename to ld/testsuite/ld-xc16x/absrel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/offset.d b/ld/testsuite/ld-xc16x/offset.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/offset.d
rename to ld/testsuite/ld-xc16x/offset.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/offset.s b/ld/testsuite/ld-xc16x/offset.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/offset.s
rename to ld/testsuite/ld-xc16x/offset.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/pcreloc.d b/ld/testsuite/ld-xc16x/pcreloc.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/pcreloc.d
rename to ld/testsuite/ld-xc16x/pcreloc.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/pcreloc.s b/ld/testsuite/ld-xc16x/pcreloc.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/pcreloc.s
rename to ld/testsuite/ld-xc16x/pcreloc.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/pcrelocl.d b/ld/testsuite/ld-xc16x/pcrelocl.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/pcrelocl.d
rename to ld/testsuite/ld-xc16x/pcrelocl.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xc16x/xc16x.exp b/ld/testsuite/ld-xc16x/xc16x.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xc16x/xc16x.exp
rename to ld/testsuite/ld-xc16x/xc16x.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xstormy16/external.s b/ld/testsuite/ld-xstormy16/external.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xstormy16/external.s
rename to ld/testsuite/ld-xstormy16/external.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xstormy16/pcrel.d b/ld/testsuite/ld-xstormy16/pcrel.d
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xstormy16/pcrel.d
rename to ld/testsuite/ld-xstormy16/pcrel.d
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xstormy16/pcrel.s b/ld/testsuite/ld-xstormy16/pcrel.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xstormy16/pcrel.s
rename to ld/testsuite/ld-xstormy16/pcrel.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xstormy16/xstormy16.exp b/ld/testsuite/ld-xstormy16/xstormy16.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xstormy16/xstormy16.exp
rename to ld/testsuite/ld-xstormy16/xstormy16.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce.exp b/ld/testsuite/ld-xtensa/coalesce.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce.exp
rename to ld/testsuite/ld-xtensa/coalesce.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce.t b/ld/testsuite/ld-xtensa/coalesce.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce.t
rename to ld/testsuite/ld-xtensa/coalesce.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce1.s b/ld/testsuite/ld-xtensa/coalesce1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce1.s
rename to ld/testsuite/ld-xtensa/coalesce1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce2.s b/ld/testsuite/ld-xtensa/coalesce2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/coalesce2.s
rename to ld/testsuite/ld-xtensa/coalesce2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall.exp b/ld/testsuite/ld-xtensa/lcall.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall.exp
rename to ld/testsuite/ld-xtensa/lcall.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall.t b/ld/testsuite/ld-xtensa/lcall.t
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall.t
rename to ld/testsuite/ld-xtensa/lcall.t
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall1.s b/ld/testsuite/ld-xtensa/lcall1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall1.s
rename to ld/testsuite/ld-xtensa/lcall1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall2.s b/ld/testsuite/ld-xtensa/lcall2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/lcall2.s
rename to ld/testsuite/ld-xtensa/lcall2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.dd b/ld/testsuite/ld-xtensa/tlsbin.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.dd
rename to ld/testsuite/ld-xtensa/tlsbin.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.rd b/ld/testsuite/ld-xtensa/tlsbin.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.rd
rename to ld/testsuite/ld-xtensa/tlsbin.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.s b/ld/testsuite/ld-xtensa/tlsbin.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.s
rename to ld/testsuite/ld-xtensa/tlsbin.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.sd b/ld/testsuite/ld-xtensa/tlsbin.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.sd
rename to ld/testsuite/ld-xtensa/tlsbin.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.td b/ld/testsuite/ld-xtensa/tlsbin.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlsbin.td
rename to ld/testsuite/ld-xtensa/tlsbin.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlslib.s b/ld/testsuite/ld-xtensa/tlslib.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlslib.s
rename to ld/testsuite/ld-xtensa/tlslib.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.dd b/ld/testsuite/ld-xtensa/tlspic.dd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.dd
rename to ld/testsuite/ld-xtensa/tlspic.dd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.rd b/ld/testsuite/ld-xtensa/tlspic.rd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.rd
rename to ld/testsuite/ld-xtensa/tlspic.rd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.sd b/ld/testsuite/ld-xtensa/tlspic.sd
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.sd
rename to ld/testsuite/ld-xtensa/tlspic.sd
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.td b/ld/testsuite/ld-xtensa/tlspic.td
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic.td
rename to ld/testsuite/ld-xtensa/tlspic.td
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic1.s b/ld/testsuite/ld-xtensa/tlspic1.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic1.s
rename to ld/testsuite/ld-xtensa/tlspic1.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic2.s b/ld/testsuite/ld-xtensa/tlspic2.s
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/tlspic2.s
rename to ld/testsuite/ld-xtensa/tlspic2.s
diff --git a/binutils/binutils-2.21/ld/testsuite/ld-xtensa/xtensa.exp b/ld/testsuite/ld-xtensa/xtensa.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/ld-xtensa/xtensa.exp
rename to ld/testsuite/ld-xtensa/xtensa.exp
diff --git a/binutils/binutils-2.21/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
similarity index 100%
rename from binutils/binutils-2.21/ld/testsuite/lib/ld-lib.exp
rename to ld/testsuite/lib/ld-lib.exp
diff --git a/binutils/binutils-2.21/libiberty/COPYING.LIB b/libiberty/COPYING.LIB
similarity index 100%
rename from binutils/binutils-2.21/libiberty/COPYING.LIB
rename to libiberty/COPYING.LIB
diff --git a/binutils/binutils-2.21/libiberty/ChangeLog b/libiberty/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/libiberty/ChangeLog
rename to libiberty/ChangeLog
diff --git a/binutils/binutils-2.21/libiberty/Makefile.in b/libiberty/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/libiberty/Makefile.in
rename to libiberty/Makefile.in
diff --git a/binutils/binutils-2.21/libiberty/README b/libiberty/README
similarity index 100%
rename from binutils/binutils-2.21/libiberty/README
rename to libiberty/README
diff --git a/binutils/binutils-2.21/libiberty/_doprnt.c b/libiberty/_doprnt.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/_doprnt.c
rename to libiberty/_doprnt.c
diff --git a/binutils/binutils-2.21/libiberty/aclocal.m4 b/libiberty/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/libiberty/aclocal.m4
rename to libiberty/aclocal.m4
diff --git a/binutils/binutils-2.21/libiberty/alloca.c b/libiberty/alloca.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/alloca.c
rename to libiberty/alloca.c
diff --git a/binutils/binutils-2.21/libiberty/argv.c b/libiberty/argv.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/argv.c
rename to libiberty/argv.c
diff --git a/binutils/binutils-2.21/libiberty/asprintf.c b/libiberty/asprintf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/asprintf.c
rename to libiberty/asprintf.c
diff --git a/binutils/binutils-2.21/libiberty/at-file.texi b/libiberty/at-file.texi
similarity index 100%
rename from binutils/binutils-2.21/libiberty/at-file.texi
rename to libiberty/at-file.texi
diff --git a/binutils/binutils-2.21/libiberty/atexit.c b/libiberty/atexit.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/atexit.c
rename to libiberty/atexit.c
diff --git a/binutils/binutils-2.21/libiberty/basename.c b/libiberty/basename.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/basename.c
rename to libiberty/basename.c
diff --git a/binutils/binutils-2.21/libiberty/bcmp.c b/libiberty/bcmp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/bcmp.c
rename to libiberty/bcmp.c
diff --git a/binutils/binutils-2.21/libiberty/bcopy.c b/libiberty/bcopy.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/bcopy.c
rename to libiberty/bcopy.c
diff --git a/binutils/binutils-2.21/libiberty/bsearch.c b/libiberty/bsearch.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/bsearch.c
rename to libiberty/bsearch.c
diff --git a/binutils/binutils-2.21/libiberty/bzero.c b/libiberty/bzero.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/bzero.c
rename to libiberty/bzero.c
diff --git a/binutils/binutils-2.21/libiberty/calloc.c b/libiberty/calloc.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/calloc.c
rename to libiberty/calloc.c
diff --git a/binutils/binutils-2.21/libiberty/choose-temp.c b/libiberty/choose-temp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/choose-temp.c
rename to libiberty/choose-temp.c
diff --git a/binutils/binutils-2.21/libiberty/clock.c b/libiberty/clock.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/clock.c
rename to libiberty/clock.c
diff --git a/binutils/binutils-2.21/libiberty/concat.c b/libiberty/concat.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/concat.c
rename to libiberty/concat.c
diff --git a/binutils/binutils-2.21/libiberty/config.h-vms b/libiberty/config.h-vms
similarity index 100%
rename from binutils/binutils-2.21/libiberty/config.h-vms
rename to libiberty/config.h-vms
diff --git a/binutils/binutils-2.21/libiberty/config.in b/libiberty/config.in
similarity index 100%
rename from binutils/binutils-2.21/libiberty/config.in
rename to libiberty/config.in
diff --git a/binutils/binutils-2.21/libiberty/config/mh-aix b/libiberty/config/mh-aix
similarity index 100%
rename from binutils/binutils-2.21/libiberty/config/mh-aix
rename to libiberty/config/mh-aix
diff --git a/binutils/binutils-2.21/libiberty/config/mh-cxux7 b/libiberty/config/mh-cxux7
similarity index 100%
rename from binutils/binutils-2.21/libiberty/config/mh-cxux7
rename to libiberty/config/mh-cxux7
diff --git a/binutils/binutils-2.21/libiberty/config/mh-fbsd21 b/libiberty/config/mh-fbsd21
similarity index 100%
rename from binutils/binutils-2.21/libiberty/config/mh-fbsd21
rename to libiberty/config/mh-fbsd21
diff --git a/binutils/binutils-2.21/libiberty/config/mh-openedition b/libiberty/config/mh-openedition
similarity index 100%
rename from binutils/binutils-2.21/libiberty/config/mh-openedition
rename to libiberty/config/mh-openedition
diff --git a/binutils/binutils-2.21/libiberty/config/mh-windows b/libiberty/config/mh-windows
similarity index 100%
rename from binutils/binutils-2.21/libiberty/config/mh-windows
rename to libiberty/config/mh-windows
diff --git a/binutils/binutils-2.21/libiberty/configure b/libiberty/configure
similarity index 100%
rename from binutils/binutils-2.21/libiberty/configure
rename to libiberty/configure
diff --git a/binutils/binutils-2.21/libiberty/configure.ac b/libiberty/configure.ac
similarity index 100%
rename from binutils/binutils-2.21/libiberty/configure.ac
rename to libiberty/configure.ac
diff --git a/binutils/binutils-2.21/libiberty/configure.com b/libiberty/configure.com
similarity index 100%
rename from binutils/binutils-2.21/libiberty/configure.com
rename to libiberty/configure.com
diff --git a/binutils/binutils-2.21/libiberty/copying-lib.texi b/libiberty/copying-lib.texi
similarity index 100%
rename from binutils/binutils-2.21/libiberty/copying-lib.texi
rename to libiberty/copying-lib.texi
diff --git a/binutils/binutils-2.21/libiberty/copysign.c b/libiberty/copysign.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/copysign.c
rename to libiberty/copysign.c
diff --git a/binutils/binutils-2.21/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/cp-demangle.c
rename to libiberty/cp-demangle.c
diff --git a/binutils/binutils-2.21/libiberty/cp-demangle.h b/libiberty/cp-demangle.h
similarity index 100%
rename from binutils/binutils-2.21/libiberty/cp-demangle.h
rename to libiberty/cp-demangle.h
diff --git a/binutils/binutils-2.21/libiberty/cp-demint.c b/libiberty/cp-demint.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/cp-demint.c
rename to libiberty/cp-demint.c
diff --git a/binutils/binutils-2.21/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/cplus-dem.c
rename to libiberty/cplus-dem.c
diff --git a/binutils/binutils-2.21/libiberty/crc32.c b/libiberty/crc32.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/crc32.c
rename to libiberty/crc32.c
diff --git a/binutils/binutils-2.21/libiberty/dyn-string.c b/libiberty/dyn-string.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/dyn-string.c
rename to libiberty/dyn-string.c
diff --git a/binutils/binutils-2.21/libiberty/fdmatch.c b/libiberty/fdmatch.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/fdmatch.c
rename to libiberty/fdmatch.c
diff --git a/binutils/binutils-2.21/libiberty/ffs.c b/libiberty/ffs.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/ffs.c
rename to libiberty/ffs.c
diff --git a/binutils/binutils-2.21/libiberty/fibheap.c b/libiberty/fibheap.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/fibheap.c
rename to libiberty/fibheap.c
diff --git a/binutils/binutils-2.21/libiberty/filename_cmp.c b/libiberty/filename_cmp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/filename_cmp.c
rename to libiberty/filename_cmp.c
diff --git a/binutils/binutils-2.21/libiberty/floatformat.c b/libiberty/floatformat.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/floatformat.c
rename to libiberty/floatformat.c
diff --git a/binutils/binutils-2.21/libiberty/fnmatch.c b/libiberty/fnmatch.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/fnmatch.c
rename to libiberty/fnmatch.c
diff --git a/binutils/binutils-2.21/libiberty/fnmatch.txh b/libiberty/fnmatch.txh
similarity index 100%
rename from binutils/binutils-2.21/libiberty/fnmatch.txh
rename to libiberty/fnmatch.txh
diff --git a/binutils/binutils-2.21/libiberty/fopen_unlocked.c b/libiberty/fopen_unlocked.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/fopen_unlocked.c
rename to libiberty/fopen_unlocked.c
diff --git a/binutils/binutils-2.21/libiberty/functions.texi b/libiberty/functions.texi
similarity index 100%
rename from binutils/binutils-2.21/libiberty/functions.texi
rename to libiberty/functions.texi
diff --git a/binutils/binutils-2.21/libiberty/gather-docs b/libiberty/gather-docs
similarity index 100%
rename from binutils/binutils-2.21/libiberty/gather-docs
rename to libiberty/gather-docs
diff --git a/binutils/binutils-2.21/libiberty/getcwd.c b/libiberty/getcwd.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/getcwd.c
rename to libiberty/getcwd.c
diff --git a/binutils/binutils-2.21/libiberty/getopt.c b/libiberty/getopt.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/getopt.c
rename to libiberty/getopt.c
diff --git a/binutils/binutils-2.21/libiberty/getopt1.c b/libiberty/getopt1.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/getopt1.c
rename to libiberty/getopt1.c
diff --git a/binutils/binutils-2.21/libiberty/getpagesize.c b/libiberty/getpagesize.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/getpagesize.c
rename to libiberty/getpagesize.c
diff --git a/binutils/binutils-2.21/libiberty/getpwd.c b/libiberty/getpwd.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/getpwd.c
rename to libiberty/getpwd.c
diff --git a/binutils/binutils-2.21/libiberty/getruntime.c b/libiberty/getruntime.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/getruntime.c
rename to libiberty/getruntime.c
diff --git a/binutils/binutils-2.21/libiberty/gettimeofday.c b/libiberty/gettimeofday.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/gettimeofday.c
rename to libiberty/gettimeofday.c
diff --git a/binutils/binutils-2.21/libiberty/hashtab.c b/libiberty/hashtab.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/hashtab.c
rename to libiberty/hashtab.c
diff --git a/binutils/binutils-2.21/libiberty/hex.c b/libiberty/hex.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/hex.c
rename to libiberty/hex.c
diff --git a/binutils/binutils-2.21/libiberty/index.c b/libiberty/index.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/index.c
rename to libiberty/index.c
diff --git a/binutils/binutils-2.21/libiberty/insque.c b/libiberty/insque.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/insque.c
rename to libiberty/insque.c
diff --git a/binutils/binutils-2.21/libiberty/lbasename.c b/libiberty/lbasename.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/lbasename.c
rename to libiberty/lbasename.c
diff --git a/binutils/binutils-2.21/libiberty/libiberty.texi b/libiberty/libiberty.texi
similarity index 100%
rename from binutils/binutils-2.21/libiberty/libiberty.texi
rename to libiberty/libiberty.texi
diff --git a/binutils/binutils-2.21/libiberty/lrealpath.c b/libiberty/lrealpath.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/lrealpath.c
rename to libiberty/lrealpath.c
diff --git a/binutils/binutils-2.21/libiberty/maint-tool b/libiberty/maint-tool
similarity index 100%
rename from binutils/binutils-2.21/libiberty/maint-tool
rename to libiberty/maint-tool
diff --git a/binutils/binutils-2.21/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/make-relative-prefix.c
rename to libiberty/make-relative-prefix.c
diff --git a/binutils/binutils-2.21/libiberty/make-temp-file.c b/libiberty/make-temp-file.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/make-temp-file.c
rename to libiberty/make-temp-file.c
diff --git a/binutils/binutils-2.21/libiberty/makefile.vms b/libiberty/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/libiberty/makefile.vms
rename to libiberty/makefile.vms
diff --git a/binutils/binutils-2.21/libiberty/md5.c b/libiberty/md5.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/md5.c
rename to libiberty/md5.c
diff --git a/binutils/binutils-2.21/libiberty/memchr.c b/libiberty/memchr.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/memchr.c
rename to libiberty/memchr.c
diff --git a/binutils/binutils-2.21/libiberty/memcmp.c b/libiberty/memcmp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/memcmp.c
rename to libiberty/memcmp.c
diff --git a/binutils/binutils-2.21/libiberty/memcpy.c b/libiberty/memcpy.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/memcpy.c
rename to libiberty/memcpy.c
diff --git a/binutils/binutils-2.21/libiberty/memmem.c b/libiberty/memmem.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/memmem.c
rename to libiberty/memmem.c
diff --git a/binutils/binutils-2.21/libiberty/memmove.c b/libiberty/memmove.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/memmove.c
rename to libiberty/memmove.c
diff --git a/binutils/binutils-2.21/libiberty/mempcpy.c b/libiberty/mempcpy.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/mempcpy.c
rename to libiberty/mempcpy.c
diff --git a/binutils/binutils-2.21/libiberty/memset.c b/libiberty/memset.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/memset.c
rename to libiberty/memset.c
diff --git a/binutils/binutils-2.21/libiberty/mkstemps.c b/libiberty/mkstemps.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/mkstemps.c
rename to libiberty/mkstemps.c
diff --git a/binutils/binutils-2.21/libiberty/msdos.c b/libiberty/msdos.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/msdos.c
rename to libiberty/msdos.c
diff --git a/binutils/binutils-2.21/libiberty/objalloc.c b/libiberty/objalloc.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/objalloc.c
rename to libiberty/objalloc.c
diff --git a/binutils/binutils-2.21/libiberty/obstack.c b/libiberty/obstack.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/obstack.c
rename to libiberty/obstack.c
diff --git a/binutils/binutils-2.21/libiberty/obstacks.texi b/libiberty/obstacks.texi
similarity index 100%
rename from binutils/binutils-2.21/libiberty/obstacks.texi
rename to libiberty/obstacks.texi
diff --git a/binutils/binutils-2.21/libiberty/partition.c b/libiberty/partition.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/partition.c
rename to libiberty/partition.c
diff --git a/binutils/binutils-2.21/libiberty/pex-common.c b/libiberty/pex-common.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pex-common.c
rename to libiberty/pex-common.c
diff --git a/binutils/binutils-2.21/libiberty/pex-common.h b/libiberty/pex-common.h
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pex-common.h
rename to libiberty/pex-common.h
diff --git a/binutils/binutils-2.21/libiberty/pex-djgpp.c b/libiberty/pex-djgpp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pex-djgpp.c
rename to libiberty/pex-djgpp.c
diff --git a/binutils/binutils-2.21/libiberty/pex-msdos.c b/libiberty/pex-msdos.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pex-msdos.c
rename to libiberty/pex-msdos.c
diff --git a/binutils/binutils-2.21/libiberty/pex-one.c b/libiberty/pex-one.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pex-one.c
rename to libiberty/pex-one.c
diff --git a/binutils/binutils-2.21/libiberty/pex-unix.c b/libiberty/pex-unix.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pex-unix.c
rename to libiberty/pex-unix.c
diff --git a/binutils/binutils-2.21/libiberty/pex-win32.c b/libiberty/pex-win32.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pex-win32.c
rename to libiberty/pex-win32.c
diff --git a/binutils/binutils-2.21/libiberty/pexecute.c b/libiberty/pexecute.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pexecute.c
rename to libiberty/pexecute.c
diff --git a/binutils/binutils-2.21/libiberty/pexecute.txh b/libiberty/pexecute.txh
similarity index 100%
rename from binutils/binutils-2.21/libiberty/pexecute.txh
rename to libiberty/pexecute.txh
diff --git a/binutils/binutils-2.21/libiberty/physmem.c b/libiberty/physmem.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/physmem.c
rename to libiberty/physmem.c
diff --git a/binutils/binutils-2.21/libiberty/putenv.c b/libiberty/putenv.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/putenv.c
rename to libiberty/putenv.c
diff --git a/binutils/binutils-2.21/libiberty/random.c b/libiberty/random.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/random.c
rename to libiberty/random.c
diff --git a/binutils/binutils-2.21/libiberty/regex.c b/libiberty/regex.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/regex.c
rename to libiberty/regex.c
diff --git a/binutils/binutils-2.21/libiberty/rename.c b/libiberty/rename.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/rename.c
rename to libiberty/rename.c
diff --git a/binutils/binutils-2.21/libiberty/rindex.c b/libiberty/rindex.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/rindex.c
rename to libiberty/rindex.c
diff --git a/binutils/binutils-2.21/libiberty/safe-ctype.c b/libiberty/safe-ctype.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/safe-ctype.c
rename to libiberty/safe-ctype.c
diff --git a/binutils/binutils-2.21/libiberty/setenv.c b/libiberty/setenv.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/setenv.c
rename to libiberty/setenv.c
diff --git a/binutils/binutils-2.21/libiberty/setproctitle.c b/libiberty/setproctitle.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/setproctitle.c
rename to libiberty/setproctitle.c
diff --git a/binutils/binutils-2.21/libiberty/sha1.c b/libiberty/sha1.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/sha1.c
rename to libiberty/sha1.c
diff --git a/binutils/binutils-2.21/libiberty/sigsetmask.c b/libiberty/sigsetmask.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/sigsetmask.c
rename to libiberty/sigsetmask.c
diff --git a/binutils/binutils-2.21/libiberty/simple-object-coff.c b/libiberty/simple-object-coff.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/simple-object-coff.c
rename to libiberty/simple-object-coff.c
diff --git a/binutils/binutils-2.21/libiberty/simple-object-common.h b/libiberty/simple-object-common.h
similarity index 100%
rename from binutils/binutils-2.21/libiberty/simple-object-common.h
rename to libiberty/simple-object-common.h
diff --git a/binutils/binutils-2.21/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/simple-object-elf.c
rename to libiberty/simple-object-elf.c
diff --git a/binutils/binutils-2.21/libiberty/simple-object-mach-o.c b/libiberty/simple-object-mach-o.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/simple-object-mach-o.c
rename to libiberty/simple-object-mach-o.c
diff --git a/binutils/binutils-2.21/libiberty/simple-object.c b/libiberty/simple-object.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/simple-object.c
rename to libiberty/simple-object.c
diff --git a/binutils/binutils-2.21/libiberty/simple-object.txh b/libiberty/simple-object.txh
similarity index 100%
rename from binutils/binutils-2.21/libiberty/simple-object.txh
rename to libiberty/simple-object.txh
diff --git a/binutils/binutils-2.21/libiberty/snprintf.c b/libiberty/snprintf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/snprintf.c
rename to libiberty/snprintf.c
diff --git a/binutils/binutils-2.21/libiberty/sort.c b/libiberty/sort.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/sort.c
rename to libiberty/sort.c
diff --git a/binutils/binutils-2.21/libiberty/spaces.c b/libiberty/spaces.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/spaces.c
rename to libiberty/spaces.c
diff --git a/binutils/binutils-2.21/libiberty/splay-tree.c b/libiberty/splay-tree.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/splay-tree.c
rename to libiberty/splay-tree.c
diff --git a/binutils/binutils-2.21/libiberty/stpcpy.c b/libiberty/stpcpy.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/stpcpy.c
rename to libiberty/stpcpy.c
diff --git a/binutils/binutils-2.21/libiberty/stpncpy.c b/libiberty/stpncpy.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/stpncpy.c
rename to libiberty/stpncpy.c
diff --git a/binutils/binutils-2.21/libiberty/strcasecmp.c b/libiberty/strcasecmp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strcasecmp.c
rename to libiberty/strcasecmp.c
diff --git a/binutils/binutils-2.21/libiberty/strchr.c b/libiberty/strchr.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strchr.c
rename to libiberty/strchr.c
diff --git a/binutils/binutils-2.21/libiberty/strdup.c b/libiberty/strdup.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strdup.c
rename to libiberty/strdup.c
diff --git a/binutils/binutils-2.21/libiberty/strerror.c b/libiberty/strerror.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strerror.c
rename to libiberty/strerror.c
diff --git a/binutils/binutils-2.21/libiberty/strncasecmp.c b/libiberty/strncasecmp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strncasecmp.c
rename to libiberty/strncasecmp.c
diff --git a/binutils/binutils-2.21/libiberty/strncmp.c b/libiberty/strncmp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strncmp.c
rename to libiberty/strncmp.c
diff --git a/binutils/binutils-2.21/libiberty/strndup.c b/libiberty/strndup.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strndup.c
rename to libiberty/strndup.c
diff --git a/binutils/binutils-2.21/libiberty/strrchr.c b/libiberty/strrchr.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strrchr.c
rename to libiberty/strrchr.c
diff --git a/binutils/binutils-2.21/libiberty/strsignal.c b/libiberty/strsignal.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strsignal.c
rename to libiberty/strsignal.c
diff --git a/binutils/binutils-2.21/libiberty/strstr.c b/libiberty/strstr.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strstr.c
rename to libiberty/strstr.c
diff --git a/binutils/binutils-2.21/libiberty/strtod.c b/libiberty/strtod.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strtod.c
rename to libiberty/strtod.c
diff --git a/binutils/binutils-2.21/libiberty/strtol.c b/libiberty/strtol.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strtol.c
rename to libiberty/strtol.c
diff --git a/binutils/binutils-2.21/libiberty/strtoul.c b/libiberty/strtoul.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strtoul.c
rename to libiberty/strtoul.c
diff --git a/binutils/binutils-2.21/libiberty/strverscmp.c b/libiberty/strverscmp.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/strverscmp.c
rename to libiberty/strverscmp.c
diff --git a/binutils/binutils-2.21/libiberty/testsuite/Makefile.in b/libiberty/testsuite/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/libiberty/testsuite/Makefile.in
rename to libiberty/testsuite/Makefile.in
diff --git a/binutils/binutils-2.21/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
similarity index 100%
rename from binutils/binutils-2.21/libiberty/testsuite/demangle-expected
rename to libiberty/testsuite/demangle-expected
diff --git a/binutils/binutils-2.21/libiberty/testsuite/test-demangle.c b/libiberty/testsuite/test-demangle.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/testsuite/test-demangle.c
rename to libiberty/testsuite/test-demangle.c
diff --git a/binutils/binutils-2.21/libiberty/testsuite/test-expandargv.c b/libiberty/testsuite/test-expandargv.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/testsuite/test-expandargv.c
rename to libiberty/testsuite/test-expandargv.c
diff --git a/binutils/binutils-2.21/libiberty/testsuite/test-pexecute.c b/libiberty/testsuite/test-pexecute.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/testsuite/test-pexecute.c
rename to libiberty/testsuite/test-pexecute.c
diff --git a/binutils/binutils-2.21/libiberty/tmpnam.c b/libiberty/tmpnam.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/tmpnam.c
rename to libiberty/tmpnam.c
diff --git a/binutils/binutils-2.21/libiberty/unlink-if-ordinary.c b/libiberty/unlink-if-ordinary.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/unlink-if-ordinary.c
rename to libiberty/unlink-if-ordinary.c
diff --git a/binutils/binutils-2.21/libiberty/vasprintf.c b/libiberty/vasprintf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/vasprintf.c
rename to libiberty/vasprintf.c
diff --git a/binutils/binutils-2.21/libiberty/vfork.c b/libiberty/vfork.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/vfork.c
rename to libiberty/vfork.c
diff --git a/binutils/binutils-2.21/libiberty/vfprintf.c b/libiberty/vfprintf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/vfprintf.c
rename to libiberty/vfprintf.c
diff --git a/binutils/binutils-2.21/libiberty/vprintf.c b/libiberty/vprintf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/vprintf.c
rename to libiberty/vprintf.c
diff --git a/binutils/binutils-2.21/libiberty/vsnprintf.c b/libiberty/vsnprintf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/vsnprintf.c
rename to libiberty/vsnprintf.c
diff --git a/binutils/binutils-2.21/libiberty/vsprintf.c b/libiberty/vsprintf.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/vsprintf.c
rename to libiberty/vsprintf.c
diff --git a/binutils/binutils-2.21/libiberty/waitpid.c b/libiberty/waitpid.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/waitpid.c
rename to libiberty/waitpid.c
diff --git a/binutils/binutils-2.21/libiberty/xatexit.c b/libiberty/xatexit.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/xatexit.c
rename to libiberty/xatexit.c
diff --git a/binutils/binutils-2.21/libiberty/xexit.c b/libiberty/xexit.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/xexit.c
rename to libiberty/xexit.c
diff --git a/binutils/binutils-2.21/libiberty/xmalloc.c b/libiberty/xmalloc.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/xmalloc.c
rename to libiberty/xmalloc.c
diff --git a/binutils/binutils-2.21/libiberty/xmemdup.c b/libiberty/xmemdup.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/xmemdup.c
rename to libiberty/xmemdup.c
diff --git a/binutils/binutils-2.21/libiberty/xstrdup.c b/libiberty/xstrdup.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/xstrdup.c
rename to libiberty/xstrdup.c
diff --git a/binutils/binutils-2.21/libiberty/xstrerror.c b/libiberty/xstrerror.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/xstrerror.c
rename to libiberty/xstrerror.c
diff --git a/binutils/binutils-2.21/libiberty/xstrndup.c b/libiberty/xstrndup.c
similarity index 100%
rename from binutils/binutils-2.21/libiberty/xstrndup.c
rename to libiberty/xstrndup.c
diff --git a/binutils/binutils-2.21/libtool.m4 b/libtool.m4
similarity index 100%
rename from binutils/binutils-2.21/libtool.m4
rename to libtool.m4
diff --git a/binutils/binutils-2.21/ltgcc.m4 b/ltgcc.m4
similarity index 100%
rename from binutils/binutils-2.21/ltgcc.m4
rename to ltgcc.m4
diff --git a/binutils/binutils-2.21/ltmain.sh b/ltmain.sh
similarity index 100%
rename from binutils/binutils-2.21/ltmain.sh
rename to ltmain.sh
diff --git a/binutils/binutils-2.21/ltoptions.m4 b/ltoptions.m4
similarity index 100%
rename from binutils/binutils-2.21/ltoptions.m4
rename to ltoptions.m4
diff --git a/binutils/binutils-2.21/ltsugar.m4 b/ltsugar.m4
similarity index 100%
rename from binutils/binutils-2.21/ltsugar.m4
rename to ltsugar.m4
diff --git a/binutils/binutils-2.21/ltversion.m4 b/ltversion.m4
similarity index 100%
rename from binutils/binutils-2.21/ltversion.m4
rename to ltversion.m4
diff --git a/binutils/binutils-2.21/lt~obsolete.m4 b/lt~obsolete.m4
similarity index 100%
rename from binutils/binutils-2.21/lt~obsolete.m4
rename to lt~obsolete.m4
diff --git a/binutils/binutils-2.21/makefile.vms b/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/makefile.vms
rename to makefile.vms
diff --git a/binutils/binutils-2.21/md5.sum b/md5.sum
similarity index 100%
rename from binutils/binutils-2.21/md5.sum
rename to md5.sum
diff --git a/binutils/binutils-2.21/missing b/missing
similarity index 100%
rename from binutils/binutils-2.21/missing
rename to missing
diff --git a/binutils/binutils-2.21/mkdep b/mkdep
similarity index 100%
rename from binutils/binutils-2.21/mkdep
rename to mkdep
diff --git a/binutils/binutils-2.21/mkinstalldirs b/mkinstalldirs
similarity index 100%
rename from binutils/binutils-2.21/mkinstalldirs
rename to mkinstalldirs
diff --git a/binutils/binutils-2.21/move-if-change b/move-if-change
similarity index 100%
rename from binutils/binutils-2.21/move-if-change
rename to move-if-change
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog b/opcodes/ChangeLog
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog
rename to opcodes/ChangeLog
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-0001 b/opcodes/ChangeLog-0001
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-0001
rename to opcodes/ChangeLog-0001
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-0203 b/opcodes/ChangeLog-0203
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-0203
rename to opcodes/ChangeLog-0203
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-2004 b/opcodes/ChangeLog-2004
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-2004
rename to opcodes/ChangeLog-2004
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-2005 b/opcodes/ChangeLog-2005
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-2005
rename to opcodes/ChangeLog-2005
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-2006 b/opcodes/ChangeLog-2006
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-2006
rename to opcodes/ChangeLog-2006
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-2007 b/opcodes/ChangeLog-2007
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-2007
rename to opcodes/ChangeLog-2007
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-2008 b/opcodes/ChangeLog-2008
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-2008
rename to opcodes/ChangeLog-2008
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-2009 b/opcodes/ChangeLog-2009
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-2009
rename to opcodes/ChangeLog-2009
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-9297 b/opcodes/ChangeLog-9297
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-9297
rename to opcodes/ChangeLog-9297
diff --git a/binutils/binutils-2.21/opcodes/ChangeLog-9899 b/opcodes/ChangeLog-9899
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ChangeLog-9899
rename to opcodes/ChangeLog-9899
diff --git a/binutils/binutils-2.21/opcodes/MAINTAINERS b/opcodes/MAINTAINERS
similarity index 100%
rename from binutils/binutils-2.21/opcodes/MAINTAINERS
rename to opcodes/MAINTAINERS
diff --git a/binutils/binutils-2.21/opcodes/Makefile.am b/opcodes/Makefile.am
similarity index 100%
rename from binutils/binutils-2.21/opcodes/Makefile.am
rename to opcodes/Makefile.am
diff --git a/binutils/binutils-2.21/opcodes/Makefile.in b/opcodes/Makefile.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/Makefile.in
rename to opcodes/Makefile.in
diff --git a/binutils/binutils-2.21/opcodes/aclocal.m4 b/opcodes/aclocal.m4
similarity index 100%
rename from binutils/binutils-2.21/opcodes/aclocal.m4
rename to opcodes/aclocal.m4
diff --git a/binutils/binutils-2.21/opcodes/alpha-dis.c b/opcodes/alpha-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/alpha-dis.c
rename to opcodes/alpha-dis.c
diff --git a/binutils/binutils-2.21/opcodes/alpha-opc.c b/opcodes/alpha-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/alpha-opc.c
rename to opcodes/alpha-opc.c
diff --git a/binutils/binutils-2.21/opcodes/arc-dis.c b/opcodes/arc-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/arc-dis.c
rename to opcodes/arc-dis.c
diff --git a/binutils/binutils-2.21/opcodes/arc-dis.h b/opcodes/arc-dis.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/arc-dis.h
rename to opcodes/arc-dis.h
diff --git a/binutils/binutils-2.21/opcodes/arc-ext.c b/opcodes/arc-ext.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/arc-ext.c
rename to opcodes/arc-ext.c
diff --git a/binutils/binutils-2.21/opcodes/arc-ext.h b/opcodes/arc-ext.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/arc-ext.h
rename to opcodes/arc-ext.h
diff --git a/binutils/binutils-2.21/opcodes/arc-opc.c b/opcodes/arc-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/arc-opc.c
rename to opcodes/arc-opc.c
diff --git a/binutils/binutils-2.21/opcodes/arm-dis.c b/opcodes/arm-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/arm-dis.c
rename to opcodes/arm-dis.c
diff --git a/binutils/binutils-2.21/opcodes/avr-dis.c b/opcodes/avr-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/avr-dis.c
rename to opcodes/avr-dis.c
diff --git a/binutils/binutils-2.21/opcodes/bfin-dis.c b/opcodes/bfin-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/bfin-dis.c
rename to opcodes/bfin-dis.c
diff --git a/binutils/binutils-2.21/opcodes/cgen-asm.c b/opcodes/cgen-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen-asm.c
rename to opcodes/cgen-asm.c
diff --git a/binutils/binutils-2.21/opcodes/cgen-asm.in b/opcodes/cgen-asm.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen-asm.in
rename to opcodes/cgen-asm.in
diff --git a/binutils/binutils-2.21/opcodes/cgen-bitset.c b/opcodes/cgen-bitset.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen-bitset.c
rename to opcodes/cgen-bitset.c
diff --git a/binutils/binutils-2.21/opcodes/cgen-dis.c b/opcodes/cgen-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen-dis.c
rename to opcodes/cgen-dis.c
diff --git a/binutils/binutils-2.21/opcodes/cgen-dis.in b/opcodes/cgen-dis.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen-dis.in
rename to opcodes/cgen-dis.in
diff --git a/binutils/binutils-2.21/opcodes/cgen-ibld.in b/opcodes/cgen-ibld.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen-ibld.in
rename to opcodes/cgen-ibld.in
diff --git a/binutils/binutils-2.21/opcodes/cgen-opc.c b/opcodes/cgen-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen-opc.c
rename to opcodes/cgen-opc.c
diff --git a/binutils/binutils-2.21/opcodes/cgen.sh b/opcodes/cgen.sh
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cgen.sh
rename to opcodes/cgen.sh
diff --git a/binutils/binutils-2.21/opcodes/config.in b/opcodes/config.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/config.in
rename to opcodes/config.in
diff --git a/binutils/binutils-2.21/opcodes/configure b/opcodes/configure
similarity index 100%
rename from binutils/binutils-2.21/opcodes/configure
rename to opcodes/configure
diff --git a/binutils/binutils-2.21/opcodes/configure.com b/opcodes/configure.com
similarity index 100%
rename from binutils/binutils-2.21/opcodes/configure.com
rename to opcodes/configure.com
diff --git a/binutils/binutils-2.21/opcodes/configure.in b/opcodes/configure.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/configure.in
rename to opcodes/configure.in
diff --git a/binutils/binutils-2.21/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cr16-dis.c
rename to opcodes/cr16-dis.c
diff --git a/binutils/binutils-2.21/opcodes/cr16-opc.c b/opcodes/cr16-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cr16-opc.c
rename to opcodes/cr16-opc.c
diff --git a/binutils/binutils-2.21/opcodes/cris-dis.c b/opcodes/cris-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cris-dis.c
rename to opcodes/cris-dis.c
diff --git a/binutils/binutils-2.21/opcodes/cris-opc.c b/opcodes/cris-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/cris-opc.c
rename to opcodes/cris-opc.c
diff --git a/binutils/binutils-2.21/opcodes/crx-dis.c b/opcodes/crx-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/crx-dis.c
rename to opcodes/crx-dis.c
diff --git a/binutils/binutils-2.21/opcodes/crx-opc.c b/opcodes/crx-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/crx-opc.c
rename to opcodes/crx-opc.c
diff --git a/binutils/binutils-2.21/opcodes/d10v-dis.c b/opcodes/d10v-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/d10v-dis.c
rename to opcodes/d10v-dis.c
diff --git a/binutils/binutils-2.21/opcodes/d10v-opc.c b/opcodes/d10v-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/d10v-opc.c
rename to opcodes/d10v-opc.c
diff --git a/binutils/binutils-2.21/opcodes/d30v-dis.c b/opcodes/d30v-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/d30v-dis.c
rename to opcodes/d30v-dis.c
diff --git a/binutils/binutils-2.21/opcodes/d30v-opc.c b/opcodes/d30v-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/d30v-opc.c
rename to opcodes/d30v-opc.c
diff --git a/binutils/binutils-2.21/opcodes/dep-in.sed b/opcodes/dep-in.sed
similarity index 100%
rename from binutils/binutils-2.21/opcodes/dep-in.sed
rename to opcodes/dep-in.sed
diff --git a/binutils/binutils-2.21/opcodes/dis-buf.c b/opcodes/dis-buf.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/dis-buf.c
rename to opcodes/dis-buf.c
diff --git a/binutils/binutils-2.21/opcodes/dis-init.c b/opcodes/dis-init.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/dis-init.c
rename to opcodes/dis-init.c
diff --git a/binutils/binutils-2.21/opcodes/disassemble.c b/opcodes/disassemble.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/disassemble.c
rename to opcodes/disassemble.c
diff --git a/binutils/binutils-2.21/opcodes/dlx-dis.c b/opcodes/dlx-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/dlx-dis.c
rename to opcodes/dlx-dis.c
diff --git a/binutils/binutils-2.21/opcodes/fr30-asm.c b/opcodes/fr30-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/fr30-asm.c
rename to opcodes/fr30-asm.c
diff --git a/binutils/binutils-2.21/opcodes/fr30-desc.c b/opcodes/fr30-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/fr30-desc.c
rename to opcodes/fr30-desc.c
diff --git a/binutils/binutils-2.21/opcodes/fr30-desc.h b/opcodes/fr30-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/fr30-desc.h
rename to opcodes/fr30-desc.h
diff --git a/binutils/binutils-2.21/opcodes/fr30-dis.c b/opcodes/fr30-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/fr30-dis.c
rename to opcodes/fr30-dis.c
diff --git a/binutils/binutils-2.21/opcodes/fr30-ibld.c b/opcodes/fr30-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/fr30-ibld.c
rename to opcodes/fr30-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/fr30-opc.c b/opcodes/fr30-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/fr30-opc.c
rename to opcodes/fr30-opc.c
diff --git a/binutils/binutils-2.21/opcodes/fr30-opc.h b/opcodes/fr30-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/fr30-opc.h
rename to opcodes/fr30-opc.h
diff --git a/binutils/binutils-2.21/opcodes/frv-asm.c b/opcodes/frv-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/frv-asm.c
rename to opcodes/frv-asm.c
diff --git a/binutils/binutils-2.21/opcodes/frv-desc.c b/opcodes/frv-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/frv-desc.c
rename to opcodes/frv-desc.c
diff --git a/binutils/binutils-2.21/opcodes/frv-desc.h b/opcodes/frv-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/frv-desc.h
rename to opcodes/frv-desc.h
diff --git a/binutils/binutils-2.21/opcodes/frv-dis.c b/opcodes/frv-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/frv-dis.c
rename to opcodes/frv-dis.c
diff --git a/binutils/binutils-2.21/opcodes/frv-ibld.c b/opcodes/frv-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/frv-ibld.c
rename to opcodes/frv-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/frv-opc.c b/opcodes/frv-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/frv-opc.c
rename to opcodes/frv-opc.c
diff --git a/binutils/binutils-2.21/opcodes/frv-opc.h b/opcodes/frv-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/frv-opc.h
rename to opcodes/frv-opc.h
diff --git a/binutils/binutils-2.21/opcodes/h8300-dis.c b/opcodes/h8300-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/h8300-dis.c
rename to opcodes/h8300-dis.c
diff --git a/binutils/binutils-2.21/opcodes/h8500-dis.c b/opcodes/h8500-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/h8500-dis.c
rename to opcodes/h8500-dis.c
diff --git a/binutils/binutils-2.21/opcodes/h8500-opc.h b/opcodes/h8500-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/h8500-opc.h
rename to opcodes/h8500-opc.h
diff --git a/binutils/binutils-2.21/opcodes/hppa-dis.c b/opcodes/hppa-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/hppa-dis.c
rename to opcodes/hppa-dis.c
diff --git a/binutils/binutils-2.21/opcodes/i370-dis.c b/opcodes/i370-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i370-dis.c
rename to opcodes/i370-dis.c
diff --git a/binutils/binutils-2.21/opcodes/i370-opc.c b/opcodes/i370-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i370-opc.c
rename to opcodes/i370-opc.c
diff --git a/binutils/binutils-2.21/opcodes/i386-dis.c b/opcodes/i386-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-dis.c
rename to opcodes/i386-dis.c
diff --git a/binutils/binutils-2.21/opcodes/i386-gen.c b/opcodes/i386-gen.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-gen.c
rename to opcodes/i386-gen.c
diff --git a/binutils/binutils-2.21/opcodes/i386-init.h b/opcodes/i386-init.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-init.h
rename to opcodes/i386-init.h
diff --git a/binutils/binutils-2.21/opcodes/i386-opc.c b/opcodes/i386-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-opc.c
rename to opcodes/i386-opc.c
diff --git a/binutils/binutils-2.21/opcodes/i386-opc.h b/opcodes/i386-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-opc.h
rename to opcodes/i386-opc.h
diff --git a/binutils/binutils-2.21/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-opc.tbl
rename to opcodes/i386-opc.tbl
diff --git a/binutils/binutils-2.21/opcodes/i386-reg.tbl b/opcodes/i386-reg.tbl
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-reg.tbl
rename to opcodes/i386-reg.tbl
diff --git a/binutils/binutils-2.21/opcodes/i386-tbl.h b/opcodes/i386-tbl.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i386-tbl.h
rename to opcodes/i386-tbl.h
diff --git a/binutils/binutils-2.21/opcodes/i860-dis.c b/opcodes/i860-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i860-dis.c
rename to opcodes/i860-dis.c
diff --git a/binutils/binutils-2.21/opcodes/i960-dis.c b/opcodes/i960-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/i960-dis.c
rename to opcodes/i960-dis.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-asmtab.c b/opcodes/ia64-asmtab.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-asmtab.c
rename to opcodes/ia64-asmtab.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-asmtab.h b/opcodes/ia64-asmtab.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-asmtab.h
rename to opcodes/ia64-asmtab.h
diff --git a/binutils/binutils-2.21/opcodes/ia64-dis.c b/opcodes/ia64-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-dis.c
rename to opcodes/ia64-dis.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-gen.c b/opcodes/ia64-gen.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-gen.c
rename to opcodes/ia64-gen.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-ic.tbl b/opcodes/ia64-ic.tbl
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-ic.tbl
rename to opcodes/ia64-ic.tbl
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc-a.c b/opcodes/ia64-opc-a.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc-a.c
rename to opcodes/ia64-opc-a.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc-b.c b/opcodes/ia64-opc-b.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc-b.c
rename to opcodes/ia64-opc-b.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc-d.c b/opcodes/ia64-opc-d.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc-d.c
rename to opcodes/ia64-opc-d.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc-f.c b/opcodes/ia64-opc-f.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc-f.c
rename to opcodes/ia64-opc-f.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc-i.c b/opcodes/ia64-opc-i.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc-i.c
rename to opcodes/ia64-opc-i.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc-m.c b/opcodes/ia64-opc-m.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc-m.c
rename to opcodes/ia64-opc-m.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc-x.c b/opcodes/ia64-opc-x.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc-x.c
rename to opcodes/ia64-opc-x.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc.c b/opcodes/ia64-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc.c
rename to opcodes/ia64-opc.c
diff --git a/binutils/binutils-2.21/opcodes/ia64-opc.h b/opcodes/ia64-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-opc.h
rename to opcodes/ia64-opc.h
diff --git a/binutils/binutils-2.21/opcodes/ia64-raw.tbl b/opcodes/ia64-raw.tbl
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-raw.tbl
rename to opcodes/ia64-raw.tbl
diff --git a/binutils/binutils-2.21/opcodes/ia64-war.tbl b/opcodes/ia64-war.tbl
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-war.tbl
rename to opcodes/ia64-war.tbl
diff --git a/binutils/binutils-2.21/opcodes/ia64-waw.tbl b/opcodes/ia64-waw.tbl
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ia64-waw.tbl
rename to opcodes/ia64-waw.tbl
diff --git a/binutils/binutils-2.21/opcodes/ip2k-asm.c b/opcodes/ip2k-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ip2k-asm.c
rename to opcodes/ip2k-asm.c
diff --git a/binutils/binutils-2.21/opcodes/ip2k-desc.c b/opcodes/ip2k-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ip2k-desc.c
rename to opcodes/ip2k-desc.c
diff --git a/binutils/binutils-2.21/opcodes/ip2k-desc.h b/opcodes/ip2k-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ip2k-desc.h
rename to opcodes/ip2k-desc.h
diff --git a/binutils/binutils-2.21/opcodes/ip2k-dis.c b/opcodes/ip2k-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ip2k-dis.c
rename to opcodes/ip2k-dis.c
diff --git a/binutils/binutils-2.21/opcodes/ip2k-ibld.c b/opcodes/ip2k-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ip2k-ibld.c
rename to opcodes/ip2k-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/ip2k-opc.c b/opcodes/ip2k-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ip2k-opc.c
rename to opcodes/ip2k-opc.c
diff --git a/binutils/binutils-2.21/opcodes/ip2k-opc.h b/opcodes/ip2k-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ip2k-opc.h
rename to opcodes/ip2k-opc.h
diff --git a/binutils/binutils-2.21/opcodes/iq2000-asm.c b/opcodes/iq2000-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/iq2000-asm.c
rename to opcodes/iq2000-asm.c
diff --git a/binutils/binutils-2.21/opcodes/iq2000-desc.c b/opcodes/iq2000-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/iq2000-desc.c
rename to opcodes/iq2000-desc.c
diff --git a/binutils/binutils-2.21/opcodes/iq2000-desc.h b/opcodes/iq2000-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/iq2000-desc.h
rename to opcodes/iq2000-desc.h
diff --git a/binutils/binutils-2.21/opcodes/iq2000-dis.c b/opcodes/iq2000-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/iq2000-dis.c
rename to opcodes/iq2000-dis.c
diff --git a/binutils/binutils-2.21/opcodes/iq2000-ibld.c b/opcodes/iq2000-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/iq2000-ibld.c
rename to opcodes/iq2000-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/iq2000-opc.c b/opcodes/iq2000-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/iq2000-opc.c
rename to opcodes/iq2000-opc.c
diff --git a/binutils/binutils-2.21/opcodes/iq2000-opc.h b/opcodes/iq2000-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/iq2000-opc.h
rename to opcodes/iq2000-opc.h
diff --git a/binutils/binutils-2.21/opcodes/lm32-asm.c b/opcodes/lm32-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-asm.c
rename to opcodes/lm32-asm.c
diff --git a/binutils/binutils-2.21/opcodes/lm32-desc.c b/opcodes/lm32-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-desc.c
rename to opcodes/lm32-desc.c
diff --git a/binutils/binutils-2.21/opcodes/lm32-desc.h b/opcodes/lm32-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-desc.h
rename to opcodes/lm32-desc.h
diff --git a/binutils/binutils-2.21/opcodes/lm32-dis.c b/opcodes/lm32-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-dis.c
rename to opcodes/lm32-dis.c
diff --git a/binutils/binutils-2.21/opcodes/lm32-ibld.c b/opcodes/lm32-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-ibld.c
rename to opcodes/lm32-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/lm32-opc.c b/opcodes/lm32-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-opc.c
rename to opcodes/lm32-opc.c
diff --git a/binutils/binutils-2.21/opcodes/lm32-opc.h b/opcodes/lm32-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-opc.h
rename to opcodes/lm32-opc.h
diff --git a/binutils/binutils-2.21/opcodes/lm32-opinst.c b/opcodes/lm32-opinst.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/lm32-opinst.c
rename to opcodes/lm32-opinst.c
diff --git a/binutils/binutils-2.21/opcodes/m10200-dis.c b/opcodes/m10200-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m10200-dis.c
rename to opcodes/m10200-dis.c
diff --git a/binutils/binutils-2.21/opcodes/m10200-opc.c b/opcodes/m10200-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m10200-opc.c
rename to opcodes/m10200-opc.c
diff --git a/binutils/binutils-2.21/opcodes/m10300-dis.c b/opcodes/m10300-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m10300-dis.c
rename to opcodes/m10300-dis.c
diff --git a/binutils/binutils-2.21/opcodes/m10300-opc.c b/opcodes/m10300-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m10300-opc.c
rename to opcodes/m10300-opc.c
diff --git a/binutils/binutils-2.21/opcodes/m32c-asm.c b/opcodes/m32c-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32c-asm.c
rename to opcodes/m32c-asm.c
diff --git a/binutils/binutils-2.21/opcodes/m32c-desc.c b/opcodes/m32c-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32c-desc.c
rename to opcodes/m32c-desc.c
diff --git a/binutils/binutils-2.21/opcodes/m32c-desc.h b/opcodes/m32c-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32c-desc.h
rename to opcodes/m32c-desc.h
diff --git a/binutils/binutils-2.21/opcodes/m32c-dis.c b/opcodes/m32c-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32c-dis.c
rename to opcodes/m32c-dis.c
diff --git a/binutils/binutils-2.21/opcodes/m32c-ibld.c b/opcodes/m32c-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32c-ibld.c
rename to opcodes/m32c-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/m32c-opc.c b/opcodes/m32c-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32c-opc.c
rename to opcodes/m32c-opc.c
diff --git a/binutils/binutils-2.21/opcodes/m32c-opc.h b/opcodes/m32c-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32c-opc.h
rename to opcodes/m32c-opc.h
diff --git a/binutils/binutils-2.21/opcodes/m32r-asm.c b/opcodes/m32r-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-asm.c
rename to opcodes/m32r-asm.c
diff --git a/binutils/binutils-2.21/opcodes/m32r-desc.c b/opcodes/m32r-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-desc.c
rename to opcodes/m32r-desc.c
diff --git a/binutils/binutils-2.21/opcodes/m32r-desc.h b/opcodes/m32r-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-desc.h
rename to opcodes/m32r-desc.h
diff --git a/binutils/binutils-2.21/opcodes/m32r-dis.c b/opcodes/m32r-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-dis.c
rename to opcodes/m32r-dis.c
diff --git a/binutils/binutils-2.21/opcodes/m32r-ibld.c b/opcodes/m32r-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-ibld.c
rename to opcodes/m32r-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/m32r-opc.c b/opcodes/m32r-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-opc.c
rename to opcodes/m32r-opc.c
diff --git a/binutils/binutils-2.21/opcodes/m32r-opc.h b/opcodes/m32r-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-opc.h
rename to opcodes/m32r-opc.h
diff --git a/binutils/binutils-2.21/opcodes/m32r-opinst.c b/opcodes/m32r-opinst.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m32r-opinst.c
rename to opcodes/m32r-opinst.c
diff --git a/binutils/binutils-2.21/opcodes/m68hc11-dis.c b/opcodes/m68hc11-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m68hc11-dis.c
rename to opcodes/m68hc11-dis.c
diff --git a/binutils/binutils-2.21/opcodes/m68hc11-opc.c b/opcodes/m68hc11-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m68hc11-opc.c
rename to opcodes/m68hc11-opc.c
diff --git a/binutils/binutils-2.21/opcodes/m68k-dis.c b/opcodes/m68k-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m68k-dis.c
rename to opcodes/m68k-dis.c
diff --git a/binutils/binutils-2.21/opcodes/m68k-opc.c b/opcodes/m68k-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m68k-opc.c
rename to opcodes/m68k-opc.c
diff --git a/binutils/binutils-2.21/opcodes/m88k-dis.c b/opcodes/m88k-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/m88k-dis.c
rename to opcodes/m88k-dis.c
diff --git a/binutils/binutils-2.21/opcodes/makefile.vms b/opcodes/makefile.vms
similarity index 100%
rename from binutils/binutils-2.21/opcodes/makefile.vms
rename to opcodes/makefile.vms
diff --git a/binutils/binutils-2.21/opcodes/mcore-dis.c b/opcodes/mcore-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mcore-dis.c
rename to opcodes/mcore-dis.c
diff --git a/binutils/binutils-2.21/opcodes/mcore-opc.h b/opcodes/mcore-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mcore-opc.h
rename to opcodes/mcore-opc.h
diff --git a/binutils/binutils-2.21/opcodes/mep-asm.c b/opcodes/mep-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mep-asm.c
rename to opcodes/mep-asm.c
diff --git a/binutils/binutils-2.21/opcodes/mep-desc.c b/opcodes/mep-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mep-desc.c
rename to opcodes/mep-desc.c
diff --git a/binutils/binutils-2.21/opcodes/mep-desc.h b/opcodes/mep-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mep-desc.h
rename to opcodes/mep-desc.h
diff --git a/binutils/binutils-2.21/opcodes/mep-dis.c b/opcodes/mep-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mep-dis.c
rename to opcodes/mep-dis.c
diff --git a/binutils/binutils-2.21/opcodes/mep-ibld.c b/opcodes/mep-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mep-ibld.c
rename to opcodes/mep-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/mep-opc.c b/opcodes/mep-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mep-opc.c
rename to opcodes/mep-opc.c
diff --git a/binutils/binutils-2.21/opcodes/mep-opc.h b/opcodes/mep-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mep-opc.h
rename to opcodes/mep-opc.h
diff --git a/binutils/binutils-2.21/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/microblaze-dis.c
rename to opcodes/microblaze-dis.c
diff --git a/binutils/binutils-2.21/opcodes/microblaze-dis.h b/opcodes/microblaze-dis.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/microblaze-dis.h
rename to opcodes/microblaze-dis.h
diff --git a/binutils/binutils-2.21/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/microblaze-opc.h
rename to opcodes/microblaze-opc.h
diff --git a/binutils/binutils-2.21/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/microblaze-opcm.h
rename to opcodes/microblaze-opcm.h
diff --git a/binutils/binutils-2.21/opcodes/mips-dis.c b/opcodes/mips-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mips-dis.c
rename to opcodes/mips-dis.c
diff --git a/binutils/binutils-2.21/opcodes/mips-opc.c b/opcodes/mips-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mips-opc.c
rename to opcodes/mips-opc.c
diff --git a/binutils/binutils-2.21/opcodes/mips16-opc.c b/opcodes/mips16-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mips16-opc.c
rename to opcodes/mips16-opc.c
diff --git a/binutils/binutils-2.21/opcodes/mmix-dis.c b/opcodes/mmix-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mmix-dis.c
rename to opcodes/mmix-dis.c
diff --git a/binutils/binutils-2.21/opcodes/mmix-opc.c b/opcodes/mmix-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mmix-opc.c
rename to opcodes/mmix-opc.c
diff --git a/binutils/binutils-2.21/opcodes/moxie-dis.c b/opcodes/moxie-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/moxie-dis.c
rename to opcodes/moxie-dis.c
diff --git a/binutils/binutils-2.21/opcodes/moxie-opc.c b/opcodes/moxie-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/moxie-opc.c
rename to opcodes/moxie-opc.c
diff --git a/binutils/binutils-2.21/opcodes/msp430-dis.c b/opcodes/msp430-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/msp430-dis.c
rename to opcodes/msp430-dis.c
diff --git a/binutils/binutils-2.21/opcodes/mt-asm.c b/opcodes/mt-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mt-asm.c
rename to opcodes/mt-asm.c
diff --git a/binutils/binutils-2.21/opcodes/mt-desc.c b/opcodes/mt-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mt-desc.c
rename to opcodes/mt-desc.c
diff --git a/binutils/binutils-2.21/opcodes/mt-desc.h b/opcodes/mt-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mt-desc.h
rename to opcodes/mt-desc.h
diff --git a/binutils/binutils-2.21/opcodes/mt-dis.c b/opcodes/mt-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mt-dis.c
rename to opcodes/mt-dis.c
diff --git a/binutils/binutils-2.21/opcodes/mt-ibld.c b/opcodes/mt-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mt-ibld.c
rename to opcodes/mt-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/mt-opc.c b/opcodes/mt-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mt-opc.c
rename to opcodes/mt-opc.c
diff --git a/binutils/binutils-2.21/opcodes/mt-opc.h b/opcodes/mt-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/mt-opc.h
rename to opcodes/mt-opc.h
diff --git a/binutils/binutils-2.21/opcodes/ns32k-dis.c b/opcodes/ns32k-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ns32k-dis.c
rename to opcodes/ns32k-dis.c
diff --git a/binutils/binutils-2.21/opcodes/opc2c.c b/opcodes/opc2c.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/opc2c.c
rename to opcodes/opc2c.c
diff --git a/binutils/binutils-2.21/opcodes/openrisc-asm.c b/opcodes/openrisc-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/openrisc-asm.c
rename to opcodes/openrisc-asm.c
diff --git a/binutils/binutils-2.21/opcodes/openrisc-desc.c b/opcodes/openrisc-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/openrisc-desc.c
rename to opcodes/openrisc-desc.c
diff --git a/binutils/binutils-2.21/opcodes/openrisc-desc.h b/opcodes/openrisc-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/openrisc-desc.h
rename to opcodes/openrisc-desc.h
diff --git a/binutils/binutils-2.21/opcodes/openrisc-dis.c b/opcodes/openrisc-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/openrisc-dis.c
rename to opcodes/openrisc-dis.c
diff --git a/binutils/binutils-2.21/opcodes/openrisc-ibld.c b/opcodes/openrisc-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/openrisc-ibld.c
rename to opcodes/openrisc-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/openrisc-opc.c b/opcodes/openrisc-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/openrisc-opc.c
rename to opcodes/openrisc-opc.c
diff --git a/binutils/binutils-2.21/opcodes/openrisc-opc.h b/opcodes/openrisc-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/openrisc-opc.h
rename to opcodes/openrisc-opc.h
diff --git a/binutils/binutils-2.21/opcodes/opintl.h b/opcodes/opintl.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/opintl.h
rename to opcodes/opintl.h
diff --git a/binutils/binutils-2.21/opcodes/or32-dis.c b/opcodes/or32-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/or32-dis.c
rename to opcodes/or32-dis.c
diff --git a/binutils/binutils-2.21/opcodes/or32-opc.c b/opcodes/or32-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/or32-opc.c
rename to opcodes/or32-opc.c
diff --git a/binutils/binutils-2.21/opcodes/pdp11-dis.c b/opcodes/pdp11-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/pdp11-dis.c
rename to opcodes/pdp11-dis.c
diff --git a/binutils/binutils-2.21/opcodes/pdp11-opc.c b/opcodes/pdp11-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/pdp11-opc.c
rename to opcodes/pdp11-opc.c
diff --git a/binutils/binutils-2.21/opcodes/pj-dis.c b/opcodes/pj-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/pj-dis.c
rename to opcodes/pj-dis.c
diff --git a/binutils/binutils-2.21/opcodes/pj-opc.c b/opcodes/pj-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/pj-opc.c
rename to opcodes/pj-opc.c
diff --git a/binutils/binutils-2.21/opcodes/po/Make-in b/opcodes/po/Make-in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/Make-in
rename to opcodes/po/Make-in
diff --git a/binutils/binutils-2.21/opcodes/po/POTFILES.in b/opcodes/po/POTFILES.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/POTFILES.in
rename to opcodes/po/POTFILES.in
diff --git a/binutils/binutils-2.21/opcodes/po/da.gmo b/opcodes/po/da.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/da.gmo
rename to opcodes/po/da.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/da.po b/opcodes/po/da.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/da.po
rename to opcodes/po/da.po
diff --git a/binutils/binutils-2.21/opcodes/po/de.gmo b/opcodes/po/de.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/de.gmo
rename to opcodes/po/de.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/de.po b/opcodes/po/de.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/de.po
rename to opcodes/po/de.po
diff --git a/binutils/binutils-2.21/opcodes/po/es.gmo b/opcodes/po/es.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/es.gmo
rename to opcodes/po/es.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/es.po b/opcodes/po/es.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/es.po
rename to opcodes/po/es.po
diff --git a/binutils/binutils-2.21/opcodes/po/fi.gmo b/opcodes/po/fi.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/fi.gmo
rename to opcodes/po/fi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/fi.po b/opcodes/po/fi.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/fi.po
rename to opcodes/po/fi.po
diff --git a/binutils/binutils-2.21/opcodes/po/fr.gmo b/opcodes/po/fr.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/fr.gmo
rename to opcodes/po/fr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/fr.po b/opcodes/po/fr.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/fr.po
rename to opcodes/po/fr.po
diff --git a/binutils/binutils-2.21/opcodes/po/ga.gmo b/opcodes/po/ga.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/ga.gmo
rename to opcodes/po/ga.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/ga.po b/opcodes/po/ga.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/ga.po
rename to opcodes/po/ga.po
diff --git a/binutils/binutils-2.21/opcodes/po/id.gmo b/opcodes/po/id.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/id.gmo
rename to opcodes/po/id.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/id.po b/opcodes/po/id.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/id.po
rename to opcodes/po/id.po
diff --git a/binutils/binutils-2.21/opcodes/po/nl.gmo b/opcodes/po/nl.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/nl.gmo
rename to opcodes/po/nl.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/nl.po b/opcodes/po/nl.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/nl.po
rename to opcodes/po/nl.po
diff --git a/binutils/binutils-2.21/opcodes/po/opcodes.pot b/opcodes/po/opcodes.pot
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/opcodes.pot
rename to opcodes/po/opcodes.pot
diff --git a/binutils/binutils-2.21/opcodes/po/pt_BR.gmo b/opcodes/po/pt_BR.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/pt_BR.gmo
rename to opcodes/po/pt_BR.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/pt_BR.po b/opcodes/po/pt_BR.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/pt_BR.po
rename to opcodes/po/pt_BR.po
diff --git a/binutils/binutils-2.21/opcodes/po/ro.gmo b/opcodes/po/ro.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/ro.gmo
rename to opcodes/po/ro.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/ro.po b/opcodes/po/ro.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/ro.po
rename to opcodes/po/ro.po
diff --git a/binutils/binutils-2.21/opcodes/po/sv.gmo b/opcodes/po/sv.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/sv.gmo
rename to opcodes/po/sv.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/sv.po b/opcodes/po/sv.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/sv.po
rename to opcodes/po/sv.po
diff --git a/binutils/binutils-2.21/opcodes/po/tr.gmo b/opcodes/po/tr.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/tr.gmo
rename to opcodes/po/tr.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/tr.po b/opcodes/po/tr.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/tr.po
rename to opcodes/po/tr.po
diff --git a/binutils/binutils-2.21/opcodes/po/vi.gmo b/opcodes/po/vi.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/vi.gmo
rename to opcodes/po/vi.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/vi.po b/opcodes/po/vi.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/vi.po
rename to opcodes/po/vi.po
diff --git a/binutils/binutils-2.21/opcodes/po/zh_CN.gmo b/opcodes/po/zh_CN.gmo
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/zh_CN.gmo
rename to opcodes/po/zh_CN.gmo
Binary files differ
diff --git a/binutils/binutils-2.21/opcodes/po/zh_CN.po b/opcodes/po/zh_CN.po
similarity index 100%
rename from binutils/binutils-2.21/opcodes/po/zh_CN.po
rename to opcodes/po/zh_CN.po
diff --git a/binutils/binutils-2.21/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ppc-dis.c
rename to opcodes/ppc-dis.c
diff --git a/binutils/binutils-2.21/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/ppc-opc.c
rename to opcodes/ppc-opc.c
diff --git a/binutils/binutils-2.21/opcodes/rx-decode.c b/opcodes/rx-decode.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/rx-decode.c
rename to opcodes/rx-decode.c
diff --git a/binutils/binutils-2.21/opcodes/rx-decode.opc b/opcodes/rx-decode.opc
similarity index 100%
rename from binutils/binutils-2.21/opcodes/rx-decode.opc
rename to opcodes/rx-decode.opc
diff --git a/binutils/binutils-2.21/opcodes/rx-dis.c b/opcodes/rx-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/rx-dis.c
rename to opcodes/rx-dis.c
diff --git a/binutils/binutils-2.21/opcodes/s390-dis.c b/opcodes/s390-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/s390-dis.c
rename to opcodes/s390-dis.c
diff --git a/binutils/binutils-2.21/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/s390-mkopc.c
rename to opcodes/s390-mkopc.c
diff --git a/binutils/binutils-2.21/opcodes/s390-opc.c b/opcodes/s390-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/s390-opc.c
rename to opcodes/s390-opc.c
diff --git a/binutils/binutils-2.21/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
similarity index 100%
rename from binutils/binutils-2.21/opcodes/s390-opc.txt
rename to opcodes/s390-opc.txt
diff --git a/binutils/binutils-2.21/opcodes/score-dis.c b/opcodes/score-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/score-dis.c
rename to opcodes/score-dis.c
diff --git a/binutils/binutils-2.21/opcodes/score-opc.h b/opcodes/score-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/score-opc.h
rename to opcodes/score-opc.h
diff --git a/binutils/binutils-2.21/opcodes/score7-dis.c b/opcodes/score7-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/score7-dis.c
rename to opcodes/score7-dis.c
diff --git a/binutils/binutils-2.21/opcodes/sh-dis.c b/opcodes/sh-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sh-dis.c
rename to opcodes/sh-dis.c
diff --git a/binutils/binutils-2.21/opcodes/sh-opc.h b/opcodes/sh-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sh-opc.h
rename to opcodes/sh-opc.h
diff --git a/binutils/binutils-2.21/opcodes/sh64-dis.c b/opcodes/sh64-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sh64-dis.c
rename to opcodes/sh64-dis.c
diff --git a/binutils/binutils-2.21/opcodes/sh64-opc.c b/opcodes/sh64-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sh64-opc.c
rename to opcodes/sh64-opc.c
diff --git a/binutils/binutils-2.21/opcodes/sh64-opc.h b/opcodes/sh64-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sh64-opc.h
rename to opcodes/sh64-opc.h
diff --git a/binutils/binutils-2.21/opcodes/sparc-dis.c b/opcodes/sparc-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sparc-dis.c
rename to opcodes/sparc-dis.c
diff --git a/binutils/binutils-2.21/opcodes/sparc-opc.c b/opcodes/sparc-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sparc-opc.c
rename to opcodes/sparc-opc.c
diff --git a/binutils/binutils-2.21/opcodes/spu-dis.c b/opcodes/spu-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/spu-dis.c
rename to opcodes/spu-dis.c
diff --git a/binutils/binutils-2.21/opcodes/spu-opc.c b/opcodes/spu-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/spu-opc.c
rename to opcodes/spu-opc.c
diff --git a/binutils/binutils-2.21/opcodes/stamp-h.in b/opcodes/stamp-h.in
similarity index 100%
rename from binutils/binutils-2.21/opcodes/stamp-h.in
rename to opcodes/stamp-h.in
diff --git a/binutils/binutils-2.21/opcodes/sysdep.h b/opcodes/sysdep.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/sysdep.h
rename to opcodes/sysdep.h
diff --git a/binutils/binutils-2.21/opcodes/tic30-dis.c b/opcodes/tic30-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/tic30-dis.c
rename to opcodes/tic30-dis.c
diff --git a/binutils/binutils-2.21/opcodes/tic4x-dis.c b/opcodes/tic4x-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/tic4x-dis.c
rename to opcodes/tic4x-dis.c
diff --git a/binutils/binutils-2.21/opcodes/tic54x-dis.c b/opcodes/tic54x-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/tic54x-dis.c
rename to opcodes/tic54x-dis.c
diff --git a/binutils/binutils-2.21/opcodes/tic54x-opc.c b/opcodes/tic54x-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/tic54x-opc.c
rename to opcodes/tic54x-opc.c
diff --git a/binutils/binutils-2.21/opcodes/tic6x-dis.c b/opcodes/tic6x-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/tic6x-dis.c
rename to opcodes/tic6x-dis.c
diff --git a/binutils/binutils-2.21/opcodes/tic80-dis.c b/opcodes/tic80-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/tic80-dis.c
rename to opcodes/tic80-dis.c
diff --git a/binutils/binutils-2.21/opcodes/tic80-opc.c b/opcodes/tic80-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/tic80-opc.c
rename to opcodes/tic80-opc.c
diff --git a/binutils/binutils-2.21/opcodes/v850-dis.c b/opcodes/v850-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/v850-dis.c
rename to opcodes/v850-dis.c
diff --git a/binutils/binutils-2.21/opcodes/v850-opc.c b/opcodes/v850-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/v850-opc.c
rename to opcodes/v850-opc.c
diff --git a/binutils/binutils-2.21/opcodes/vax-dis.c b/opcodes/vax-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/vax-dis.c
rename to opcodes/vax-dis.c
diff --git a/binutils/binutils-2.21/opcodes/w65-dis.c b/opcodes/w65-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/w65-dis.c
rename to opcodes/w65-dis.c
diff --git a/binutils/binutils-2.21/opcodes/w65-opc.h b/opcodes/w65-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/w65-opc.h
rename to opcodes/w65-opc.h
diff --git a/binutils/binutils-2.21/opcodes/xc16x-asm.c b/opcodes/xc16x-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xc16x-asm.c
rename to opcodes/xc16x-asm.c
diff --git a/binutils/binutils-2.21/opcodes/xc16x-desc.c b/opcodes/xc16x-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xc16x-desc.c
rename to opcodes/xc16x-desc.c
diff --git a/binutils/binutils-2.21/opcodes/xc16x-desc.h b/opcodes/xc16x-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xc16x-desc.h
rename to opcodes/xc16x-desc.h
diff --git a/binutils/binutils-2.21/opcodes/xc16x-dis.c b/opcodes/xc16x-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xc16x-dis.c
rename to opcodes/xc16x-dis.c
diff --git a/binutils/binutils-2.21/opcodes/xc16x-ibld.c b/opcodes/xc16x-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xc16x-ibld.c
rename to opcodes/xc16x-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/xc16x-opc.c b/opcodes/xc16x-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xc16x-opc.c
rename to opcodes/xc16x-opc.c
diff --git a/binutils/binutils-2.21/opcodes/xc16x-opc.h b/opcodes/xc16x-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xc16x-opc.h
rename to opcodes/xc16x-opc.h
diff --git a/binutils/binutils-2.21/opcodes/xstormy16-asm.c b/opcodes/xstormy16-asm.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xstormy16-asm.c
rename to opcodes/xstormy16-asm.c
diff --git a/binutils/binutils-2.21/opcodes/xstormy16-desc.c b/opcodes/xstormy16-desc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xstormy16-desc.c
rename to opcodes/xstormy16-desc.c
diff --git a/binutils/binutils-2.21/opcodes/xstormy16-desc.h b/opcodes/xstormy16-desc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xstormy16-desc.h
rename to opcodes/xstormy16-desc.h
diff --git a/binutils/binutils-2.21/opcodes/xstormy16-dis.c b/opcodes/xstormy16-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xstormy16-dis.c
rename to opcodes/xstormy16-dis.c
diff --git a/binutils/binutils-2.21/opcodes/xstormy16-ibld.c b/opcodes/xstormy16-ibld.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xstormy16-ibld.c
rename to opcodes/xstormy16-ibld.c
diff --git a/binutils/binutils-2.21/opcodes/xstormy16-opc.c b/opcodes/xstormy16-opc.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xstormy16-opc.c
rename to opcodes/xstormy16-opc.c
diff --git a/binutils/binutils-2.21/opcodes/xstormy16-opc.h b/opcodes/xstormy16-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xstormy16-opc.h
rename to opcodes/xstormy16-opc.h
diff --git a/binutils/binutils-2.21/opcodes/xtensa-dis.c b/opcodes/xtensa-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/xtensa-dis.c
rename to opcodes/xtensa-dis.c
diff --git a/binutils/binutils-2.21/opcodes/z80-dis.c b/opcodes/z80-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/z80-dis.c
rename to opcodes/z80-dis.c
diff --git a/binutils/binutils-2.21/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/z8k-dis.c
rename to opcodes/z8k-dis.c
diff --git a/binutils/binutils-2.21/opcodes/z8k-opc.h b/opcodes/z8k-opc.h
similarity index 100%
rename from binutils/binutils-2.21/opcodes/z8k-opc.h
rename to opcodes/z8k-opc.h
diff --git a/binutils/binutils-2.21/opcodes/z8kgen.c b/opcodes/z8kgen.c
similarity index 100%
rename from binutils/binutils-2.21/opcodes/z8kgen.c
rename to opcodes/z8kgen.c
diff --git a/binutils/binutils-2.21/setup.com b/setup.com
similarity index 100%
rename from binutils/binutils-2.21/setup.com
rename to setup.com
diff --git a/binutils/binutils-2.21/src-release b/src-release
similarity index 100%
rename from binutils/binutils-2.21/src-release
rename to src-release
diff --git a/binutils/binutils-2.21/symlink-tree b/symlink-tree
similarity index 100%
rename from binutils/binutils-2.21/symlink-tree
rename to symlink-tree
diff --git a/binutils/binutils-2.21/texinfo/texinfo.tex b/texinfo/texinfo.tex
similarity index 100%
rename from binutils/binutils-2.21/texinfo/texinfo.tex
rename to texinfo/texinfo.tex
diff --git a/binutils/binutils-2.21/ylwrap b/ylwrap
similarity index 100%
rename from binutils/binutils-2.21/ylwrap
rename to ylwrap