diff --git a/contrib/gdb/COPYING b/COPYING
similarity index 100%
rename from contrib/gdb/COPYING
rename to COPYING
diff --git a/contrib/gdb/COPYING.LIB b/COPYING.LIB
similarity index 100%
rename from contrib/gdb/COPYING.LIB
rename to COPYING.LIB
diff --git a/contrib/gdb/FREEBSD-diffs b/FREEBSD-diffs
similarity index 100%
rename from contrib/gdb/FREEBSD-diffs
rename to FREEBSD-diffs
diff --git a/contrib/gdb/README b/README
similarity index 100%
rename from contrib/gdb/README
rename to README
diff --git a/contrib/gdb/config-ml.in b/config-ml.in
similarity index 100%
rename from contrib/gdb/config-ml.in
rename to config-ml.in
diff --git a/contrib/gdb/djunpack.bat b/djunpack.bat
similarity index 100%
rename from contrib/gdb/djunpack.bat
rename to djunpack.bat
diff --git a/contrib/gdb/gdb/CONTRIBUTE b/gdb/CONTRIBUTE
similarity index 100%
rename from contrib/gdb/gdb/CONTRIBUTE
rename to gdb/CONTRIBUTE
diff --git a/contrib/gdb/gdb/COPYING b/gdb/COPYING
similarity index 100%
rename from contrib/gdb/gdb/COPYING
rename to gdb/COPYING
diff --git a/contrib/gdb/gdb/MAINTAINERS b/gdb/MAINTAINERS
similarity index 100%
rename from contrib/gdb/gdb/MAINTAINERS
rename to gdb/MAINTAINERS
diff --git a/contrib/gdb/gdb/NEWS b/gdb/NEWS
similarity index 100%
rename from contrib/gdb/gdb/NEWS
rename to gdb/NEWS
diff --git a/contrib/gdb/gdb/PROBLEMS b/gdb/PROBLEMS
similarity index 100%
rename from contrib/gdb/gdb/PROBLEMS
rename to gdb/PROBLEMS
diff --git a/contrib/gdb/gdb/README b/gdb/README
similarity index 100%
rename from contrib/gdb/gdb/README
rename to gdb/README
diff --git a/contrib/gdb/gdb/TODO b/gdb/TODO
similarity index 100%
rename from contrib/gdb/gdb/TODO
rename to gdb/TODO
diff --git a/contrib/gdb/gdb/abug-rom.c b/gdb/abug-rom.c
similarity index 100%
rename from contrib/gdb/gdb/abug-rom.c
rename to gdb/abug-rom.c
diff --git a/contrib/gdb/gdb/acinclude.m4 b/gdb/acinclude.m4
similarity index 100%
rename from contrib/gdb/gdb/acinclude.m4
rename to gdb/acinclude.m4
diff --git a/contrib/gdb/gdb/aclocal.m4 b/gdb/aclocal.m4
similarity index 100%
rename from contrib/gdb/gdb/aclocal.m4
rename to gdb/aclocal.m4
diff --git a/contrib/gdb/gdb/ada-exp.c b/gdb/ada-exp.c
similarity index 100%
rename from contrib/gdb/gdb/ada-exp.c
rename to gdb/ada-exp.c
diff --git a/contrib/gdb/gdb/ada-exp.y b/gdb/ada-exp.y
similarity index 100%
rename from contrib/gdb/gdb/ada-exp.y
rename to gdb/ada-exp.y
diff --git a/contrib/gdb/gdb/ada-lang.c b/gdb/ada-lang.c
similarity index 100%
rename from contrib/gdb/gdb/ada-lang.c
rename to gdb/ada-lang.c
diff --git a/contrib/gdb/gdb/ada-lang.h b/gdb/ada-lang.h
similarity index 100%
rename from contrib/gdb/gdb/ada-lang.h
rename to gdb/ada-lang.h
diff --git a/contrib/gdb/gdb/ada-lex.l b/gdb/ada-lex.l
similarity index 100%
rename from contrib/gdb/gdb/ada-lex.l
rename to gdb/ada-lex.l
diff --git a/contrib/gdb/gdb/ada-tasks.c b/gdb/ada-tasks.c
similarity index 100%
rename from contrib/gdb/gdb/ada-tasks.c
rename to gdb/ada-tasks.c
diff --git a/contrib/gdb/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
similarity index 100%
rename from contrib/gdb/gdb/ada-typeprint.c
rename to gdb/ada-typeprint.c
diff --git a/contrib/gdb/gdb/ada-valprint.c b/gdb/ada-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/ada-valprint.c
rename to gdb/ada-valprint.c
diff --git a/contrib/gdb/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/alpha-mdebug-tdep.c
rename to gdb/alpha-mdebug-tdep.c
diff --git a/contrib/gdb/gdb/alpha-nat.c b/gdb/alpha-nat.c
similarity index 100%
rename from contrib/gdb/gdb/alpha-nat.c
rename to gdb/alpha-nat.c
diff --git a/contrib/gdb/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/alpha-tdep.c
rename to gdb/alpha-tdep.c
diff --git a/contrib/gdb/gdb/alpha-tdep.h b/gdb/alpha-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/alpha-tdep.h
rename to gdb/alpha-tdep.h
diff --git a/contrib/gdb/gdb/alphabsd-nat.c b/gdb/alphabsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/alphabsd-nat.c
rename to gdb/alphabsd-nat.c
diff --git a/contrib/gdb/gdb/alphabsd-tdep.c b/gdb/alphabsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/alphabsd-tdep.c
rename to gdb/alphabsd-tdep.c
diff --git a/contrib/gdb/gdb/alphabsd-tdep.h b/gdb/alphabsd-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/alphabsd-tdep.h
rename to gdb/alphabsd-tdep.h
diff --git a/contrib/gdb/gdb/alphafbsd-tdep.c b/gdb/alphafbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/alphafbsd-tdep.c
rename to gdb/alphafbsd-tdep.c
diff --git a/contrib/gdb/gdb/alphanbsd-tdep.c b/gdb/alphanbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/alphanbsd-tdep.c
rename to gdb/alphanbsd-tdep.c
diff --git a/contrib/gdb/gdb/amd64-nat.c b/gdb/amd64-nat.c
similarity index 100%
rename from contrib/gdb/gdb/amd64-nat.c
rename to gdb/amd64-nat.c
diff --git a/contrib/gdb/gdb/amd64-nat.h b/gdb/amd64-nat.h
similarity index 100%
rename from contrib/gdb/gdb/amd64-nat.h
rename to gdb/amd64-nat.h
diff --git a/contrib/gdb/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/amd64-tdep.c
rename to gdb/amd64-tdep.c
diff --git a/contrib/gdb/gdb/amd64-tdep.h b/gdb/amd64-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/amd64-tdep.h
rename to gdb/amd64-tdep.h
diff --git a/contrib/gdb/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/amd64bsd-nat.c
rename to gdb/amd64bsd-nat.c
diff --git a/contrib/gdb/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/amd64fbsd-nat.c
rename to gdb/amd64fbsd-nat.c
diff --git a/contrib/gdb/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/amd64fbsd-tdep.c
rename to gdb/amd64fbsd-tdep.c
diff --git a/contrib/gdb/gdb/amd64nbsd-nat.c b/gdb/amd64nbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/amd64nbsd-nat.c
rename to gdb/amd64nbsd-nat.c
diff --git a/contrib/gdb/gdb/amd64nbsd-tdep.c b/gdb/amd64nbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/amd64nbsd-tdep.c
rename to gdb/amd64nbsd-tdep.c
diff --git a/contrib/gdb/gdb/amd64obsd-nat.c b/gdb/amd64obsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/amd64obsd-nat.c
rename to gdb/amd64obsd-nat.c
diff --git a/contrib/gdb/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/amd64obsd-tdep.c
rename to gdb/amd64obsd-tdep.c
diff --git a/contrib/gdb/gdb/annotate.c b/gdb/annotate.c
similarity index 100%
rename from contrib/gdb/gdb/annotate.c
rename to gdb/annotate.c
diff --git a/contrib/gdb/gdb/annotate.h b/gdb/annotate.h
similarity index 100%
rename from contrib/gdb/gdb/annotate.h
rename to gdb/annotate.h
diff --git a/contrib/gdb/gdb/arch-utils.c b/gdb/arch-utils.c
similarity index 100%
rename from contrib/gdb/gdb/arch-utils.c
rename to gdb/arch-utils.c
diff --git a/contrib/gdb/gdb/arch-utils.h b/gdb/arch-utils.h
similarity index 100%
rename from contrib/gdb/gdb/arch-utils.h
rename to gdb/arch-utils.h
diff --git a/contrib/gdb/gdb/arm-tdep.c b/gdb/arm-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/arm-tdep.c
rename to gdb/arm-tdep.c
diff --git a/contrib/gdb/gdb/arm-tdep.h b/gdb/arm-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/arm-tdep.h
rename to gdb/arm-tdep.h
diff --git a/contrib/gdb/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/armnbsd-nat.c
rename to gdb/armnbsd-nat.c
diff --git a/contrib/gdb/gdb/armnbsd-tdep.c b/gdb/armnbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/armnbsd-tdep.c
rename to gdb/armnbsd-tdep.c
diff --git a/contrib/gdb/gdb/auxv.c b/gdb/auxv.c
similarity index 100%
rename from contrib/gdb/gdb/auxv.c
rename to gdb/auxv.c
diff --git a/contrib/gdb/gdb/auxv.h b/gdb/auxv.h
similarity index 100%
rename from contrib/gdb/gdb/auxv.h
rename to gdb/auxv.h
diff --git a/contrib/gdb/gdb/ax-gdb.c b/gdb/ax-gdb.c
similarity index 100%
rename from contrib/gdb/gdb/ax-gdb.c
rename to gdb/ax-gdb.c
diff --git a/contrib/gdb/gdb/ax-gdb.h b/gdb/ax-gdb.h
similarity index 100%
rename from contrib/gdb/gdb/ax-gdb.h
rename to gdb/ax-gdb.h
diff --git a/contrib/gdb/gdb/ax-general.c b/gdb/ax-general.c
similarity index 100%
rename from contrib/gdb/gdb/ax-general.c
rename to gdb/ax-general.c
diff --git a/contrib/gdb/gdb/ax.h b/gdb/ax.h
similarity index 100%
rename from contrib/gdb/gdb/ax.h
rename to gdb/ax.h
diff --git a/contrib/gdb/gdb/bcache.c b/gdb/bcache.c
similarity index 100%
rename from contrib/gdb/gdb/bcache.c
rename to gdb/bcache.c
diff --git a/contrib/gdb/gdb/bcache.h b/gdb/bcache.h
similarity index 100%
rename from contrib/gdb/gdb/bcache.h
rename to gdb/bcache.h
diff --git a/contrib/gdb/gdb/bfd-target.c b/gdb/bfd-target.c
similarity index 100%
rename from contrib/gdb/gdb/bfd-target.c
rename to gdb/bfd-target.c
diff --git a/contrib/gdb/gdb/bfd-target.h b/gdb/bfd-target.h
similarity index 100%
rename from contrib/gdb/gdb/bfd-target.h
rename to gdb/bfd-target.h
diff --git a/contrib/gdb/gdb/block.c b/gdb/block.c
similarity index 100%
rename from contrib/gdb/gdb/block.c
rename to gdb/block.c
diff --git a/contrib/gdb/gdb/block.h b/gdb/block.h
similarity index 100%
rename from contrib/gdb/gdb/block.h
rename to gdb/block.h
diff --git a/contrib/gdb/gdb/blockframe.c b/gdb/blockframe.c
similarity index 100%
rename from contrib/gdb/gdb/blockframe.c
rename to gdb/blockframe.c
diff --git a/contrib/gdb/gdb/breakpoint.c b/gdb/breakpoint.c
similarity index 100%
rename from contrib/gdb/gdb/breakpoint.c
rename to gdb/breakpoint.c
diff --git a/contrib/gdb/gdb/breakpoint.h b/gdb/breakpoint.h
similarity index 100%
rename from contrib/gdb/gdb/breakpoint.h
rename to gdb/breakpoint.h
diff --git a/contrib/gdb/gdb/buildsym.c b/gdb/buildsym.c
similarity index 100%
rename from contrib/gdb/gdb/buildsym.c
rename to gdb/buildsym.c
diff --git a/contrib/gdb/gdb/buildsym.h b/gdb/buildsym.h
similarity index 100%
rename from contrib/gdb/gdb/buildsym.h
rename to gdb/buildsym.h
diff --git a/contrib/gdb/gdb/c-exp.c b/gdb/c-exp.c
similarity index 100%
rename from contrib/gdb/gdb/c-exp.c
rename to gdb/c-exp.c
diff --git a/contrib/gdb/gdb/c-exp.y b/gdb/c-exp.y
similarity index 100%
rename from contrib/gdb/gdb/c-exp.y
rename to gdb/c-exp.y
diff --git a/contrib/gdb/gdb/c-lang.c b/gdb/c-lang.c
similarity index 100%
rename from contrib/gdb/gdb/c-lang.c
rename to gdb/c-lang.c
diff --git a/contrib/gdb/gdb/c-lang.h b/gdb/c-lang.h
similarity index 100%
rename from contrib/gdb/gdb/c-lang.h
rename to gdb/c-lang.h
diff --git a/contrib/gdb/gdb/c-typeprint.c b/gdb/c-typeprint.c
similarity index 100%
rename from contrib/gdb/gdb/c-typeprint.c
rename to gdb/c-typeprint.c
diff --git a/contrib/gdb/gdb/c-valprint.c b/gdb/c-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/c-valprint.c
rename to gdb/c-valprint.c
diff --git a/contrib/gdb/gdb/call-cmds.h b/gdb/call-cmds.h
similarity index 100%
rename from contrib/gdb/gdb/call-cmds.h
rename to gdb/call-cmds.h
diff --git a/contrib/gdb/gdb/charset.c b/gdb/charset.c
similarity index 100%
rename from contrib/gdb/gdb/charset.c
rename to gdb/charset.c
diff --git a/contrib/gdb/gdb/charset.h b/gdb/charset.h
similarity index 100%
rename from contrib/gdb/gdb/charset.h
rename to gdb/charset.h
diff --git a/contrib/gdb/gdb/cli-out.c b/gdb/cli-out.c
similarity index 100%
rename from contrib/gdb/gdb/cli-out.c
rename to gdb/cli-out.c
diff --git a/contrib/gdb/gdb/cli-out.h b/gdb/cli-out.h
similarity index 100%
rename from contrib/gdb/gdb/cli-out.h
rename to gdb/cli-out.h
diff --git a/contrib/gdb/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-cmds.c
rename to gdb/cli/cli-cmds.c
diff --git a/contrib/gdb/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-cmds.h
rename to gdb/cli/cli-cmds.h
diff --git a/contrib/gdb/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-decode.c
rename to gdb/cli/cli-decode.c
diff --git a/contrib/gdb/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-decode.h
rename to gdb/cli/cli-decode.h
diff --git a/contrib/gdb/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-dump.c
rename to gdb/cli/cli-dump.c
diff --git a/contrib/gdb/gdb/cli/cli-dump.h b/gdb/cli/cli-dump.h
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-dump.h
rename to gdb/cli/cli-dump.h
diff --git a/contrib/gdb/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-interp.c
rename to gdb/cli/cli-interp.c
diff --git a/contrib/gdb/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-logging.c
rename to gdb/cli/cli-logging.c
diff --git a/contrib/gdb/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-script.c
rename to gdb/cli/cli-script.c
diff --git a/contrib/gdb/gdb/cli/cli-script.h b/gdb/cli/cli-script.h
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-script.h
rename to gdb/cli/cli-script.h
diff --git a/contrib/gdb/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-setshow.c
rename to gdb/cli/cli-setshow.c
diff --git a/contrib/gdb/gdb/cli/cli-setshow.h b/gdb/cli/cli-setshow.h
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-setshow.h
rename to gdb/cli/cli-setshow.h
diff --git a/contrib/gdb/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-utils.c
rename to gdb/cli/cli-utils.c
diff --git a/contrib/gdb/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h
similarity index 100%
rename from contrib/gdb/gdb/cli/cli-utils.h
rename to gdb/cli/cli-utils.h
diff --git a/contrib/gdb/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
similarity index 100%
rename from contrib/gdb/gdb/coff-pe-read.c
rename to gdb/coff-pe-read.c
diff --git a/contrib/gdb/gdb/coff-pe-read.h b/gdb/coff-pe-read.h
similarity index 100%
rename from contrib/gdb/gdb/coff-pe-read.h
rename to gdb/coff-pe-read.h
diff --git a/contrib/gdb/gdb/coff-solib.c b/gdb/coff-solib.c
similarity index 100%
rename from contrib/gdb/gdb/coff-solib.c
rename to gdb/coff-solib.c
diff --git a/contrib/gdb/gdb/coff-solib.h b/gdb/coff-solib.h
similarity index 100%
rename from contrib/gdb/gdb/coff-solib.h
rename to gdb/coff-solib.h
diff --git a/contrib/gdb/gdb/coffread.c b/gdb/coffread.c
similarity index 100%
rename from contrib/gdb/gdb/coffread.c
rename to gdb/coffread.c
diff --git a/contrib/gdb/gdb/command.h b/gdb/command.h
similarity index 100%
rename from contrib/gdb/gdb/command.h
rename to gdb/command.h
diff --git a/contrib/gdb/gdb/complaints.c b/gdb/complaints.c
similarity index 100%
rename from contrib/gdb/gdb/complaints.c
rename to gdb/complaints.c
diff --git a/contrib/gdb/gdb/complaints.h b/gdb/complaints.h
similarity index 100%
rename from contrib/gdb/gdb/complaints.h
rename to gdb/complaints.h
diff --git a/contrib/gdb/gdb/completer.c b/gdb/completer.c
similarity index 100%
rename from contrib/gdb/gdb/completer.c
rename to gdb/completer.c
diff --git a/contrib/gdb/gdb/completer.h b/gdb/completer.h
similarity index 100%
rename from contrib/gdb/gdb/completer.h
rename to gdb/completer.h
diff --git a/contrib/gdb/gdb/config/alpha/alpha-osf2.mh b/gdb/config/alpha/alpha-osf2.mh
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/alpha-osf2.mh
rename to gdb/config/alpha/alpha-osf2.mh
diff --git a/contrib/gdb/gdb/config/alpha/alpha-osf3.mh b/gdb/config/alpha/alpha-osf3.mh
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/alpha-osf3.mh
rename to gdb/config/alpha/alpha-osf3.mh
diff --git a/contrib/gdb/gdb/config/alpha/alpha.mt b/gdb/config/alpha/alpha.mt
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/alpha.mt
rename to gdb/config/alpha/alpha.mt
diff --git a/contrib/gdb/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/fbsd.mh
rename to gdb/config/alpha/fbsd.mh
diff --git a/contrib/gdb/gdb/config/alpha/fbsd.mt b/gdb/config/alpha/fbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/fbsd.mt
rename to gdb/config/alpha/fbsd.mt
diff --git a/contrib/gdb/gdb/config/alpha/nbsd.mh b/gdb/config/alpha/nbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/nbsd.mh
rename to gdb/config/alpha/nbsd.mh
diff --git a/contrib/gdb/gdb/config/alpha/nbsd.mt b/gdb/config/alpha/nbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/nbsd.mt
rename to gdb/config/alpha/nbsd.mt
diff --git a/contrib/gdb/gdb/config/alpha/nm-fbsd.h b/gdb/config/alpha/nm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/nm-fbsd.h
rename to gdb/config/alpha/nm-fbsd.h
diff --git a/contrib/gdb/gdb/config/alpha/nm-nbsd.h b/gdb/config/alpha/nm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/nm-nbsd.h
rename to gdb/config/alpha/nm-nbsd.h
diff --git a/contrib/gdb/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/nm-osf.h
rename to gdb/config/alpha/nm-osf.h
diff --git a/contrib/gdb/gdb/config/alpha/nm-osf2.h b/gdb/config/alpha/nm-osf2.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/nm-osf2.h
rename to gdb/config/alpha/nm-osf2.h
diff --git a/contrib/gdb/gdb/config/alpha/nm-osf3.h b/gdb/config/alpha/nm-osf3.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/nm-osf3.h
rename to gdb/config/alpha/nm-osf3.h
diff --git a/contrib/gdb/gdb/config/alpha/tm-alpha.h b/gdb/config/alpha/tm-alpha.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/tm-alpha.h
rename to gdb/config/alpha/tm-alpha.h
diff --git a/contrib/gdb/gdb/config/alpha/tm-fbsd.h b/gdb/config/alpha/tm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/tm-fbsd.h
rename to gdb/config/alpha/tm-fbsd.h
diff --git a/contrib/gdb/gdb/config/alpha/tm-nbsd.h b/gdb/config/alpha/tm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/tm-nbsd.h
rename to gdb/config/alpha/tm-nbsd.h
diff --git a/contrib/gdb/gdb/config/alpha/xm-alphaosf.h b/gdb/config/alpha/xm-alphaosf.h
similarity index 100%
rename from contrib/gdb/gdb/config/alpha/xm-alphaosf.h
rename to gdb/config/alpha/xm-alphaosf.h
diff --git a/contrib/gdb/gdb/config/arm/embed.mt b/gdb/config/arm/embed.mt
similarity index 100%
rename from contrib/gdb/gdb/config/arm/embed.mt
rename to gdb/config/arm/embed.mt
diff --git a/contrib/gdb/gdb/config/arm/nbsd.mt b/gdb/config/arm/nbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/arm/nbsd.mt
rename to gdb/config/arm/nbsd.mt
diff --git a/contrib/gdb/gdb/config/arm/nbsdaout.mh b/gdb/config/arm/nbsdaout.mh
similarity index 100%
rename from contrib/gdb/gdb/config/arm/nbsdaout.mh
rename to gdb/config/arm/nbsdaout.mh
diff --git a/contrib/gdb/gdb/config/arm/nbsdelf.mh b/gdb/config/arm/nbsdelf.mh
similarity index 100%
rename from contrib/gdb/gdb/config/arm/nbsdelf.mh
rename to gdb/config/arm/nbsdelf.mh
diff --git a/contrib/gdb/gdb/config/arm/nm-nbsd.h b/gdb/config/arm/nm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/arm/nm-nbsd.h
rename to gdb/config/arm/nm-nbsd.h
diff --git a/contrib/gdb/gdb/config/arm/nm-nbsdaout.h b/gdb/config/arm/nm-nbsdaout.h
similarity index 100%
rename from contrib/gdb/gdb/config/arm/nm-nbsdaout.h
rename to gdb/config/arm/nm-nbsdaout.h
diff --git a/contrib/gdb/gdb/config/arm/tm-arm.h b/gdb/config/arm/tm-arm.h
similarity index 100%
rename from contrib/gdb/gdb/config/arm/tm-arm.h
rename to gdb/config/arm/tm-arm.h
diff --git a/contrib/gdb/gdb/config/arm/tm-embed.h b/gdb/config/arm/tm-embed.h
similarity index 100%
rename from contrib/gdb/gdb/config/arm/tm-embed.h
rename to gdb/config/arm/tm-embed.h
diff --git a/contrib/gdb/gdb/config/arm/tm-nbsd.h b/gdb/config/arm/tm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/arm/tm-nbsd.h
rename to gdb/config/arm/tm-nbsd.h
diff --git a/contrib/gdb/gdb/config/arm/tm-wince.h b/gdb/config/arm/tm-wince.h
similarity index 100%
rename from contrib/gdb/gdb/config/arm/tm-wince.h
rename to gdb/config/arm/tm-wince.h
diff --git a/contrib/gdb/gdb/config/arm/wince.mt b/gdb/config/arm/wince.mt
similarity index 100%
rename from contrib/gdb/gdb/config/arm/wince.mt
rename to gdb/config/arm/wince.mt
diff --git a/contrib/gdb/gdb/config/arm/xm-nbsd.h b/gdb/config/arm/xm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/arm/xm-nbsd.h
rename to gdb/config/arm/xm-nbsd.h
diff --git a/contrib/gdb/gdb/config/i386/embed.mt b/gdb/config/i386/embed.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/embed.mt
rename to gdb/config/i386/embed.mt
diff --git a/contrib/gdb/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/fbsd.mh
rename to gdb/config/i386/fbsd.mh
diff --git a/contrib/gdb/gdb/config/i386/fbsd.mt b/gdb/config/i386/fbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/fbsd.mt
rename to gdb/config/i386/fbsd.mt
diff --git a/contrib/gdb/gdb/config/i386/fbsd64.mh b/gdb/config/i386/fbsd64.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/fbsd64.mh
rename to gdb/config/i386/fbsd64.mh
diff --git a/contrib/gdb/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/fbsd64.mt
rename to gdb/config/i386/fbsd64.mt
diff --git a/contrib/gdb/gdb/config/i386/go32.mh b/gdb/config/i386/go32.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/go32.mh
rename to gdb/config/i386/go32.mh
diff --git a/contrib/gdb/gdb/config/i386/go32.mt b/gdb/config/i386/go32.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/go32.mt
rename to gdb/config/i386/go32.mt
diff --git a/contrib/gdb/gdb/config/i386/i386aout.mt b/gdb/config/i386/i386aout.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386aout.mt
rename to gdb/config/i386/i386aout.mt
diff --git a/contrib/gdb/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386gnu.mh
rename to gdb/config/i386/i386gnu.mh
diff --git a/contrib/gdb/gdb/config/i386/i386gnu.mt b/gdb/config/i386/i386gnu.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386gnu.mt
rename to gdb/config/i386/i386gnu.mt
diff --git a/contrib/gdb/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386lynx.mh
rename to gdb/config/i386/i386lynx.mh
diff --git a/contrib/gdb/gdb/config/i386/i386lynx.mt b/gdb/config/i386/i386lynx.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386lynx.mt
rename to gdb/config/i386/i386lynx.mt
diff --git a/contrib/gdb/gdb/config/i386/i386nw.mt b/gdb/config/i386/i386nw.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386nw.mt
rename to gdb/config/i386/i386nw.mt
diff --git a/contrib/gdb/gdb/config/i386/i386sco.mh b/gdb/config/i386/i386sco.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386sco.mh
rename to gdb/config/i386/i386sco.mh
diff --git a/contrib/gdb/gdb/config/i386/i386sco4.mh b/gdb/config/i386/i386sco4.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386sco4.mh
rename to gdb/config/i386/i386sco4.mh
diff --git a/contrib/gdb/gdb/config/i386/i386sco5.mh b/gdb/config/i386/i386sco5.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386sco5.mh
rename to gdb/config/i386/i386sco5.mh
diff --git a/contrib/gdb/gdb/config/i386/i386sol2.mh b/gdb/config/i386/i386sol2.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386sol2.mh
rename to gdb/config/i386/i386sol2.mh
diff --git a/contrib/gdb/gdb/config/i386/i386sol2.mt b/gdb/config/i386/i386sol2.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386sol2.mt
rename to gdb/config/i386/i386sol2.mt
diff --git a/contrib/gdb/gdb/config/i386/i386v.mh b/gdb/config/i386/i386v.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386v.mh
rename to gdb/config/i386/i386v.mh
diff --git a/contrib/gdb/gdb/config/i386/i386v.mt b/gdb/config/i386/i386v.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386v.mt
rename to gdb/config/i386/i386v.mt
diff --git a/contrib/gdb/gdb/config/i386/i386v4.mh b/gdb/config/i386/i386v4.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386v4.mh
rename to gdb/config/i386/i386v4.mh
diff --git a/contrib/gdb/gdb/config/i386/i386v42mp.mh b/gdb/config/i386/i386v42mp.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/i386v42mp.mh
rename to gdb/config/i386/i386v42mp.mh
diff --git a/contrib/gdb/gdb/config/i386/nbsd.mt b/gdb/config/i386/nbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nbsd.mt
rename to gdb/config/i386/nbsd.mt
diff --git a/contrib/gdb/gdb/config/i386/nbsd64.mh b/gdb/config/i386/nbsd64.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nbsd64.mh
rename to gdb/config/i386/nbsd64.mh
diff --git a/contrib/gdb/gdb/config/i386/nbsd64.mt b/gdb/config/i386/nbsd64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nbsd64.mt
rename to gdb/config/i386/nbsd64.mt
diff --git a/contrib/gdb/gdb/config/i386/nbsdaout.mh b/gdb/config/i386/nbsdaout.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nbsdaout.mh
rename to gdb/config/i386/nbsdaout.mh
diff --git a/contrib/gdb/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nbsdelf.mh
rename to gdb/config/i386/nbsdelf.mh
diff --git a/contrib/gdb/gdb/config/i386/ncr3000.mh b/gdb/config/i386/ncr3000.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/ncr3000.mh
rename to gdb/config/i386/ncr3000.mh
diff --git a/contrib/gdb/gdb/config/i386/ncr3000.mt b/gdb/config/i386/ncr3000.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/ncr3000.mt
rename to gdb/config/i386/ncr3000.mt
diff --git a/contrib/gdb/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-fbsd.h
rename to gdb/config/i386/nm-fbsd.h
diff --git a/contrib/gdb/gdb/config/i386/nm-fbsd64.h b/gdb/config/i386/nm-fbsd64.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-fbsd64.h
rename to gdb/config/i386/nm-fbsd64.h
diff --git a/contrib/gdb/gdb/config/i386/nm-go32.h b/gdb/config/i386/nm-go32.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-go32.h
rename to gdb/config/i386/nm-go32.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386.h b/gdb/config/i386/nm-i386.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386.h
rename to gdb/config/i386/nm-i386.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-i386gnu.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386gnu.h
rename to gdb/config/i386/nm-i386gnu.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386lynx.h b/gdb/config/i386/nm-i386lynx.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386lynx.h
rename to gdb/config/i386/nm-i386lynx.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386sco.h b/gdb/config/i386/nm-i386sco.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386sco.h
rename to gdb/config/i386/nm-i386sco.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386sco4.h b/gdb/config/i386/nm-i386sco4.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386sco4.h
rename to gdb/config/i386/nm-i386sco4.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386sco5.h b/gdb/config/i386/nm-i386sco5.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386sco5.h
rename to gdb/config/i386/nm-i386sco5.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386sol2.h b/gdb/config/i386/nm-i386sol2.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386sol2.h
rename to gdb/config/i386/nm-i386sol2.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386v.h b/gdb/config/i386/nm-i386v.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386v.h
rename to gdb/config/i386/nm-i386v.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386v4.h b/gdb/config/i386/nm-i386v4.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386v4.h
rename to gdb/config/i386/nm-i386v4.h
diff --git a/contrib/gdb/gdb/config/i386/nm-i386v42mp.h b/gdb/config/i386/nm-i386v42mp.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-i386v42mp.h
rename to gdb/config/i386/nm-i386v42mp.h
diff --git a/contrib/gdb/gdb/config/i386/nm-nbsd.h b/gdb/config/i386/nm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-nbsd.h
rename to gdb/config/i386/nm-nbsd.h
diff --git a/contrib/gdb/gdb/config/i386/nm-nbsdaout.h b/gdb/config/i386/nm-nbsdaout.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-nbsdaout.h
rename to gdb/config/i386/nm-nbsdaout.h
diff --git a/contrib/gdb/gdb/config/i386/nm-nto.h b/gdb/config/i386/nm-nto.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-nto.h
rename to gdb/config/i386/nm-nto.h
diff --git a/contrib/gdb/gdb/config/i386/nm-obsd.h b/gdb/config/i386/nm-obsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nm-obsd.h
rename to gdb/config/i386/nm-obsd.h
diff --git a/contrib/gdb/gdb/config/i386/nto.mh b/gdb/config/i386/nto.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nto.mh
rename to gdb/config/i386/nto.mh
diff --git a/contrib/gdb/gdb/config/i386/nto.mt b/gdb/config/i386/nto.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/nto.mt
rename to gdb/config/i386/nto.mt
diff --git a/contrib/gdb/gdb/config/i386/obsd.mh b/gdb/config/i386/obsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/obsd.mh
rename to gdb/config/i386/obsd.mh
diff --git a/contrib/gdb/gdb/config/i386/obsd.mt b/gdb/config/i386/obsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/obsd.mt
rename to gdb/config/i386/obsd.mt
diff --git a/contrib/gdb/gdb/config/i386/obsd64.mh b/gdb/config/i386/obsd64.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/obsd64.mh
rename to gdb/config/i386/obsd64.mh
diff --git a/contrib/gdb/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/obsd64.mt
rename to gdb/config/i386/obsd64.mt
diff --git a/contrib/gdb/gdb/config/i386/obsdaout.mh b/gdb/config/i386/obsdaout.mh
similarity index 100%
rename from contrib/gdb/gdb/config/i386/obsdaout.mh
rename to gdb/config/i386/obsdaout.mh
diff --git a/contrib/gdb/gdb/config/i386/tm-fbsd.h b/gdb/config/i386/tm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-fbsd.h
rename to gdb/config/i386/tm-fbsd.h
diff --git a/contrib/gdb/gdb/config/i386/tm-go32.h b/gdb/config/i386/tm-go32.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-go32.h
rename to gdb/config/i386/tm-go32.h
diff --git a/contrib/gdb/gdb/config/i386/tm-i386.h b/gdb/config/i386/tm-i386.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-i386.h
rename to gdb/config/i386/tm-i386.h
diff --git a/contrib/gdb/gdb/config/i386/tm-i386lynx.h b/gdb/config/i386/tm-i386lynx.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-i386lynx.h
rename to gdb/config/i386/tm-i386lynx.h
diff --git a/contrib/gdb/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-i386sol2.h
rename to gdb/config/i386/tm-i386sol2.h
diff --git a/contrib/gdb/gdb/config/i386/tm-nbsd.h b/gdb/config/i386/tm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-nbsd.h
rename to gdb/config/i386/tm-nbsd.h
diff --git a/contrib/gdb/gdb/config/i386/tm-nto.h b/gdb/config/i386/tm-nto.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-nto.h
rename to gdb/config/i386/tm-nto.h
diff --git a/contrib/gdb/gdb/config/i386/tm-vxworks.h b/gdb/config/i386/tm-vxworks.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/tm-vxworks.h
rename to gdb/config/i386/tm-vxworks.h
diff --git a/contrib/gdb/gdb/config/i386/vxworks.mt b/gdb/config/i386/vxworks.mt
similarity index 100%
rename from contrib/gdb/gdb/config/i386/vxworks.mt
rename to gdb/config/i386/vxworks.mt
diff --git a/contrib/gdb/gdb/config/i386/xm-go32.h b/gdb/config/i386/xm-go32.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/xm-go32.h
rename to gdb/config/i386/xm-go32.h
diff --git a/contrib/gdb/gdb/config/i386/xm-i386.h b/gdb/config/i386/xm-i386.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/xm-i386.h
rename to gdb/config/i386/xm-i386.h
diff --git a/contrib/gdb/gdb/config/i386/xm-i386sco.h b/gdb/config/i386/xm-i386sco.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/xm-i386sco.h
rename to gdb/config/i386/xm-i386sco.h
diff --git a/contrib/gdb/gdb/config/i386/xm-i386v.h b/gdb/config/i386/xm-i386v.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/xm-i386v.h
rename to gdb/config/i386/xm-i386v.h
diff --git a/contrib/gdb/gdb/config/i386/xm-i386v4.h b/gdb/config/i386/xm-i386v4.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/xm-i386v4.h
rename to gdb/config/i386/xm-i386v4.h
diff --git a/contrib/gdb/gdb/config/i386/xm-nbsd.h b/gdb/config/i386/xm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/i386/xm-nbsd.h
rename to gdb/config/i386/xm-nbsd.h
diff --git a/contrib/gdb/gdb/config/ia64/fbsd.mh b/gdb/config/ia64/fbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/ia64/fbsd.mh
rename to gdb/config/ia64/fbsd.mh
diff --git a/contrib/gdb/gdb/config/ia64/fbsd.mt b/gdb/config/ia64/fbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/ia64/fbsd.mt
rename to gdb/config/ia64/fbsd.mt
diff --git a/contrib/gdb/gdb/config/ia64/ia64.mt b/gdb/config/ia64/ia64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/ia64/ia64.mt
rename to gdb/config/ia64/ia64.mt
diff --git a/contrib/gdb/gdb/config/ia64/nm-fbsd.h b/gdb/config/ia64/nm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/ia64/nm-fbsd.h
rename to gdb/config/ia64/nm-fbsd.h
diff --git a/contrib/gdb/gdb/config/ia64/tm-fbsd.h b/gdb/config/ia64/tm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/ia64/tm-fbsd.h
rename to gdb/config/ia64/tm-fbsd.h
diff --git a/contrib/gdb/gdb/config/ia64/tm-ia64.h b/gdb/config/ia64/tm-ia64.h
similarity index 100%
rename from contrib/gdb/gdb/config/ia64/tm-ia64.h
rename to gdb/config/ia64/tm-ia64.h
diff --git a/contrib/gdb/gdb/config/mips/decstation.mh b/gdb/config/mips/decstation.mh
similarity index 100%
rename from contrib/gdb/gdb/config/mips/decstation.mh
rename to gdb/config/mips/decstation.mh
diff --git a/contrib/gdb/gdb/config/mips/embed.mt b/gdb/config/mips/embed.mt
similarity index 100%
rename from contrib/gdb/gdb/config/mips/embed.mt
rename to gdb/config/mips/embed.mt
diff --git a/contrib/gdb/gdb/config/mips/littlemips.mh b/gdb/config/mips/littlemips.mh
similarity index 100%
rename from contrib/gdb/gdb/config/mips/littlemips.mh
rename to gdb/config/mips/littlemips.mh
diff --git a/contrib/gdb/gdb/config/mips/mipsv4.mh b/gdb/config/mips/mipsv4.mh
similarity index 100%
rename from contrib/gdb/gdb/config/mips/mipsv4.mh
rename to gdb/config/mips/mipsv4.mh
diff --git a/contrib/gdb/gdb/config/mips/mipsv4.mt b/gdb/config/mips/mipsv4.mt
similarity index 100%
rename from contrib/gdb/gdb/config/mips/mipsv4.mt
rename to gdb/config/mips/mipsv4.mt
diff --git a/contrib/gdb/gdb/config/mips/nbsd.mh b/gdb/config/mips/nbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/mips/nbsd.mh
rename to gdb/config/mips/nbsd.mh
diff --git a/contrib/gdb/gdb/config/mips/nbsd.mt b/gdb/config/mips/nbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/mips/nbsd.mt
rename to gdb/config/mips/nbsd.mt
diff --git a/contrib/gdb/gdb/config/mips/news-mips.mh b/gdb/config/mips/news-mips.mh
similarity index 100%
rename from contrib/gdb/gdb/config/mips/news-mips.mh
rename to gdb/config/mips/news-mips.mh
diff --git a/contrib/gdb/gdb/config/mips/nm-mips.h b/gdb/config/mips/nm-mips.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/nm-mips.h
rename to gdb/config/mips/nm-mips.h
diff --git a/contrib/gdb/gdb/config/mips/nm-nbsd.h b/gdb/config/mips/nm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/nm-nbsd.h
rename to gdb/config/mips/nm-nbsd.h
diff --git a/contrib/gdb/gdb/config/mips/nm-news-mips.h b/gdb/config/mips/nm-news-mips.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/nm-news-mips.h
rename to gdb/config/mips/nm-news-mips.h
diff --git a/contrib/gdb/gdb/config/mips/nm-riscos.h b/gdb/config/mips/nm-riscos.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/nm-riscos.h
rename to gdb/config/mips/nm-riscos.h
diff --git a/contrib/gdb/gdb/config/mips/riscos.mh b/gdb/config/mips/riscos.mh
similarity index 100%
rename from contrib/gdb/gdb/config/mips/riscos.mh
rename to gdb/config/mips/riscos.mh
diff --git a/contrib/gdb/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/tm-mips.h
rename to gdb/config/mips/tm-mips.h
diff --git a/contrib/gdb/gdb/config/mips/tm-mipsv4.h b/gdb/config/mips/tm-mipsv4.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/tm-mipsv4.h
rename to gdb/config/mips/tm-mipsv4.h
diff --git a/contrib/gdb/gdb/config/mips/tm-nbsd.h b/gdb/config/mips/tm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/tm-nbsd.h
rename to gdb/config/mips/tm-nbsd.h
diff --git a/contrib/gdb/gdb/config/mips/tm-vxmips.h b/gdb/config/mips/tm-vxmips.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/tm-vxmips.h
rename to gdb/config/mips/tm-vxmips.h
diff --git a/contrib/gdb/gdb/config/mips/tm-wince.h b/gdb/config/mips/tm-wince.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/tm-wince.h
rename to gdb/config/mips/tm-wince.h
diff --git a/contrib/gdb/gdb/config/mips/vxmips.mt b/gdb/config/mips/vxmips.mt
similarity index 100%
rename from contrib/gdb/gdb/config/mips/vxmips.mt
rename to gdb/config/mips/vxmips.mt
diff --git a/contrib/gdb/gdb/config/mips/wince.mt b/gdb/config/mips/wince.mt
similarity index 100%
rename from contrib/gdb/gdb/config/mips/wince.mt
rename to gdb/config/mips/wince.mt
diff --git a/contrib/gdb/gdb/config/mips/xm-mips.h b/gdb/config/mips/xm-mips.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/xm-mips.h
rename to gdb/config/mips/xm-mips.h
diff --git a/contrib/gdb/gdb/config/mips/xm-mipsv4.h b/gdb/config/mips/xm-mipsv4.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/xm-mipsv4.h
rename to gdb/config/mips/xm-mipsv4.h
diff --git a/contrib/gdb/gdb/config/mips/xm-riscos.h b/gdb/config/mips/xm-riscos.h
similarity index 100%
rename from contrib/gdb/gdb/config/mips/xm-riscos.h
rename to gdb/config/mips/xm-riscos.h
diff --git a/contrib/gdb/gdb/config/nm-gnu.h b/gdb/config/nm-gnu.h
similarity index 100%
rename from contrib/gdb/gdb/config/nm-gnu.h
rename to gdb/config/nm-gnu.h
diff --git a/contrib/gdb/gdb/config/nm-lynx.h b/gdb/config/nm-lynx.h
similarity index 100%
rename from contrib/gdb/gdb/config/nm-lynx.h
rename to gdb/config/nm-lynx.h
diff --git a/contrib/gdb/gdb/config/nm-nbsd.h b/gdb/config/nm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/nm-nbsd.h
rename to gdb/config/nm-nbsd.h
diff --git a/contrib/gdb/gdb/config/nm-nbsdaout.h b/gdb/config/nm-nbsdaout.h
similarity index 100%
rename from contrib/gdb/gdb/config/nm-nbsdaout.h
rename to gdb/config/nm-nbsdaout.h
diff --git a/contrib/gdb/gdb/config/nm-sysv4.h b/gdb/config/nm-sysv4.h
similarity index 100%
rename from contrib/gdb/gdb/config/nm-sysv4.h
rename to gdb/config/nm-sysv4.h
diff --git a/contrib/gdb/gdb/config/powerpc/fbsd.mh b/gdb/config/powerpc/fbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/fbsd.mh
rename to gdb/config/powerpc/fbsd.mh
diff --git a/contrib/gdb/gdb/config/powerpc/fbsd.mt b/gdb/config/powerpc/fbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/fbsd.mt
rename to gdb/config/powerpc/fbsd.mt
diff --git a/contrib/gdb/gdb/config/powerpc/nbsd.mh b/gdb/config/powerpc/nbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/nbsd.mh
rename to gdb/config/powerpc/nbsd.mh
diff --git a/contrib/gdb/gdb/config/powerpc/nbsd.mt b/gdb/config/powerpc/nbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/nbsd.mt
rename to gdb/config/powerpc/nbsd.mt
diff --git a/contrib/gdb/gdb/config/powerpc/nm-fbsd.h b/gdb/config/powerpc/nm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/nm-fbsd.h
rename to gdb/config/powerpc/nm-fbsd.h
diff --git a/contrib/gdb/gdb/config/powerpc/nm-nbsd.h b/gdb/config/powerpc/nm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/nm-nbsd.h
rename to gdb/config/powerpc/nm-nbsd.h
diff --git a/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt b/gdb/config/powerpc/ppc-eabi.mt
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/ppc-eabi.mt
rename to gdb/config/powerpc/ppc-eabi.mt
diff --git a/contrib/gdb/gdb/config/powerpc/ppc-sim.mt b/gdb/config/powerpc/ppc-sim.mt
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/ppc-sim.mt
rename to gdb/config/powerpc/ppc-sim.mt
diff --git a/contrib/gdb/gdb/config/powerpc/tm-nbsd.h b/gdb/config/powerpc/tm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/tm-nbsd.h
rename to gdb/config/powerpc/tm-nbsd.h
diff --git a/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h b/gdb/config/powerpc/tm-ppc-eabi.h
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h
rename to gdb/config/powerpc/tm-ppc-eabi.h
diff --git a/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h b/gdb/config/powerpc/tm-ppcle-eabi.h
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h
rename to gdb/config/powerpc/tm-ppcle-eabi.h
diff --git a/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h b/gdb/config/powerpc/tm-ppcle-sim.h
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h
rename to gdb/config/powerpc/tm-ppcle-sim.h
diff --git a/contrib/gdb/gdb/config/powerpc/tm-vxworks.h b/gdb/config/powerpc/tm-vxworks.h
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/tm-vxworks.h
rename to gdb/config/powerpc/tm-vxworks.h
diff --git a/contrib/gdb/gdb/config/powerpc/vxworks.mt b/gdb/config/powerpc/vxworks.mt
similarity index 100%
rename from contrib/gdb/gdb/config/powerpc/vxworks.mt
rename to gdb/config/powerpc/vxworks.mt
diff --git a/contrib/gdb/gdb/config/rs6000/nm-rs6000.h b/gdb/config/rs6000/nm-rs6000.h
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/nm-rs6000.h
rename to gdb/config/rs6000/nm-rs6000.h
diff --git a/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h b/gdb/config/rs6000/nm-rs6000ly.h
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h
rename to gdb/config/rs6000/nm-rs6000ly.h
diff --git a/contrib/gdb/gdb/config/rs6000/rs6000.mh b/gdb/config/rs6000/rs6000.mh
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/rs6000.mh
rename to gdb/config/rs6000/rs6000.mh
diff --git a/contrib/gdb/gdb/config/rs6000/rs6000.mt b/gdb/config/rs6000/rs6000.mt
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/rs6000.mt
rename to gdb/config/rs6000/rs6000.mt
diff --git a/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh b/gdb/config/rs6000/rs6000lynx.mh
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/rs6000lynx.mh
rename to gdb/config/rs6000/rs6000lynx.mh
diff --git a/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt b/gdb/config/rs6000/rs6000lynx.mt
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/rs6000lynx.mt
rename to gdb/config/rs6000/rs6000lynx.mt
diff --git a/contrib/gdb/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/tm-rs6000.h
rename to gdb/config/rs6000/tm-rs6000.h
diff --git a/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h b/gdb/config/rs6000/tm-rs6000ly.h
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h
rename to gdb/config/rs6000/tm-rs6000ly.h
diff --git a/contrib/gdb/gdb/config/rs6000/xm-rs6000.h b/gdb/config/rs6000/xm-rs6000.h
similarity index 100%
rename from contrib/gdb/gdb/config/rs6000/xm-rs6000.h
rename to gdb/config/rs6000/xm-rs6000.h
diff --git a/contrib/gdb/gdb/config/s390/s390.mh b/gdb/config/s390/s390.mh
similarity index 100%
rename from contrib/gdb/gdb/config/s390/s390.mh
rename to gdb/config/s390/s390.mh
diff --git a/contrib/gdb/gdb/config/s390/s390.mt b/gdb/config/s390/s390.mt
similarity index 100%
rename from contrib/gdb/gdb/config/s390/s390.mt
rename to gdb/config/s390/s390.mt
diff --git a/contrib/gdb/gdb/config/sparc/fbsd.mh b/gdb/config/sparc/fbsd.mh
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/fbsd.mh
rename to gdb/config/sparc/fbsd.mh
diff --git a/contrib/gdb/gdb/config/sparc/fbsd.mt b/gdb/config/sparc/fbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/fbsd.mt
rename to gdb/config/sparc/fbsd.mt
diff --git a/contrib/gdb/gdb/config/sparc/nbsd.mt b/gdb/config/sparc/nbsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nbsd.mt
rename to gdb/config/sparc/nbsd.mt
diff --git a/contrib/gdb/gdb/config/sparc/nbsd64.mh b/gdb/config/sparc/nbsd64.mh
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nbsd64.mh
rename to gdb/config/sparc/nbsd64.mh
diff --git a/contrib/gdb/gdb/config/sparc/nbsd64.mt b/gdb/config/sparc/nbsd64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nbsd64.mt
rename to gdb/config/sparc/nbsd64.mt
diff --git a/contrib/gdb/gdb/config/sparc/nbsdaout.mh b/gdb/config/sparc/nbsdaout.mh
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nbsdaout.mh
rename to gdb/config/sparc/nbsdaout.mh
diff --git a/contrib/gdb/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nbsdelf.mh
rename to gdb/config/sparc/nbsdelf.mh
diff --git a/contrib/gdb/gdb/config/sparc/nm-fbsd.h b/gdb/config/sparc/nm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nm-fbsd.h
rename to gdb/config/sparc/nm-fbsd.h
diff --git a/contrib/gdb/gdb/config/sparc/nm-nbsd.h b/gdb/config/sparc/nm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nm-nbsd.h
rename to gdb/config/sparc/nm-nbsd.h
diff --git a/contrib/gdb/gdb/config/sparc/nm-nbsdaout.h b/gdb/config/sparc/nm-nbsdaout.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nm-nbsdaout.h
rename to gdb/config/sparc/nm-nbsdaout.h
diff --git a/contrib/gdb/gdb/config/sparc/nm-sol2.h b/gdb/config/sparc/nm-sol2.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/nm-sol2.h
rename to gdb/config/sparc/nm-sol2.h
diff --git a/contrib/gdb/gdb/config/sparc/obsd.mt b/gdb/config/sparc/obsd.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/obsd.mt
rename to gdb/config/sparc/obsd.mt
diff --git a/contrib/gdb/gdb/config/sparc/obsd64.mt b/gdb/config/sparc/obsd64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/obsd64.mt
rename to gdb/config/sparc/obsd64.mt
diff --git a/contrib/gdb/gdb/config/sparc/sol2-64.mt b/gdb/config/sparc/sol2-64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/sol2-64.mt
rename to gdb/config/sparc/sol2-64.mt
diff --git a/contrib/gdb/gdb/config/sparc/sol2.mh b/gdb/config/sparc/sol2.mh
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/sol2.mh
rename to gdb/config/sparc/sol2.mh
diff --git a/contrib/gdb/gdb/config/sparc/sol2.mt b/gdb/config/sparc/sol2.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/sol2.mt
rename to gdb/config/sparc/sol2.mt
diff --git a/contrib/gdb/gdb/config/sparc/sparc.mt b/gdb/config/sparc/sparc.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/sparc.mt
rename to gdb/config/sparc/sparc.mt
diff --git a/contrib/gdb/gdb/config/sparc/sparc64.mt b/gdb/config/sparc/sparc64.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/sparc64.mt
rename to gdb/config/sparc/sparc64.mt
diff --git a/contrib/gdb/gdb/config/sparc/tm-fbsd.h b/gdb/config/sparc/tm-fbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/tm-fbsd.h
rename to gdb/config/sparc/tm-fbsd.h
diff --git a/contrib/gdb/gdb/config/sparc/tm-nbsd.h b/gdb/config/sparc/tm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/tm-nbsd.h
rename to gdb/config/sparc/tm-nbsd.h
diff --git a/contrib/gdb/gdb/config/sparc/tm-nbsd64.h b/gdb/config/sparc/tm-nbsd64.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/tm-nbsd64.h
rename to gdb/config/sparc/tm-nbsd64.h
diff --git a/contrib/gdb/gdb/config/sparc/tm-sol2.h b/gdb/config/sparc/tm-sol2.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/tm-sol2.h
rename to gdb/config/sparc/tm-sol2.h
diff --git a/contrib/gdb/gdb/config/sparc/tm-vxworks.h b/gdb/config/sparc/tm-vxworks.h
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/tm-vxworks.h
rename to gdb/config/sparc/tm-vxworks.h
diff --git a/contrib/gdb/gdb/config/sparc/vxworks.mt b/gdb/config/sparc/vxworks.mt
similarity index 100%
rename from contrib/gdb/gdb/config/sparc/vxworks.mt
rename to gdb/config/sparc/vxworks.mt
diff --git a/contrib/gdb/gdb/config/tm-lynx.h b/gdb/config/tm-lynx.h
similarity index 100%
rename from contrib/gdb/gdb/config/tm-lynx.h
rename to gdb/config/tm-lynx.h
diff --git a/contrib/gdb/gdb/config/tm-nto.h b/gdb/config/tm-nto.h
similarity index 100%
rename from contrib/gdb/gdb/config/tm-nto.h
rename to gdb/config/tm-nto.h
diff --git a/contrib/gdb/gdb/config/tm-sunos.h b/gdb/config/tm-sunos.h
similarity index 100%
rename from contrib/gdb/gdb/config/tm-sunos.h
rename to gdb/config/tm-sunos.h
diff --git a/contrib/gdb/gdb/config/tm-sysv4.h b/gdb/config/tm-sysv4.h
similarity index 100%
rename from contrib/gdb/gdb/config/tm-sysv4.h
rename to gdb/config/tm-sysv4.h
diff --git a/contrib/gdb/gdb/config/tm-vxworks.h b/gdb/config/tm-vxworks.h
similarity index 100%
rename from contrib/gdb/gdb/config/tm-vxworks.h
rename to gdb/config/tm-vxworks.h
diff --git a/contrib/gdb/gdb/config/xm-nbsd.h b/gdb/config/xm-nbsd.h
similarity index 100%
rename from contrib/gdb/gdb/config/xm-nbsd.h
rename to gdb/config/xm-nbsd.h
diff --git a/contrib/gdb/gdb/config/xm-sysv4.h b/gdb/config/xm-sysv4.h
similarity index 100%
rename from contrib/gdb/gdb/config/xm-sysv4.h
rename to gdb/config/xm-sysv4.h
diff --git a/contrib/gdb/gdb/copying.awk b/gdb/copying.awk
similarity index 100%
rename from contrib/gdb/gdb/copying.awk
rename to gdb/copying.awk
diff --git a/contrib/gdb/gdb/copying.c b/gdb/copying.c
similarity index 100%
rename from contrib/gdb/gdb/copying.c
rename to gdb/copying.c
diff --git a/contrib/gdb/gdb/core-aout.c b/gdb/core-aout.c
similarity index 100%
rename from contrib/gdb/gdb/core-aout.c
rename to gdb/core-aout.c
diff --git a/contrib/gdb/gdb/core-regset.c b/gdb/core-regset.c
similarity index 100%
rename from contrib/gdb/gdb/core-regset.c
rename to gdb/core-regset.c
diff --git a/contrib/gdb/gdb/corefile.c b/gdb/corefile.c
similarity index 100%
rename from contrib/gdb/gdb/corefile.c
rename to gdb/corefile.c
diff --git a/contrib/gdb/gdb/corelow.c b/gdb/corelow.c
similarity index 100%
rename from contrib/gdb/gdb/corelow.c
rename to gdb/corelow.c
diff --git a/contrib/gdb/gdb/cp-abi.c b/gdb/cp-abi.c
similarity index 100%
rename from contrib/gdb/gdb/cp-abi.c
rename to gdb/cp-abi.c
diff --git a/contrib/gdb/gdb/cp-abi.h b/gdb/cp-abi.h
similarity index 100%
rename from contrib/gdb/gdb/cp-abi.h
rename to gdb/cp-abi.h
diff --git a/contrib/gdb/gdb/cp-namespace.c b/gdb/cp-namespace.c
similarity index 100%
rename from contrib/gdb/gdb/cp-namespace.c
rename to gdb/cp-namespace.c
diff --git a/contrib/gdb/gdb/cp-support.c b/gdb/cp-support.c
similarity index 100%
rename from contrib/gdb/gdb/cp-support.c
rename to gdb/cp-support.c
diff --git a/contrib/gdb/gdb/cp-support.h b/gdb/cp-support.h
similarity index 100%
rename from contrib/gdb/gdb/cp-support.h
rename to gdb/cp-support.h
diff --git a/contrib/gdb/gdb/cp-valprint.c b/gdb/cp-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/cp-valprint.c
rename to gdb/cp-valprint.c
diff --git a/contrib/gdb/gdb/cpu32bug-rom.c b/gdb/cpu32bug-rom.c
similarity index 100%
rename from contrib/gdb/gdb/cpu32bug-rom.c
rename to gdb/cpu32bug-rom.c
diff --git a/contrib/gdb/gdb/dbug-rom.c b/gdb/dbug-rom.c
similarity index 100%
rename from contrib/gdb/gdb/dbug-rom.c
rename to gdb/dbug-rom.c
diff --git a/contrib/gdb/gdb/dbxread.c b/gdb/dbxread.c
similarity index 100%
rename from contrib/gdb/gdb/dbxread.c
rename to gdb/dbxread.c
diff --git a/contrib/gdb/gdb/dcache.c b/gdb/dcache.c
similarity index 100%
rename from contrib/gdb/gdb/dcache.c
rename to gdb/dcache.c
diff --git a/contrib/gdb/gdb/dcache.h b/gdb/dcache.h
similarity index 100%
rename from contrib/gdb/gdb/dcache.h
rename to gdb/dcache.h
diff --git a/contrib/gdb/gdb/defs.h b/gdb/defs.h
similarity index 100%
rename from contrib/gdb/gdb/defs.h
rename to gdb/defs.h
diff --git a/contrib/gdb/gdb/delta68-nat.c b/gdb/delta68-nat.c
similarity index 100%
rename from contrib/gdb/gdb/delta68-nat.c
rename to gdb/delta68-nat.c
diff --git a/contrib/gdb/gdb/demangle.c b/gdb/demangle.c
similarity index 100%
rename from contrib/gdb/gdb/demangle.c
rename to gdb/demangle.c
diff --git a/contrib/gdb/gdb/dictionary.c b/gdb/dictionary.c
similarity index 100%
rename from contrib/gdb/gdb/dictionary.c
rename to gdb/dictionary.c
diff --git a/contrib/gdb/gdb/dictionary.h b/gdb/dictionary.h
similarity index 100%
rename from contrib/gdb/gdb/dictionary.h
rename to gdb/dictionary.h
diff --git a/contrib/gdb/gdb/dink32-rom.c b/gdb/dink32-rom.c
similarity index 100%
rename from contrib/gdb/gdb/dink32-rom.c
rename to gdb/dink32-rom.c
diff --git a/contrib/gdb/gdb/disasm.c b/gdb/disasm.c
similarity index 100%
rename from contrib/gdb/gdb/disasm.c
rename to gdb/disasm.c
diff --git a/contrib/gdb/gdb/disasm.h b/gdb/disasm.h
similarity index 100%
rename from contrib/gdb/gdb/disasm.h
rename to gdb/disasm.h
diff --git a/contrib/gdb/gdb/doc/GDBvn.texi b/gdb/doc/GDBvn.texi
similarity index 100%
rename from contrib/gdb/gdb/doc/GDBvn.texi
rename to gdb/doc/GDBvn.texi
diff --git a/contrib/gdb/gdb/doc/LRS b/gdb/doc/LRS
similarity index 100%
rename from contrib/gdb/gdb/doc/LRS
rename to gdb/doc/LRS
diff --git a/contrib/gdb/gdb/doc/a4rc.sed b/gdb/doc/a4rc.sed
similarity index 100%
rename from contrib/gdb/gdb/doc/a4rc.sed
rename to gdb/doc/a4rc.sed
diff --git a/contrib/gdb/gdb/doc/agentexpr.texi b/gdb/doc/agentexpr.texi
similarity index 100%
rename from contrib/gdb/gdb/doc/agentexpr.texi
rename to gdb/doc/agentexpr.texi
diff --git a/contrib/gdb/gdb/doc/all-cfg.texi b/gdb/doc/all-cfg.texi
similarity index 100%
rename from contrib/gdb/gdb/doc/all-cfg.texi
rename to gdb/doc/all-cfg.texi
diff --git a/contrib/gdb/gdb/doc/annotate.texinfo b/gdb/doc/annotate.texinfo
similarity index 100%
rename from contrib/gdb/gdb/doc/annotate.texinfo
rename to gdb/doc/annotate.texinfo
diff --git a/contrib/gdb/gdb/doc/fdl.texi b/gdb/doc/fdl.texi
similarity index 100%
rename from contrib/gdb/gdb/doc/fdl.texi
rename to gdb/doc/fdl.texi
diff --git a/contrib/gdb/gdb/doc/gdb.info-1 b/gdb/doc/gdb.info-1
similarity index 100%
rename from contrib/gdb/gdb/doc/gdb.info-1
rename to gdb/doc/gdb.info-1
diff --git a/contrib/gdb/gdb/doc/gdb.info-2 b/gdb/doc/gdb.info-2
similarity index 100%
rename from contrib/gdb/gdb/doc/gdb.info-2
rename to gdb/doc/gdb.info-2
diff --git a/contrib/gdb/gdb/doc/gdb.info-3 b/gdb/doc/gdb.info-3
similarity index 100%
rename from contrib/gdb/gdb/doc/gdb.info-3
rename to gdb/doc/gdb.info-3
diff --git a/contrib/gdb/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
similarity index 100%
rename from contrib/gdb/gdb/doc/gdb.texinfo
rename to gdb/doc/gdb.texinfo
diff --git a/contrib/gdb/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
similarity index 100%
rename from contrib/gdb/gdb/doc/gdbint.texinfo
rename to gdb/doc/gdbint.texinfo
diff --git a/contrib/gdb/gdb/doc/gpl.texi b/gdb/doc/gpl.texi
similarity index 100%
rename from contrib/gdb/gdb/doc/gpl.texi
rename to gdb/doc/gpl.texi
diff --git a/contrib/gdb/gdb/doc/lpsrc.sed b/gdb/doc/lpsrc.sed
similarity index 100%
rename from contrib/gdb/gdb/doc/lpsrc.sed
rename to gdb/doc/lpsrc.sed
diff --git a/contrib/gdb/gdb/doc/observer.texi b/gdb/doc/observer.texi
similarity index 100%
rename from contrib/gdb/gdb/doc/observer.texi
rename to gdb/doc/observer.texi
diff --git a/contrib/gdb/gdb/doc/psrc.sed b/gdb/doc/psrc.sed
similarity index 100%
rename from contrib/gdb/gdb/doc/psrc.sed
rename to gdb/doc/psrc.sed
diff --git a/contrib/gdb/gdb/doc/refcard.tex b/gdb/doc/refcard.tex
similarity index 100%
rename from contrib/gdb/gdb/doc/refcard.tex
rename to gdb/doc/refcard.tex
diff --git a/contrib/gdb/gdb/doc/stabs.texinfo b/gdb/doc/stabs.texinfo
similarity index 100%
rename from contrib/gdb/gdb/doc/stabs.texinfo
rename to gdb/doc/stabs.texinfo
diff --git a/contrib/gdb/gdb/doublest.c b/gdb/doublest.c
similarity index 100%
rename from contrib/gdb/gdb/doublest.c
rename to gdb/doublest.c
diff --git a/contrib/gdb/gdb/doublest.h b/gdb/doublest.h
similarity index 100%
rename from contrib/gdb/gdb/doublest.h
rename to gdb/doublest.h
diff --git a/contrib/gdb/gdb/dpx2-nat.c b/gdb/dpx2-nat.c
similarity index 100%
rename from contrib/gdb/gdb/dpx2-nat.c
rename to gdb/dpx2-nat.c
diff --git a/contrib/gdb/gdb/dsrec.c b/gdb/dsrec.c
similarity index 100%
rename from contrib/gdb/gdb/dsrec.c
rename to gdb/dsrec.c
diff --git a/contrib/gdb/gdb/dummy-frame.c b/gdb/dummy-frame.c
similarity index 100%
rename from contrib/gdb/gdb/dummy-frame.c
rename to gdb/dummy-frame.c
diff --git a/contrib/gdb/gdb/dummy-frame.h b/gdb/dummy-frame.h
similarity index 100%
rename from contrib/gdb/gdb/dummy-frame.h
rename to gdb/dummy-frame.h
diff --git a/contrib/gdb/gdb/dve3900-rom.c b/gdb/dve3900-rom.c
similarity index 100%
rename from contrib/gdb/gdb/dve3900-rom.c
rename to gdb/dve3900-rom.c
diff --git a/contrib/gdb/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
similarity index 100%
rename from contrib/gdb/gdb/dwarf2-frame.c
rename to gdb/dwarf2-frame.c
diff --git a/contrib/gdb/gdb/dwarf2-frame.h b/gdb/dwarf2-frame.h
similarity index 100%
rename from contrib/gdb/gdb/dwarf2-frame.h
rename to gdb/dwarf2-frame.h
diff --git a/contrib/gdb/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
similarity index 100%
rename from contrib/gdb/gdb/dwarf2expr.c
rename to gdb/dwarf2expr.c
diff --git a/contrib/gdb/gdb/dwarf2expr.h b/gdb/dwarf2expr.h
similarity index 100%
rename from contrib/gdb/gdb/dwarf2expr.h
rename to gdb/dwarf2expr.h
diff --git a/contrib/gdb/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
similarity index 100%
rename from contrib/gdb/gdb/dwarf2loc.c
rename to gdb/dwarf2loc.c
diff --git a/contrib/gdb/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
similarity index 100%
rename from contrib/gdb/gdb/dwarf2loc.h
rename to gdb/dwarf2loc.h
diff --git a/contrib/gdb/gdb/dwarf2read.c b/gdb/dwarf2read.c
similarity index 100%
rename from contrib/gdb/gdb/dwarf2read.c
rename to gdb/dwarf2read.c
diff --git a/contrib/gdb/gdb/dwarfread.c b/gdb/dwarfread.c
similarity index 100%
rename from contrib/gdb/gdb/dwarfread.c
rename to gdb/dwarfread.c
diff --git a/contrib/gdb/gdb/elfread.c b/gdb/elfread.c
similarity index 100%
rename from contrib/gdb/gdb/elfread.c
rename to gdb/elfread.c
diff --git a/contrib/gdb/gdb/environ.c b/gdb/environ.c
similarity index 100%
rename from contrib/gdb/gdb/environ.c
rename to gdb/environ.c
diff --git a/contrib/gdb/gdb/environ.h b/gdb/environ.h
similarity index 100%
rename from contrib/gdb/gdb/environ.h
rename to gdb/environ.h
diff --git a/contrib/gdb/gdb/eval.c b/gdb/eval.c
similarity index 100%
rename from contrib/gdb/gdb/eval.c
rename to gdb/eval.c
diff --git a/contrib/gdb/gdb/event-loop.c b/gdb/event-loop.c
similarity index 100%
rename from contrib/gdb/gdb/event-loop.c
rename to gdb/event-loop.c
diff --git a/contrib/gdb/gdb/event-loop.h b/gdb/event-loop.h
similarity index 100%
rename from contrib/gdb/gdb/event-loop.h
rename to gdb/event-loop.h
diff --git a/contrib/gdb/gdb/event-top.c b/gdb/event-top.c
similarity index 100%
rename from contrib/gdb/gdb/event-top.c
rename to gdb/event-top.c
diff --git a/contrib/gdb/gdb/event-top.h b/gdb/event-top.h
similarity index 100%
rename from contrib/gdb/gdb/event-top.h
rename to gdb/event-top.h
diff --git a/contrib/gdb/gdb/exc_request.defs b/gdb/exc_request.defs
similarity index 100%
rename from contrib/gdb/gdb/exc_request.defs
rename to gdb/exc_request.defs
diff --git a/contrib/gdb/gdb/exec.c b/gdb/exec.c
similarity index 100%
rename from contrib/gdb/gdb/exec.c
rename to gdb/exec.c
diff --git a/contrib/gdb/gdb/exec.h b/gdb/exec.h
similarity index 100%
rename from contrib/gdb/gdb/exec.h
rename to gdb/exec.h
diff --git a/contrib/gdb/gdb/expprint.c b/gdb/expprint.c
similarity index 100%
rename from contrib/gdb/gdb/expprint.c
rename to gdb/expprint.c
diff --git a/contrib/gdb/gdb/expression.h b/gdb/expression.h
similarity index 100%
rename from contrib/gdb/gdb/expression.h
rename to gdb/expression.h
diff --git a/contrib/gdb/gdb/f-exp.c b/gdb/f-exp.c
similarity index 100%
rename from contrib/gdb/gdb/f-exp.c
rename to gdb/f-exp.c
diff --git a/contrib/gdb/gdb/f-exp.y b/gdb/f-exp.y
similarity index 100%
rename from contrib/gdb/gdb/f-exp.y
rename to gdb/f-exp.y
diff --git a/contrib/gdb/gdb/f-lang.c b/gdb/f-lang.c
similarity index 100%
rename from contrib/gdb/gdb/f-lang.c
rename to gdb/f-lang.c
diff --git a/contrib/gdb/gdb/f-lang.h b/gdb/f-lang.h
similarity index 100%
rename from contrib/gdb/gdb/f-lang.h
rename to gdb/f-lang.h
diff --git a/contrib/gdb/gdb/f-typeprint.c b/gdb/f-typeprint.c
similarity index 100%
rename from contrib/gdb/gdb/f-typeprint.c
rename to gdb/f-typeprint.c
diff --git a/contrib/gdb/gdb/f-valprint.c b/gdb/f-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/f-valprint.c
rename to gdb/f-valprint.c
diff --git a/contrib/gdb/gdb/fbsd-proc.c b/gdb/fbsd-proc.c
similarity index 100%
rename from contrib/gdb/gdb/fbsd-proc.c
rename to gdb/fbsd-proc.c
diff --git a/contrib/gdb/gdb/findvar.c b/gdb/findvar.c
similarity index 100%
rename from contrib/gdb/gdb/findvar.c
rename to gdb/findvar.c
diff --git a/contrib/gdb/gdb/fork-child.c b/gdb/fork-child.c
similarity index 100%
rename from contrib/gdb/gdb/fork-child.c
rename to gdb/fork-child.c
diff --git a/contrib/gdb/gdb/frame-base.c b/gdb/frame-base.c
similarity index 100%
rename from contrib/gdb/gdb/frame-base.c
rename to gdb/frame-base.c
diff --git a/contrib/gdb/gdb/frame-base.h b/gdb/frame-base.h
similarity index 100%
rename from contrib/gdb/gdb/frame-base.h
rename to gdb/frame-base.h
diff --git a/contrib/gdb/gdb/frame-unwind.c b/gdb/frame-unwind.c
similarity index 100%
rename from contrib/gdb/gdb/frame-unwind.c
rename to gdb/frame-unwind.c
diff --git a/contrib/gdb/gdb/frame-unwind.h b/gdb/frame-unwind.h
similarity index 100%
rename from contrib/gdb/gdb/frame-unwind.h
rename to gdb/frame-unwind.h
diff --git a/contrib/gdb/gdb/frame.c b/gdb/frame.c
similarity index 100%
rename from contrib/gdb/gdb/frame.c
rename to gdb/frame.c
diff --git a/contrib/gdb/gdb/frame.h b/gdb/frame.h
similarity index 100%
rename from contrib/gdb/gdb/frame.h
rename to gdb/frame.h
diff --git a/contrib/gdb/gdb/gcore.c b/gdb/gcore.c
similarity index 100%
rename from contrib/gdb/gdb/gcore.c
rename to gdb/gcore.c
diff --git a/contrib/gdb/gdb/gdb-events.c b/gdb/gdb-events.c
similarity index 100%
rename from contrib/gdb/gdb/gdb-events.c
rename to gdb/gdb-events.c
diff --git a/contrib/gdb/gdb/gdb-events.h b/gdb/gdb-events.h
similarity index 100%
rename from contrib/gdb/gdb/gdb-events.h
rename to gdb/gdb-events.h
diff --git a/contrib/gdb/gdb/gdb-events.sh b/gdb/gdb-events.sh
similarity index 100%
rename from contrib/gdb/gdb/gdb-events.sh
rename to gdb/gdb-events.sh
diff --git a/contrib/gdb/gdb/gdb-stabs.h b/gdb/gdb-stabs.h
similarity index 100%
rename from contrib/gdb/gdb/gdb-stabs.h
rename to gdb/gdb-stabs.h
diff --git a/contrib/gdb/gdb/gdb.1 b/gdb/gdb.1
similarity index 100%
rename from contrib/gdb/gdb/gdb.1
rename to gdb/gdb.1
diff --git a/contrib/gdb/gdb/gdb.c b/gdb/gdb.c
similarity index 100%
rename from contrib/gdb/gdb/gdb.c
rename to gdb/gdb.c
diff --git a/contrib/gdb/gdb/gdb.gdb b/gdb/gdb.gdb
similarity index 100%
rename from contrib/gdb/gdb/gdb.gdb
rename to gdb/gdb.gdb
diff --git a/contrib/gdb/gdb/gdb.h b/gdb/gdb.h
similarity index 100%
rename from contrib/gdb/gdb/gdb.h
rename to gdb/gdb.h
diff --git a/contrib/gdb/gdb/gdb_assert.h b/gdb/gdb_assert.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_assert.h
rename to gdb/gdb_assert.h
diff --git a/contrib/gdb/gdb/gdb_curses.h b/gdb/gdb_curses.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_curses.h
rename to gdb/gdb_curses.h
diff --git a/contrib/gdb/gdb/gdb_dirent.h b/gdb/gdb_dirent.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_dirent.h
rename to gdb/gdb_dirent.h
diff --git a/contrib/gdb/gdb/gdb_gcore.sh b/gdb/gdb_gcore.sh
similarity index 100%
rename from contrib/gdb/gdb/gdb_gcore.sh
rename to gdb/gdb_gcore.sh
diff --git a/contrib/gdb/gdb/gdb_indent.sh b/gdb/gdb_indent.sh
similarity index 100%
rename from contrib/gdb/gdb/gdb_indent.sh
rename to gdb/gdb_indent.sh
diff --git a/contrib/gdb/gdb/gdb_locale.h b/gdb/gdb_locale.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_locale.h
rename to gdb/gdb_locale.h
diff --git a/contrib/gdb/gdb/gdb_mbuild.sh b/gdb/gdb_mbuild.sh
similarity index 100%
rename from contrib/gdb/gdb/gdb_mbuild.sh
rename to gdb/gdb_mbuild.sh
diff --git a/contrib/gdb/gdb/gdb_obstack.h b/gdb/gdb_obstack.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_obstack.h
rename to gdb/gdb_obstack.h
diff --git a/contrib/gdb/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_proc_service.h
rename to gdb/gdb_proc_service.h
diff --git a/contrib/gdb/gdb/gdb_regex.h b/gdb/gdb_regex.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_regex.h
rename to gdb/gdb_regex.h
diff --git a/contrib/gdb/gdb/gdb_stat.h b/gdb/gdb_stat.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_stat.h
rename to gdb/gdb_stat.h
diff --git a/contrib/gdb/gdb/gdb_string.h b/gdb/gdb_string.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_string.h
rename to gdb/gdb_string.h
diff --git a/contrib/gdb/gdb/gdb_thread_db.h b/gdb/gdb_thread_db.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_thread_db.h
rename to gdb/gdb_thread_db.h
diff --git a/contrib/gdb/gdb/gdb_vfork.h b/gdb/gdb_vfork.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_vfork.h
rename to gdb/gdb_vfork.h
diff --git a/contrib/gdb/gdb/gdb_wait.h b/gdb/gdb_wait.h
similarity index 100%
rename from contrib/gdb/gdb/gdb_wait.h
rename to gdb/gdb_wait.h
diff --git a/contrib/gdb/gdb/gdbarch.c b/gdb/gdbarch.c
similarity index 100%
rename from contrib/gdb/gdb/gdbarch.c
rename to gdb/gdbarch.c
diff --git a/contrib/gdb/gdb/gdbarch.h b/gdb/gdbarch.h
similarity index 100%
rename from contrib/gdb/gdb/gdbarch.h
rename to gdb/gdbarch.h
diff --git a/contrib/gdb/gdb/gdbarch.sh b/gdb/gdbarch.sh
similarity index 100%
rename from contrib/gdb/gdb/gdbarch.sh
rename to gdb/gdbarch.sh
diff --git a/contrib/gdb/gdb/gdbcmd.h b/gdb/gdbcmd.h
similarity index 100%
rename from contrib/gdb/gdb/gdbcmd.h
rename to gdb/gdbcmd.h
diff --git a/contrib/gdb/gdb/gdbcore.h b/gdb/gdbcore.h
similarity index 100%
rename from contrib/gdb/gdb/gdbcore.h
rename to gdb/gdbcore.h
diff --git a/contrib/gdb/gdb/gdbinit.in b/gdb/gdbinit.in
similarity index 100%
rename from contrib/gdb/gdb/gdbinit.in
rename to gdb/gdbinit.in
diff --git a/contrib/gdb/gdb/gdbserver/README b/gdb/gdbserver/README
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/README
rename to gdb/gdbserver/README
diff --git a/contrib/gdb/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/acinclude.m4
rename to gdb/gdbserver/acinclude.m4
diff --git a/contrib/gdb/gdb/gdbserver/aclocal.m4 b/gdb/gdbserver/aclocal.m4
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/aclocal.m4
rename to gdb/gdbserver/aclocal.m4
diff --git a/contrib/gdb/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/gdbreplay.c
rename to gdb/gdbserver/gdbreplay.c
diff --git a/contrib/gdb/gdb/gdbserver/gdbserver.1 b/gdb/gdbserver/gdbserver.1
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/gdbserver.1
rename to gdb/gdbserver/gdbserver.1
diff --git a/contrib/gdb/gdb/gdbserver/i387-fp.c b/gdb/gdbserver/i387-fp.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/i387-fp.c
rename to gdb/gdbserver/i387-fp.c
diff --git a/contrib/gdb/gdb/gdbserver/i387-fp.h b/gdb/gdbserver/i387-fp.h
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/i387-fp.h
rename to gdb/gdbserver/i387-fp.h
diff --git a/contrib/gdb/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/inferiors.c
rename to gdb/gdbserver/inferiors.c
diff --git a/contrib/gdb/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/mem-break.c
rename to gdb/gdbserver/mem-break.c
diff --git a/contrib/gdb/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/mem-break.h
rename to gdb/gdbserver/mem-break.h
diff --git a/contrib/gdb/gdb/gdbserver/proc-service.c b/gdb/gdbserver/proc-service.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/proc-service.c
rename to gdb/gdbserver/proc-service.c
diff --git a/contrib/gdb/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/regcache.c
rename to gdb/gdbserver/regcache.c
diff --git a/contrib/gdb/gdb/gdbserver/regcache.h b/gdb/gdbserver/regcache.h
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/regcache.h
rename to gdb/gdbserver/regcache.h
diff --git a/contrib/gdb/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/remote-utils.c
rename to gdb/gdbserver/remote-utils.c
diff --git a/contrib/gdb/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/server.c
rename to gdb/gdbserver/server.c
diff --git a/contrib/gdb/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/server.h
rename to gdb/gdbserver/server.h
diff --git a/contrib/gdb/gdb/gdbserver/target.c b/gdb/gdbserver/target.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/target.c
rename to gdb/gdbserver/target.c
diff --git a/contrib/gdb/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/target.h
rename to gdb/gdbserver/target.h
diff --git a/contrib/gdb/gdb/gdbserver/terminal.h b/gdb/gdbserver/terminal.h
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/terminal.h
rename to gdb/gdbserver/terminal.h
diff --git a/contrib/gdb/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/thread-db.c
rename to gdb/gdbserver/thread-db.c
diff --git a/contrib/gdb/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
similarity index 100%
rename from contrib/gdb/gdb/gdbserver/utils.c
rename to gdb/gdbserver/utils.c
diff --git a/contrib/gdb/gdb/gdbthread.h b/gdb/gdbthread.h
similarity index 100%
rename from contrib/gdb/gdb/gdbthread.h
rename to gdb/gdbthread.h
diff --git a/contrib/gdb/gdb/gdbtypes.c b/gdb/gdbtypes.c
similarity index 100%
rename from contrib/gdb/gdb/gdbtypes.c
rename to gdb/gdbtypes.c
diff --git a/contrib/gdb/gdb/gdbtypes.h b/gdb/gdbtypes.h
similarity index 100%
rename from contrib/gdb/gdb/gdbtypes.h
rename to gdb/gdbtypes.h
diff --git a/contrib/gdb/gdb/glibc-tdep.c b/gdb/glibc-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/glibc-tdep.c
rename to gdb/glibc-tdep.c
diff --git a/contrib/gdb/gdb/glibc-tdep.h b/gdb/glibc-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/glibc-tdep.h
rename to gdb/glibc-tdep.h
diff --git a/contrib/gdb/gdb/gnu-nat.c b/gdb/gnu-nat.c
similarity index 100%
rename from contrib/gdb/gdb/gnu-nat.c
rename to gdb/gnu-nat.c
diff --git a/contrib/gdb/gdb/gnu-nat.h b/gdb/gnu-nat.h
similarity index 100%
rename from contrib/gdb/gdb/gnu-nat.h
rename to gdb/gnu-nat.h
diff --git a/contrib/gdb/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
similarity index 100%
rename from contrib/gdb/gdb/gnu-v2-abi.c
rename to gdb/gnu-v2-abi.c
diff --git a/contrib/gdb/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
similarity index 100%
rename from contrib/gdb/gdb/gnu-v3-abi.c
rename to gdb/gnu-v3-abi.c
diff --git a/contrib/gdb/gdb/go32-nat.c b/gdb/go32-nat.c
similarity index 100%
rename from contrib/gdb/gdb/go32-nat.c
rename to gdb/go32-nat.c
diff --git a/contrib/gdb/gdb/gregset.h b/gdb/gregset.h
similarity index 100%
rename from contrib/gdb/gdb/gregset.h
rename to gdb/gregset.h
diff --git a/contrib/gdb/gdb/hpacc-abi.c b/gdb/hpacc-abi.c
similarity index 100%
rename from contrib/gdb/gdb/hpacc-abi.c
rename to gdb/hpacc-abi.c
diff --git a/contrib/gdb/gdb/hpread.c b/gdb/hpread.c
similarity index 100%
rename from contrib/gdb/gdb/hpread.c
rename to gdb/hpread.c
diff --git a/contrib/gdb/gdb/i386-nat.c b/gdb/i386-nat.c
similarity index 100%
rename from contrib/gdb/gdb/i386-nat.c
rename to gdb/i386-nat.c
diff --git a/contrib/gdb/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386-nto-tdep.c
rename to gdb/i386-nto-tdep.c
diff --git a/contrib/gdb/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386-sol2-tdep.c
rename to gdb/i386-sol2-tdep.c
diff --git a/contrib/gdb/gdb/i386-stub.c b/gdb/i386-stub.c
similarity index 100%
rename from contrib/gdb/gdb/i386-stub.c
rename to gdb/i386-stub.c
diff --git a/contrib/gdb/gdb/i386-tdep.c b/gdb/i386-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386-tdep.c
rename to gdb/i386-tdep.c
diff --git a/contrib/gdb/gdb/i386-tdep.h b/gdb/i386-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/i386-tdep.h
rename to gdb/i386-tdep.h
diff --git a/contrib/gdb/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/i386bsd-nat.c
rename to gdb/i386bsd-nat.c
diff --git a/contrib/gdb/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386bsd-tdep.c
rename to gdb/i386bsd-tdep.c
diff --git a/contrib/gdb/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/i386fbsd-nat.c
rename to gdb/i386fbsd-nat.c
diff --git a/contrib/gdb/gdb/i386fbsd-tdep.c b/gdb/i386fbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386fbsd-tdep.c
rename to gdb/i386fbsd-tdep.c
diff --git a/contrib/gdb/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
similarity index 100%
rename from contrib/gdb/gdb/i386gnu-nat.c
rename to gdb/i386gnu-nat.c
diff --git a/contrib/gdb/gdb/i386gnu-tdep.c b/gdb/i386gnu-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386gnu-tdep.c
rename to gdb/i386gnu-tdep.c
diff --git a/contrib/gdb/gdb/i386ly-tdep.c b/gdb/i386ly-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386ly-tdep.c
rename to gdb/i386ly-tdep.c
diff --git a/contrib/gdb/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386nbsd-tdep.c
rename to gdb/i386nbsd-tdep.c
diff --git a/contrib/gdb/gdb/i386obsd-nat.c b/gdb/i386obsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/i386obsd-nat.c
rename to gdb/i386obsd-nat.c
diff --git a/contrib/gdb/gdb/i386obsd-tdep.c b/gdb/i386obsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i386obsd-tdep.c
rename to gdb/i386obsd-tdep.c
diff --git a/contrib/gdb/gdb/i386v-nat.c b/gdb/i386v-nat.c
similarity index 100%
rename from contrib/gdb/gdb/i386v-nat.c
rename to gdb/i386v-nat.c
diff --git a/contrib/gdb/gdb/i386v4-nat.c b/gdb/i386v4-nat.c
similarity index 100%
rename from contrib/gdb/gdb/i386v4-nat.c
rename to gdb/i386v4-nat.c
diff --git a/contrib/gdb/gdb/i387-tdep.c b/gdb/i387-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/i387-tdep.c
rename to gdb/i387-tdep.c
diff --git a/contrib/gdb/gdb/i387-tdep.h b/gdb/i387-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/i387-tdep.h
rename to gdb/i387-tdep.h
diff --git a/contrib/gdb/gdb/ia64-fbsd-nat.c b/gdb/ia64-fbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/ia64-fbsd-nat.c
rename to gdb/ia64-fbsd-nat.c
diff --git a/contrib/gdb/gdb/ia64-fbsd-tdep.c b/gdb/ia64-fbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/ia64-fbsd-tdep.c
rename to gdb/ia64-fbsd-tdep.c
diff --git a/contrib/gdb/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/ia64-tdep.c
rename to gdb/ia64-tdep.c
diff --git a/contrib/gdb/gdb/ia64-tdep.h b/gdb/ia64-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/ia64-tdep.h
rename to gdb/ia64-tdep.h
diff --git a/contrib/gdb/gdb/inf-loop.c b/gdb/inf-loop.c
similarity index 100%
rename from contrib/gdb/gdb/inf-loop.c
rename to gdb/inf-loop.c
diff --git a/contrib/gdb/gdb/inf-loop.h b/gdb/inf-loop.h
similarity index 100%
rename from contrib/gdb/gdb/inf-loop.h
rename to gdb/inf-loop.h
diff --git a/contrib/gdb/gdb/infcall.c b/gdb/infcall.c
similarity index 100%
rename from contrib/gdb/gdb/infcall.c
rename to gdb/infcall.c
diff --git a/contrib/gdb/gdb/infcall.h b/gdb/infcall.h
similarity index 100%
rename from contrib/gdb/gdb/infcall.h
rename to gdb/infcall.h
diff --git a/contrib/gdb/gdb/infcmd.c b/gdb/infcmd.c
similarity index 100%
rename from contrib/gdb/gdb/infcmd.c
rename to gdb/infcmd.c
diff --git a/contrib/gdb/gdb/inferior.h b/gdb/inferior.h
similarity index 100%
rename from contrib/gdb/gdb/inferior.h
rename to gdb/inferior.h
diff --git a/contrib/gdb/gdb/inflow.c b/gdb/inflow.c
similarity index 100%
rename from contrib/gdb/gdb/inflow.c
rename to gdb/inflow.c
diff --git a/contrib/gdb/gdb/inflow.h b/gdb/inflow.h
similarity index 100%
rename from contrib/gdb/gdb/inflow.h
rename to gdb/inflow.h
diff --git a/contrib/gdb/gdb/infptrace.c b/gdb/infptrace.c
similarity index 100%
rename from contrib/gdb/gdb/infptrace.c
rename to gdb/infptrace.c
diff --git a/contrib/gdb/gdb/infrun.c b/gdb/infrun.c
similarity index 100%
rename from contrib/gdb/gdb/infrun.c
rename to gdb/infrun.c
diff --git a/contrib/gdb/gdb/inftarg.c b/gdb/inftarg.c
similarity index 100%
rename from contrib/gdb/gdb/inftarg.c
rename to gdb/inftarg.c
diff --git a/contrib/gdb/gdb/infttrace.c b/gdb/infttrace.c
similarity index 100%
rename from contrib/gdb/gdb/infttrace.c
rename to gdb/infttrace.c
diff --git a/contrib/gdb/gdb/infttrace.h b/gdb/infttrace.h
similarity index 100%
rename from contrib/gdb/gdb/infttrace.h
rename to gdb/infttrace.h
diff --git a/contrib/gdb/gdb/interps.c b/gdb/interps.c
similarity index 100%
rename from contrib/gdb/gdb/interps.c
rename to gdb/interps.c
diff --git a/contrib/gdb/gdb/interps.h b/gdb/interps.h
similarity index 100%
rename from contrib/gdb/gdb/interps.h
rename to gdb/interps.h
diff --git a/contrib/gdb/gdb/jv-exp.c b/gdb/jv-exp.c
similarity index 100%
rename from contrib/gdb/gdb/jv-exp.c
rename to gdb/jv-exp.c
diff --git a/contrib/gdb/gdb/jv-exp.y b/gdb/jv-exp.y
similarity index 100%
rename from contrib/gdb/gdb/jv-exp.y
rename to gdb/jv-exp.y
diff --git a/contrib/gdb/gdb/jv-lang.c b/gdb/jv-lang.c
similarity index 100%
rename from contrib/gdb/gdb/jv-lang.c
rename to gdb/jv-lang.c
diff --git a/contrib/gdb/gdb/jv-lang.h b/gdb/jv-lang.h
similarity index 100%
rename from contrib/gdb/gdb/jv-lang.h
rename to gdb/jv-lang.h
diff --git a/contrib/gdb/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
similarity index 100%
rename from contrib/gdb/gdb/jv-typeprint.c
rename to gdb/jv-typeprint.c
diff --git a/contrib/gdb/gdb/jv-valprint.c b/gdb/jv-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/jv-valprint.c
rename to gdb/jv-valprint.c
diff --git a/contrib/gdb/gdb/kod-cisco.c b/gdb/kod-cisco.c
similarity index 100%
rename from contrib/gdb/gdb/kod-cisco.c
rename to gdb/kod-cisco.c
diff --git a/contrib/gdb/gdb/kod.c b/gdb/kod.c
similarity index 100%
rename from contrib/gdb/gdb/kod.c
rename to gdb/kod.c
diff --git a/contrib/gdb/gdb/kod.h b/gdb/kod.h
similarity index 100%
rename from contrib/gdb/gdb/kod.h
rename to gdb/kod.h
diff --git a/contrib/gdb/gdb/language.c b/gdb/language.c
similarity index 100%
rename from contrib/gdb/gdb/language.c
rename to gdb/language.c
diff --git a/contrib/gdb/gdb/language.h b/gdb/language.h
similarity index 100%
rename from contrib/gdb/gdb/language.h
rename to gdb/language.h
diff --git a/contrib/gdb/gdb/libunwind-frame.c b/gdb/libunwind-frame.c
similarity index 100%
rename from contrib/gdb/gdb/libunwind-frame.c
rename to gdb/libunwind-frame.c
diff --git a/contrib/gdb/gdb/libunwind-frame.h b/gdb/libunwind-frame.h
similarity index 100%
rename from contrib/gdb/gdb/libunwind-frame.h
rename to gdb/libunwind-frame.h
diff --git a/contrib/gdb/gdb/lin-lwp.c b/gdb/lin-lwp.c
similarity index 100%
rename from contrib/gdb/gdb/lin-lwp.c
rename to gdb/lin-lwp.c
diff --git a/contrib/gdb/gdb/linespec.c b/gdb/linespec.c
similarity index 100%
rename from contrib/gdb/gdb/linespec.c
rename to gdb/linespec.c
diff --git a/contrib/gdb/gdb/linespec.h b/gdb/linespec.h
similarity index 100%
rename from contrib/gdb/gdb/linespec.h
rename to gdb/linespec.h
diff --git a/contrib/gdb/gdb/lynx-nat.c b/gdb/lynx-nat.c
similarity index 100%
rename from contrib/gdb/gdb/lynx-nat.c
rename to gdb/lynx-nat.c
diff --git a/contrib/gdb/gdb/m2-exp.c b/gdb/m2-exp.c
similarity index 100%
rename from contrib/gdb/gdb/m2-exp.c
rename to gdb/m2-exp.c
diff --git a/contrib/gdb/gdb/m2-exp.y b/gdb/m2-exp.y
similarity index 100%
rename from contrib/gdb/gdb/m2-exp.y
rename to gdb/m2-exp.y
diff --git a/contrib/gdb/gdb/m2-lang.c b/gdb/m2-lang.c
similarity index 100%
rename from contrib/gdb/gdb/m2-lang.c
rename to gdb/m2-lang.c
diff --git a/contrib/gdb/gdb/m2-lang.h b/gdb/m2-lang.h
similarity index 100%
rename from contrib/gdb/gdb/m2-lang.h
rename to gdb/m2-lang.h
diff --git a/contrib/gdb/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
similarity index 100%
rename from contrib/gdb/gdb/m2-typeprint.c
rename to gdb/m2-typeprint.c
diff --git a/contrib/gdb/gdb/m2-valprint.c b/gdb/m2-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/m2-valprint.c
rename to gdb/m2-valprint.c
diff --git a/contrib/gdb/gdb/macrocmd.c b/gdb/macrocmd.c
similarity index 100%
rename from contrib/gdb/gdb/macrocmd.c
rename to gdb/macrocmd.c
diff --git a/contrib/gdb/gdb/macroexp.c b/gdb/macroexp.c
similarity index 100%
rename from contrib/gdb/gdb/macroexp.c
rename to gdb/macroexp.c
diff --git a/contrib/gdb/gdb/macroexp.h b/gdb/macroexp.h
similarity index 100%
rename from contrib/gdb/gdb/macroexp.h
rename to gdb/macroexp.h
diff --git a/contrib/gdb/gdb/macroscope.c b/gdb/macroscope.c
similarity index 100%
rename from contrib/gdb/gdb/macroscope.c
rename to gdb/macroscope.c
diff --git a/contrib/gdb/gdb/macroscope.h b/gdb/macroscope.h
similarity index 100%
rename from contrib/gdb/gdb/macroscope.h
rename to gdb/macroscope.h
diff --git a/contrib/gdb/gdb/macrotab.c b/gdb/macrotab.c
similarity index 100%
rename from contrib/gdb/gdb/macrotab.c
rename to gdb/macrotab.c
diff --git a/contrib/gdb/gdb/macrotab.h b/gdb/macrotab.h
similarity index 100%
rename from contrib/gdb/gdb/macrotab.h
rename to gdb/macrotab.h
diff --git a/contrib/gdb/gdb/main.c b/gdb/main.c
similarity index 100%
rename from contrib/gdb/gdb/main.c
rename to gdb/main.c
diff --git a/contrib/gdb/gdb/main.h b/gdb/main.h
similarity index 100%
rename from contrib/gdb/gdb/main.h
rename to gdb/main.h
diff --git a/contrib/gdb/gdb/maint.c b/gdb/maint.c
similarity index 100%
rename from contrib/gdb/gdb/maint.c
rename to gdb/maint.c
diff --git a/contrib/gdb/gdb/mdebugread.c b/gdb/mdebugread.c
similarity index 100%
rename from contrib/gdb/gdb/mdebugread.c
rename to gdb/mdebugread.c
diff --git a/contrib/gdb/gdb/mem-break.c b/gdb/mem-break.c
similarity index 100%
rename from contrib/gdb/gdb/mem-break.c
rename to gdb/mem-break.c
diff --git a/contrib/gdb/gdb/memattr.c b/gdb/memattr.c
similarity index 100%
rename from contrib/gdb/gdb/memattr.c
rename to gdb/memattr.c
diff --git a/contrib/gdb/gdb/memattr.h b/gdb/memattr.h
similarity index 100%
rename from contrib/gdb/gdb/memattr.h
rename to gdb/memattr.h
diff --git a/contrib/gdb/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmd-break.c
rename to gdb/mi/mi-cmd-break.c
diff --git a/contrib/gdb/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmd-disas.c
rename to gdb/mi/mi-cmd-disas.c
diff --git a/contrib/gdb/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmd-env.c
rename to gdb/mi/mi-cmd-env.c
diff --git a/contrib/gdb/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmd-file.c
rename to gdb/mi/mi-cmd-file.c
diff --git a/contrib/gdb/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmd-stack.c
rename to gdb/mi/mi-cmd-stack.c
diff --git a/contrib/gdb/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmd-var.c
rename to gdb/mi/mi-cmd-var.c
diff --git a/contrib/gdb/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmds.c
rename to gdb/mi/mi-cmds.c
diff --git a/contrib/gdb/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-cmds.h
rename to gdb/mi/mi-cmds.h
diff --git a/contrib/gdb/gdb/mi/mi-console.c b/gdb/mi/mi-console.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-console.c
rename to gdb/mi/mi-console.c
diff --git a/contrib/gdb/gdb/mi/mi-console.h b/gdb/mi/mi-console.h
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-console.h
rename to gdb/mi/mi-console.h
diff --git a/contrib/gdb/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-getopt.c
rename to gdb/mi/mi-getopt.c
diff --git a/contrib/gdb/gdb/mi/mi-getopt.h b/gdb/mi/mi-getopt.h
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-getopt.h
rename to gdb/mi/mi-getopt.h
diff --git a/contrib/gdb/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-interp.c
rename to gdb/mi/mi-interp.c
diff --git a/contrib/gdb/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-main.c
rename to gdb/mi/mi-main.c
diff --git a/contrib/gdb/gdb/mi/mi-main.h b/gdb/mi/mi-main.h
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-main.h
rename to gdb/mi/mi-main.h
diff --git a/contrib/gdb/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-out.c
rename to gdb/mi/mi-out.c
diff --git a/contrib/gdb/gdb/mi/mi-out.h b/gdb/mi/mi-out.h
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-out.h
rename to gdb/mi/mi-out.h
diff --git a/contrib/gdb/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-parse.c
rename to gdb/mi/mi-parse.c
diff --git a/contrib/gdb/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-parse.h
rename to gdb/mi/mi-parse.h
diff --git a/contrib/gdb/gdb/mi/mi-symbol-cmds.c b/gdb/mi/mi-symbol-cmds.c
similarity index 100%
rename from contrib/gdb/gdb/mi/mi-symbol-cmds.c
rename to gdb/mi/mi-symbol-cmds.c
diff --git a/contrib/gdb/gdb/minimon.h b/gdb/minimon.h
similarity index 100%
rename from contrib/gdb/gdb/minimon.h
rename to gdb/minimon.h
diff --git a/contrib/gdb/gdb/minsyms.c b/gdb/minsyms.c
similarity index 100%
rename from contrib/gdb/gdb/minsyms.c
rename to gdb/minsyms.c
diff --git a/contrib/gdb/gdb/mips-nat.c b/gdb/mips-nat.c
similarity index 100%
rename from contrib/gdb/gdb/mips-nat.c
rename to gdb/mips-nat.c
diff --git a/contrib/gdb/gdb/mips-tdep.c b/gdb/mips-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/mips-tdep.c
rename to gdb/mips-tdep.c
diff --git a/contrib/gdb/gdb/mips-tdep.h b/gdb/mips-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/mips-tdep.h
rename to gdb/mips-tdep.h
diff --git a/contrib/gdb/gdb/mipsnbsd-nat.c b/gdb/mipsnbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/mipsnbsd-nat.c
rename to gdb/mipsnbsd-nat.c
diff --git a/contrib/gdb/gdb/mipsnbsd-tdep.c b/gdb/mipsnbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/mipsnbsd-tdep.c
rename to gdb/mipsnbsd-tdep.c
diff --git a/contrib/gdb/gdb/mipsnbsd-tdep.h b/gdb/mipsnbsd-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/mipsnbsd-tdep.h
rename to gdb/mipsnbsd-tdep.h
diff --git a/contrib/gdb/gdb/mipsread.c b/gdb/mipsread.c
similarity index 100%
rename from contrib/gdb/gdb/mipsread.c
rename to gdb/mipsread.c
diff --git a/contrib/gdb/gdb/mipsv4-nat.c b/gdb/mipsv4-nat.c
similarity index 100%
rename from contrib/gdb/gdb/mipsv4-nat.c
rename to gdb/mipsv4-nat.c
diff --git a/contrib/gdb/gdb/monitor.c b/gdb/monitor.c
similarity index 100%
rename from contrib/gdb/gdb/monitor.c
rename to gdb/monitor.c
diff --git a/contrib/gdb/gdb/monitor.h b/gdb/monitor.h
similarity index 100%
rename from contrib/gdb/gdb/monitor.h
rename to gdb/monitor.h
diff --git a/contrib/gdb/gdb/msg.defs b/gdb/msg.defs
similarity index 100%
rename from contrib/gdb/gdb/msg.defs
rename to gdb/msg.defs
diff --git a/contrib/gdb/gdb/msg_reply.defs b/gdb/msg_reply.defs
similarity index 100%
rename from contrib/gdb/gdb/msg_reply.defs
rename to gdb/msg_reply.defs
diff --git a/contrib/gdb/gdb/nbsd-tdep.c b/gdb/nbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/nbsd-tdep.c
rename to gdb/nbsd-tdep.c
diff --git a/contrib/gdb/gdb/nbsd-tdep.h b/gdb/nbsd-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/nbsd-tdep.h
rename to gdb/nbsd-tdep.h
diff --git a/contrib/gdb/gdb/nlmread.c b/gdb/nlmread.c
similarity index 100%
rename from contrib/gdb/gdb/nlmread.c
rename to gdb/nlmread.c
diff --git a/contrib/gdb/gdb/notify.defs b/gdb/notify.defs
similarity index 100%
rename from contrib/gdb/gdb/notify.defs
rename to gdb/notify.defs
diff --git a/contrib/gdb/gdb/nto-procfs.c b/gdb/nto-procfs.c
similarity index 100%
rename from contrib/gdb/gdb/nto-procfs.c
rename to gdb/nto-procfs.c
diff --git a/contrib/gdb/gdb/nto-tdep.c b/gdb/nto-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/nto-tdep.c
rename to gdb/nto-tdep.c
diff --git a/contrib/gdb/gdb/nto-tdep.h b/gdb/nto-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/nto-tdep.h
rename to gdb/nto-tdep.h
diff --git a/contrib/gdb/gdb/objc-exp.c b/gdb/objc-exp.c
similarity index 100%
rename from contrib/gdb/gdb/objc-exp.c
rename to gdb/objc-exp.c
diff --git a/contrib/gdb/gdb/objc-exp.y b/gdb/objc-exp.y
similarity index 100%
rename from contrib/gdb/gdb/objc-exp.y
rename to gdb/objc-exp.y
diff --git a/contrib/gdb/gdb/objc-lang.c b/gdb/objc-lang.c
similarity index 100%
rename from contrib/gdb/gdb/objc-lang.c
rename to gdb/objc-lang.c
diff --git a/contrib/gdb/gdb/objc-lang.h b/gdb/objc-lang.h
similarity index 100%
rename from contrib/gdb/gdb/objc-lang.h
rename to gdb/objc-lang.h
diff --git a/contrib/gdb/gdb/objfiles.c b/gdb/objfiles.c
similarity index 100%
rename from contrib/gdb/gdb/objfiles.c
rename to gdb/objfiles.c
diff --git a/contrib/gdb/gdb/objfiles.h b/gdb/objfiles.h
similarity index 100%
rename from contrib/gdb/gdb/objfiles.h
rename to gdb/objfiles.h
diff --git a/contrib/gdb/gdb/observer.c b/gdb/observer.c
similarity index 100%
rename from contrib/gdb/gdb/observer.c
rename to gdb/observer.c
diff --git a/contrib/gdb/gdb/observer.h b/gdb/observer.h
similarity index 100%
rename from contrib/gdb/gdb/observer.h
rename to gdb/observer.h
diff --git a/contrib/gdb/gdb/ocd.c b/gdb/ocd.c
similarity index 100%
rename from contrib/gdb/gdb/ocd.c
rename to gdb/ocd.c
diff --git a/contrib/gdb/gdb/ocd.h b/gdb/ocd.h
similarity index 100%
rename from contrib/gdb/gdb/ocd.h
rename to gdb/ocd.h
diff --git a/contrib/gdb/gdb/osabi.c b/gdb/osabi.c
similarity index 100%
rename from contrib/gdb/gdb/osabi.c
rename to gdb/osabi.c
diff --git a/contrib/gdb/gdb/osabi.h b/gdb/osabi.h
similarity index 100%
rename from contrib/gdb/gdb/osabi.h
rename to gdb/osabi.h
diff --git a/contrib/gdb/gdb/p-exp.c b/gdb/p-exp.c
similarity index 100%
rename from contrib/gdb/gdb/p-exp.c
rename to gdb/p-exp.c
diff --git a/contrib/gdb/gdb/p-exp.y b/gdb/p-exp.y
similarity index 100%
rename from contrib/gdb/gdb/p-exp.y
rename to gdb/p-exp.y
diff --git a/contrib/gdb/gdb/p-lang.c b/gdb/p-lang.c
similarity index 100%
rename from contrib/gdb/gdb/p-lang.c
rename to gdb/p-lang.c
diff --git a/contrib/gdb/gdb/p-lang.h b/gdb/p-lang.h
similarity index 100%
rename from contrib/gdb/gdb/p-lang.h
rename to gdb/p-lang.h
diff --git a/contrib/gdb/gdb/p-typeprint.c b/gdb/p-typeprint.c
similarity index 100%
rename from contrib/gdb/gdb/p-typeprint.c
rename to gdb/p-typeprint.c
diff --git a/contrib/gdb/gdb/p-valprint.c b/gdb/p-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/p-valprint.c
rename to gdb/p-valprint.c
diff --git a/contrib/gdb/gdb/pa64solib.c b/gdb/pa64solib.c
similarity index 100%
rename from contrib/gdb/gdb/pa64solib.c
rename to gdb/pa64solib.c
diff --git a/contrib/gdb/gdb/pa64solib.h b/gdb/pa64solib.h
similarity index 100%
rename from contrib/gdb/gdb/pa64solib.h
rename to gdb/pa64solib.h
diff --git a/contrib/gdb/gdb/parse.c b/gdb/parse.c
similarity index 100%
rename from contrib/gdb/gdb/parse.c
rename to gdb/parse.c
diff --git a/contrib/gdb/gdb/parser-defs.h b/gdb/parser-defs.h
similarity index 100%
rename from contrib/gdb/gdb/parser-defs.h
rename to gdb/parser-defs.h
diff --git a/contrib/gdb/gdb/ppc-bdm.c b/gdb/ppc-bdm.c
similarity index 100%
rename from contrib/gdb/gdb/ppc-bdm.c
rename to gdb/ppc-bdm.c
diff --git a/contrib/gdb/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/ppc-sysv-tdep.c
rename to gdb/ppc-sysv-tdep.c
diff --git a/contrib/gdb/gdb/ppc-tdep.h b/gdb/ppc-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/ppc-tdep.h
rename to gdb/ppc-tdep.h
diff --git a/contrib/gdb/gdb/ppcbug-rom.c b/gdb/ppcbug-rom.c
similarity index 100%
rename from contrib/gdb/gdb/ppcbug-rom.c
rename to gdb/ppcbug-rom.c
diff --git a/contrib/gdb/gdb/ppcfbsd-nat.c b/gdb/ppcfbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/ppcfbsd-nat.c
rename to gdb/ppcfbsd-nat.c
diff --git a/contrib/gdb/gdb/ppcfbsd-tdep.c b/gdb/ppcfbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/ppcfbsd-tdep.c
rename to gdb/ppcfbsd-tdep.c
diff --git a/contrib/gdb/gdb/ppcfbsd-tdep.h b/gdb/ppcfbsd-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/ppcfbsd-tdep.h
rename to gdb/ppcfbsd-tdep.h
diff --git a/contrib/gdb/gdb/ppcnbsd-nat.c b/gdb/ppcnbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/ppcnbsd-nat.c
rename to gdb/ppcnbsd-nat.c
diff --git a/contrib/gdb/gdb/ppcnbsd-tdep.c b/gdb/ppcnbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/ppcnbsd-tdep.c
rename to gdb/ppcnbsd-tdep.c
diff --git a/contrib/gdb/gdb/ppcnbsd-tdep.h b/gdb/ppcnbsd-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/ppcnbsd-tdep.h
rename to gdb/ppcnbsd-tdep.h
diff --git a/contrib/gdb/gdb/printcmd.c b/gdb/printcmd.c
similarity index 100%
rename from contrib/gdb/gdb/printcmd.c
rename to gdb/printcmd.c
diff --git a/contrib/gdb/gdb/proc-api.c b/gdb/proc-api.c
similarity index 100%
rename from contrib/gdb/gdb/proc-api.c
rename to gdb/proc-api.c
diff --git a/contrib/gdb/gdb/proc-events.c b/gdb/proc-events.c
similarity index 100%
rename from contrib/gdb/gdb/proc-events.c
rename to gdb/proc-events.c
diff --git a/contrib/gdb/gdb/proc-flags.c b/gdb/proc-flags.c
similarity index 100%
rename from contrib/gdb/gdb/proc-flags.c
rename to gdb/proc-flags.c
diff --git a/contrib/gdb/gdb/proc-service.c b/gdb/proc-service.c
similarity index 100%
rename from contrib/gdb/gdb/proc-service.c
rename to gdb/proc-service.c
diff --git a/contrib/gdb/gdb/proc-utils.h b/gdb/proc-utils.h
similarity index 100%
rename from contrib/gdb/gdb/proc-utils.h
rename to gdb/proc-utils.h
diff --git a/contrib/gdb/gdb/proc-why.c b/gdb/proc-why.c
similarity index 100%
rename from contrib/gdb/gdb/proc-why.c
rename to gdb/proc-why.c
diff --git a/contrib/gdb/gdb/process_reply.defs b/gdb/process_reply.defs
similarity index 100%
rename from contrib/gdb/gdb/process_reply.defs
rename to gdb/process_reply.defs
diff --git a/contrib/gdb/gdb/procfs.c b/gdb/procfs.c
similarity index 100%
rename from contrib/gdb/gdb/procfs.c
rename to gdb/procfs.c
diff --git a/contrib/gdb/gdb/regcache.c b/gdb/regcache.c
similarity index 100%
rename from contrib/gdb/gdb/regcache.c
rename to gdb/regcache.c
diff --git a/contrib/gdb/gdb/regcache.h b/gdb/regcache.h
similarity index 100%
rename from contrib/gdb/gdb/regcache.h
rename to gdb/regcache.h
diff --git a/contrib/gdb/gdb/regformats/reg-arm.dat b/gdb/regformats/reg-arm.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-arm.dat
rename to gdb/regformats/reg-arm.dat
diff --git a/contrib/gdb/gdb/regformats/reg-i386.dat b/gdb/regformats/reg-i386.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-i386.dat
rename to gdb/regformats/reg-i386.dat
diff --git a/contrib/gdb/gdb/regformats/reg-ia64.dat b/gdb/regformats/reg-ia64.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-ia64.dat
rename to gdb/regformats/reg-ia64.dat
diff --git a/contrib/gdb/gdb/regformats/reg-m68k.dat b/gdb/regformats/reg-m68k.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-m68k.dat
rename to gdb/regformats/reg-m68k.dat
diff --git a/contrib/gdb/gdb/regformats/reg-mips.dat b/gdb/regformats/reg-mips.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-mips.dat
rename to gdb/regformats/reg-mips.dat
diff --git a/contrib/gdb/gdb/regformats/reg-ppc.dat b/gdb/regformats/reg-ppc.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-ppc.dat
rename to gdb/regformats/reg-ppc.dat
diff --git a/contrib/gdb/gdb/regformats/reg-s390.dat b/gdb/regformats/reg-s390.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-s390.dat
rename to gdb/regformats/reg-s390.dat
diff --git a/contrib/gdb/gdb/regformats/reg-s390x.dat b/gdb/regformats/reg-s390x.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-s390x.dat
rename to gdb/regformats/reg-s390x.dat
diff --git a/contrib/gdb/gdb/regformats/reg-sh.dat b/gdb/regformats/reg-sh.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-sh.dat
rename to gdb/regformats/reg-sh.dat
diff --git a/contrib/gdb/gdb/regformats/reg-x86-64.dat b/gdb/regformats/reg-x86-64.dat
similarity index 100%
rename from contrib/gdb/gdb/regformats/reg-x86-64.dat
rename to gdb/regformats/reg-x86-64.dat
diff --git a/contrib/gdb/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh
similarity index 100%
rename from contrib/gdb/gdb/regformats/regdat.sh
rename to gdb/regformats/regdat.sh
diff --git a/contrib/gdb/gdb/regformats/regdef.h b/gdb/regformats/regdef.h
similarity index 100%
rename from contrib/gdb/gdb/regformats/regdef.h
rename to gdb/regformats/regdef.h
diff --git a/contrib/gdb/gdb/reggroups.c b/gdb/reggroups.c
similarity index 100%
rename from contrib/gdb/gdb/reggroups.c
rename to gdb/reggroups.c
diff --git a/contrib/gdb/gdb/reggroups.h b/gdb/reggroups.h
similarity index 100%
rename from contrib/gdb/gdb/reggroups.h
rename to gdb/reggroups.h
diff --git a/contrib/gdb/gdb/regset.h b/gdb/regset.h
similarity index 100%
rename from contrib/gdb/gdb/regset.h
rename to gdb/regset.h
diff --git a/contrib/gdb/gdb/remote-e7000.c b/gdb/remote-e7000.c
similarity index 100%
rename from contrib/gdb/gdb/remote-e7000.c
rename to gdb/remote-e7000.c
diff --git a/contrib/gdb/gdb/remote-est.c b/gdb/remote-est.c
similarity index 100%
rename from contrib/gdb/gdb/remote-est.c
rename to gdb/remote-est.c
diff --git a/contrib/gdb/gdb/remote-fileio.c b/gdb/remote-fileio.c
similarity index 100%
rename from contrib/gdb/gdb/remote-fileio.c
rename to gdb/remote-fileio.c
diff --git a/contrib/gdb/gdb/remote-fileio.h b/gdb/remote-fileio.h
similarity index 100%
rename from contrib/gdb/gdb/remote-fileio.h
rename to gdb/remote-fileio.h
diff --git a/contrib/gdb/gdb/remote-hms.c b/gdb/remote-hms.c
similarity index 100%
rename from contrib/gdb/gdb/remote-hms.c
rename to gdb/remote-hms.c
diff --git a/contrib/gdb/gdb/remote-mips.c b/gdb/remote-mips.c
similarity index 100%
rename from contrib/gdb/gdb/remote-mips.c
rename to gdb/remote-mips.c
diff --git a/contrib/gdb/gdb/remote-rdi.c b/gdb/remote-rdi.c
similarity index 100%
rename from contrib/gdb/gdb/remote-rdi.c
rename to gdb/remote-rdi.c
diff --git a/contrib/gdb/gdb/remote-rdp.c b/gdb/remote-rdp.c
similarity index 100%
rename from contrib/gdb/gdb/remote-rdp.c
rename to gdb/remote-rdp.c
diff --git a/contrib/gdb/gdb/remote-sds.c b/gdb/remote-sds.c
similarity index 100%
rename from contrib/gdb/gdb/remote-sds.c
rename to gdb/remote-sds.c
diff --git a/contrib/gdb/gdb/remote-sim.c b/gdb/remote-sim.c
similarity index 100%
rename from contrib/gdb/gdb/remote-sim.c
rename to gdb/remote-sim.c
diff --git a/contrib/gdb/gdb/remote-st.c b/gdb/remote-st.c
similarity index 100%
rename from contrib/gdb/gdb/remote-st.c
rename to gdb/remote-st.c
diff --git a/contrib/gdb/gdb/remote-utils.c b/gdb/remote-utils.c
similarity index 100%
rename from contrib/gdb/gdb/remote-utils.c
rename to gdb/remote-utils.c
diff --git a/contrib/gdb/gdb/remote-utils.h b/gdb/remote-utils.h
similarity index 100%
rename from contrib/gdb/gdb/remote-utils.h
rename to gdb/remote-utils.h
diff --git a/contrib/gdb/gdb/remote-vx.c b/gdb/remote-vx.c
similarity index 100%
rename from contrib/gdb/gdb/remote-vx.c
rename to gdb/remote-vx.c
diff --git a/contrib/gdb/gdb/remote-vx68.c b/gdb/remote-vx68.c
similarity index 100%
rename from contrib/gdb/gdb/remote-vx68.c
rename to gdb/remote-vx68.c
diff --git a/contrib/gdb/gdb/remote-vxmips.c b/gdb/remote-vxmips.c
similarity index 100%
rename from contrib/gdb/gdb/remote-vxmips.c
rename to gdb/remote-vxmips.c
diff --git a/contrib/gdb/gdb/remote-vxsparc.c b/gdb/remote-vxsparc.c
similarity index 100%
rename from contrib/gdb/gdb/remote-vxsparc.c
rename to gdb/remote-vxsparc.c
diff --git a/contrib/gdb/gdb/remote.c b/gdb/remote.c
similarity index 100%
rename from contrib/gdb/gdb/remote.c
rename to gdb/remote.c
diff --git a/contrib/gdb/gdb/remote.h b/gdb/remote.h
similarity index 100%
rename from contrib/gdb/gdb/remote.h
rename to gdb/remote.h
diff --git a/contrib/gdb/gdb/reply_mig_hack.awk b/gdb/reply_mig_hack.awk
similarity index 100%
rename from contrib/gdb/gdb/reply_mig_hack.awk
rename to gdb/reply_mig_hack.awk
diff --git a/contrib/gdb/gdb/rom68k-rom.c b/gdb/rom68k-rom.c
similarity index 100%
rename from contrib/gdb/gdb/rom68k-rom.c
rename to gdb/rom68k-rom.c
diff --git a/contrib/gdb/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
similarity index 100%
rename from contrib/gdb/gdb/rs6000-nat.c
rename to gdb/rs6000-nat.c
diff --git a/contrib/gdb/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/rs6000-tdep.c
rename to gdb/rs6000-tdep.c
diff --git a/contrib/gdb/gdb/s390-nat.c b/gdb/s390-nat.c
similarity index 100%
rename from contrib/gdb/gdb/s390-nat.c
rename to gdb/s390-nat.c
diff --git a/contrib/gdb/gdb/s390-tdep.c b/gdb/s390-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/s390-tdep.c
rename to gdb/s390-tdep.c
diff --git a/contrib/gdb/gdb/s390-tdep.h b/gdb/s390-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/s390-tdep.h
rename to gdb/s390-tdep.h
diff --git a/contrib/gdb/gdb/scm-exp.c b/gdb/scm-exp.c
similarity index 100%
rename from contrib/gdb/gdb/scm-exp.c
rename to gdb/scm-exp.c
diff --git a/contrib/gdb/gdb/scm-lang.c b/gdb/scm-lang.c
similarity index 100%
rename from contrib/gdb/gdb/scm-lang.c
rename to gdb/scm-lang.c
diff --git a/contrib/gdb/gdb/scm-lang.h b/gdb/scm-lang.h
similarity index 100%
rename from contrib/gdb/gdb/scm-lang.h
rename to gdb/scm-lang.h
diff --git a/contrib/gdb/gdb/scm-tags.h b/gdb/scm-tags.h
similarity index 100%
rename from contrib/gdb/gdb/scm-tags.h
rename to gdb/scm-tags.h
diff --git a/contrib/gdb/gdb/scm-valprint.c b/gdb/scm-valprint.c
similarity index 100%
rename from contrib/gdb/gdb/scm-valprint.c
rename to gdb/scm-valprint.c
diff --git a/contrib/gdb/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
similarity index 100%
rename from contrib/gdb/gdb/sentinel-frame.c
rename to gdb/sentinel-frame.c
diff --git a/contrib/gdb/gdb/sentinel-frame.h b/gdb/sentinel-frame.h
similarity index 100%
rename from contrib/gdb/gdb/sentinel-frame.h
rename to gdb/sentinel-frame.h
diff --git a/contrib/gdb/gdb/ser-e7kpc.c b/gdb/ser-e7kpc.c
similarity index 100%
rename from contrib/gdb/gdb/ser-e7kpc.c
rename to gdb/ser-e7kpc.c
diff --git a/contrib/gdb/gdb/ser-go32.c b/gdb/ser-go32.c
similarity index 100%
rename from contrib/gdb/gdb/ser-go32.c
rename to gdb/ser-go32.c
diff --git a/contrib/gdb/gdb/ser-pipe.c b/gdb/ser-pipe.c
similarity index 100%
rename from contrib/gdb/gdb/ser-pipe.c
rename to gdb/ser-pipe.c
diff --git a/contrib/gdb/gdb/ser-tcp.c b/gdb/ser-tcp.c
similarity index 100%
rename from contrib/gdb/gdb/ser-tcp.c
rename to gdb/ser-tcp.c
diff --git a/contrib/gdb/gdb/ser-unix.c b/gdb/ser-unix.c
similarity index 100%
rename from contrib/gdb/gdb/ser-unix.c
rename to gdb/ser-unix.c
diff --git a/contrib/gdb/gdb/ser-unix.h b/gdb/ser-unix.h
similarity index 100%
rename from contrib/gdb/gdb/ser-unix.h
rename to gdb/ser-unix.h
diff --git a/contrib/gdb/gdb/serial.c b/gdb/serial.c
similarity index 100%
rename from contrib/gdb/gdb/serial.c
rename to gdb/serial.c
diff --git a/contrib/gdb/gdb/serial.h b/gdb/serial.h
similarity index 100%
rename from contrib/gdb/gdb/serial.h
rename to gdb/serial.h
diff --git a/contrib/gdb/gdb/signals/signals.c b/gdb/signals/signals.c
similarity index 100%
rename from contrib/gdb/gdb/signals/signals.c
rename to gdb/signals/signals.c
diff --git a/contrib/gdb/gdb/sim-regno.h b/gdb/sim-regno.h
similarity index 100%
rename from contrib/gdb/gdb/sim-regno.h
rename to gdb/sim-regno.h
diff --git a/contrib/gdb/gdb/sol-thread.c b/gdb/sol-thread.c
similarity index 100%
rename from contrib/gdb/gdb/sol-thread.c
rename to gdb/sol-thread.c
diff --git a/contrib/gdb/gdb/solib-legacy.c b/gdb/solib-legacy.c
similarity index 100%
rename from contrib/gdb/gdb/solib-legacy.c
rename to gdb/solib-legacy.c
diff --git a/contrib/gdb/gdb/solib-osf.c b/gdb/solib-osf.c
similarity index 100%
rename from contrib/gdb/gdb/solib-osf.c
rename to gdb/solib-osf.c
diff --git a/contrib/gdb/gdb/solib-sunos.c b/gdb/solib-sunos.c
similarity index 100%
rename from contrib/gdb/gdb/solib-sunos.c
rename to gdb/solib-sunos.c
diff --git a/contrib/gdb/gdb/solib-svr4.c b/gdb/solib-svr4.c
similarity index 100%
rename from contrib/gdb/gdb/solib-svr4.c
rename to gdb/solib-svr4.c
diff --git a/contrib/gdb/gdb/solib-svr4.h b/gdb/solib-svr4.h
similarity index 100%
rename from contrib/gdb/gdb/solib-svr4.h
rename to gdb/solib-svr4.h
diff --git a/contrib/gdb/gdb/solib.c b/gdb/solib.c
similarity index 100%
rename from contrib/gdb/gdb/solib.c
rename to gdb/solib.c
diff --git a/contrib/gdb/gdb/solib.h b/gdb/solib.h
similarity index 100%
rename from contrib/gdb/gdb/solib.h
rename to gdb/solib.h
diff --git a/contrib/gdb/gdb/solist.h b/gdb/solist.h
similarity index 100%
rename from contrib/gdb/gdb/solist.h
rename to gdb/solist.h
diff --git a/contrib/gdb/gdb/somread.c b/gdb/somread.c
similarity index 100%
rename from contrib/gdb/gdb/somread.c
rename to gdb/somread.c
diff --git a/contrib/gdb/gdb/somsolib.c b/gdb/somsolib.c
similarity index 100%
rename from contrib/gdb/gdb/somsolib.c
rename to gdb/somsolib.c
diff --git a/contrib/gdb/gdb/somsolib.h b/gdb/somsolib.h
similarity index 100%
rename from contrib/gdb/gdb/somsolib.h
rename to gdb/somsolib.h
diff --git a/contrib/gdb/gdb/source.c b/gdb/source.c
similarity index 100%
rename from contrib/gdb/gdb/source.c
rename to gdb/source.c
diff --git a/contrib/gdb/gdb/source.h b/gdb/source.h
similarity index 100%
rename from contrib/gdb/gdb/source.h
rename to gdb/source.h
diff --git a/contrib/gdb/gdb/sparc-nat.c b/gdb/sparc-nat.c
similarity index 100%
rename from contrib/gdb/gdb/sparc-nat.c
rename to gdb/sparc-nat.c
diff --git a/contrib/gdb/gdb/sparc-nat.h b/gdb/sparc-nat.h
similarity index 100%
rename from contrib/gdb/gdb/sparc-nat.h
rename to gdb/sparc-nat.h
diff --git a/contrib/gdb/gdb/sparc-sol2-nat.c b/gdb/sparc-sol2-nat.c
similarity index 100%
rename from contrib/gdb/gdb/sparc-sol2-nat.c
rename to gdb/sparc-sol2-nat.c
diff --git a/contrib/gdb/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparc-sol2-tdep.c
rename to gdb/sparc-sol2-tdep.c
diff --git a/contrib/gdb/gdb/sparc-stub.c b/gdb/sparc-stub.c
similarity index 100%
rename from contrib/gdb/gdb/sparc-stub.c
rename to gdb/sparc-stub.c
diff --git a/contrib/gdb/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparc-tdep.c
rename to gdb/sparc-tdep.c
diff --git a/contrib/gdb/gdb/sparc-tdep.h b/gdb/sparc-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/sparc-tdep.h
rename to gdb/sparc-tdep.h
diff --git a/contrib/gdb/gdb/sparc64-nat.c b/gdb/sparc64-nat.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64-nat.c
rename to gdb/sparc64-nat.c
diff --git a/contrib/gdb/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64-sol2-tdep.c
rename to gdb/sparc64-sol2-tdep.c
diff --git a/contrib/gdb/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64-tdep.c
rename to gdb/sparc64-tdep.c
diff --git a/contrib/gdb/gdb/sparc64-tdep.h b/gdb/sparc64-tdep.h
similarity index 100%
rename from contrib/gdb/gdb/sparc64-tdep.h
rename to gdb/sparc64-tdep.h
diff --git a/contrib/gdb/gdb/sparc64fbsd-nat.c b/gdb/sparc64fbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64fbsd-nat.c
rename to gdb/sparc64fbsd-nat.c
diff --git a/contrib/gdb/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64fbsd-tdep.c
rename to gdb/sparc64fbsd-tdep.c
diff --git a/contrib/gdb/gdb/sparc64nbsd-nat.c b/gdb/sparc64nbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64nbsd-nat.c
rename to gdb/sparc64nbsd-nat.c
diff --git a/contrib/gdb/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64nbsd-tdep.c
rename to gdb/sparc64nbsd-tdep.c
diff --git a/contrib/gdb/gdb/sparc64obsd-tdep.c b/gdb/sparc64obsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparc64obsd-tdep.c
rename to gdb/sparc64obsd-tdep.c
diff --git a/contrib/gdb/gdb/sparcnbsd-nat.c b/gdb/sparcnbsd-nat.c
similarity index 100%
rename from contrib/gdb/gdb/sparcnbsd-nat.c
rename to gdb/sparcnbsd-nat.c
diff --git a/contrib/gdb/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparcnbsd-tdep.c
rename to gdb/sparcnbsd-tdep.c
diff --git a/contrib/gdb/gdb/sparcobsd-tdep.c b/gdb/sparcobsd-tdep.c
similarity index 100%
rename from contrib/gdb/gdb/sparcobsd-tdep.c
rename to gdb/sparcobsd-tdep.c
diff --git a/contrib/gdb/gdb/srec.h b/gdb/srec.h
similarity index 100%
rename from contrib/gdb/gdb/srec.h
rename to gdb/srec.h
diff --git a/contrib/gdb/gdb/stabsread.c b/gdb/stabsread.c
similarity index 100%
rename from contrib/gdb/gdb/stabsread.c
rename to gdb/stabsread.c
diff --git a/contrib/gdb/gdb/stabsread.h b/gdb/stabsread.h
similarity index 100%
rename from contrib/gdb/gdb/stabsread.h
rename to gdb/stabsread.h
diff --git a/contrib/gdb/gdb/stack.c b/gdb/stack.c
similarity index 100%
rename from contrib/gdb/gdb/stack.c
rename to gdb/stack.c
diff --git a/contrib/gdb/gdb/stack.h b/gdb/stack.h
similarity index 100%
rename from contrib/gdb/gdb/stack.h
rename to gdb/stack.h
diff --git a/contrib/gdb/gdb/standalone.c b/gdb/standalone.c
similarity index 100%
rename from contrib/gdb/gdb/standalone.c
rename to gdb/standalone.c
diff --git a/contrib/gdb/gdb/std-regs.c b/gdb/std-regs.c
similarity index 100%
rename from contrib/gdb/gdb/std-regs.c
rename to gdb/std-regs.c
diff --git a/contrib/gdb/gdb/stop-gdb.c b/gdb/stop-gdb.c
similarity index 100%
rename from contrib/gdb/gdb/stop-gdb.c
rename to gdb/stop-gdb.c
diff --git a/contrib/gdb/gdb/sun3-nat.c b/gdb/sun3-nat.c
similarity index 100%
rename from contrib/gdb/gdb/sun3-nat.c
rename to gdb/sun3-nat.c
diff --git a/contrib/gdb/gdb/symfile.c b/gdb/symfile.c
similarity index 100%
rename from contrib/gdb/gdb/symfile.c
rename to gdb/symfile.c
diff --git a/contrib/gdb/gdb/symfile.h b/gdb/symfile.h
similarity index 100%
rename from contrib/gdb/gdb/symfile.h
rename to gdb/symfile.h
diff --git a/contrib/gdb/gdb/symmisc.c b/gdb/symmisc.c
similarity index 100%
rename from contrib/gdb/gdb/symmisc.c
rename to gdb/symmisc.c
diff --git a/contrib/gdb/gdb/symtab.c b/gdb/symtab.c
similarity index 100%
rename from contrib/gdb/gdb/symtab.c
rename to gdb/symtab.c
diff --git a/contrib/gdb/gdb/symtab.h b/gdb/symtab.h
similarity index 100%
rename from contrib/gdb/gdb/symtab.h
rename to gdb/symtab.h
diff --git a/contrib/gdb/gdb/target.c b/gdb/target.c
similarity index 100%
rename from contrib/gdb/gdb/target.c
rename to gdb/target.c
diff --git a/contrib/gdb/gdb/target.h b/gdb/target.h
similarity index 100%
rename from contrib/gdb/gdb/target.h
rename to gdb/target.h
diff --git a/contrib/gdb/gdb/terminal.h b/gdb/terminal.h
similarity index 100%
rename from contrib/gdb/gdb/terminal.h
rename to gdb/terminal.h
diff --git a/contrib/gdb/gdb/thread-db.c b/gdb/thread-db.c
similarity index 100%
rename from contrib/gdb/gdb/thread-db.c
rename to gdb/thread-db.c
diff --git a/contrib/gdb/gdb/thread.c b/gdb/thread.c
similarity index 100%
rename from contrib/gdb/gdb/thread.c
rename to gdb/thread.c
diff --git a/contrib/gdb/gdb/top.c b/gdb/top.c
similarity index 100%
rename from contrib/gdb/gdb/top.c
rename to gdb/top.c
diff --git a/contrib/gdb/gdb/top.h b/gdb/top.h
similarity index 100%
rename from contrib/gdb/gdb/top.h
rename to gdb/top.h
diff --git a/contrib/gdb/gdb/tracepoint.c b/gdb/tracepoint.c
similarity index 100%
rename from contrib/gdb/gdb/tracepoint.c
rename to gdb/tracepoint.c
diff --git a/contrib/gdb/gdb/tracepoint.h b/gdb/tracepoint.h
similarity index 100%
rename from contrib/gdb/gdb/tracepoint.h
rename to gdb/tracepoint.h
diff --git a/contrib/gdb/gdb/trad-frame.c b/gdb/trad-frame.c
similarity index 100%
rename from contrib/gdb/gdb/trad-frame.c
rename to gdb/trad-frame.c
diff --git a/contrib/gdb/gdb/trad-frame.h b/gdb/trad-frame.h
similarity index 100%
rename from contrib/gdb/gdb/trad-frame.h
rename to gdb/trad-frame.h
diff --git a/contrib/gdb/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-command.c
rename to gdb/tui/tui-command.c
diff --git a/contrib/gdb/gdb/tui/tui-command.h b/gdb/tui/tui-command.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-command.h
rename to gdb/tui/tui-command.h
diff --git a/contrib/gdb/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-data.c
rename to gdb/tui/tui-data.c
diff --git a/contrib/gdb/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-data.h
rename to gdb/tui/tui-data.h
diff --git a/contrib/gdb/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-disasm.c
rename to gdb/tui/tui-disasm.c
diff --git a/contrib/gdb/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-disasm.h
rename to gdb/tui/tui-disasm.h
diff --git a/contrib/gdb/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-file.c
rename to gdb/tui/tui-file.c
diff --git a/contrib/gdb/gdb/tui/tui-file.h b/gdb/tui/tui-file.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-file.h
rename to gdb/tui/tui-file.h
diff --git a/contrib/gdb/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-hooks.c
rename to gdb/tui/tui-hooks.c
diff --git a/contrib/gdb/gdb/tui/tui-hooks.h b/gdb/tui/tui-hooks.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-hooks.h
rename to gdb/tui/tui-hooks.h
diff --git a/contrib/gdb/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-interp.c
rename to gdb/tui/tui-interp.c
diff --git a/contrib/gdb/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-io.c
rename to gdb/tui/tui-io.c
diff --git a/contrib/gdb/gdb/tui/tui-io.h b/gdb/tui/tui-io.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-io.h
rename to gdb/tui/tui-io.h
diff --git a/contrib/gdb/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-layout.c
rename to gdb/tui/tui-layout.c
diff --git a/contrib/gdb/gdb/tui/tui-layout.h b/gdb/tui/tui-layout.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-layout.h
rename to gdb/tui/tui-layout.h
diff --git a/contrib/gdb/gdb/tui/tui-main.c b/gdb/tui/tui-main.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-main.c
rename to gdb/tui/tui-main.c
diff --git a/contrib/gdb/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-out.c
rename to gdb/tui/tui-out.c
diff --git a/contrib/gdb/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-regs.c
rename to gdb/tui/tui-regs.c
diff --git a/contrib/gdb/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-regs.h
rename to gdb/tui/tui-regs.h
diff --git a/contrib/gdb/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-source.c
rename to gdb/tui/tui-source.c
diff --git a/contrib/gdb/gdb/tui/tui-source.h b/gdb/tui/tui-source.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-source.h
rename to gdb/tui/tui-source.h
diff --git a/contrib/gdb/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-stack.c
rename to gdb/tui/tui-stack.c
diff --git a/contrib/gdb/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-stack.h
rename to gdb/tui/tui-stack.h
diff --git a/contrib/gdb/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-win.c
rename to gdb/tui/tui-win.c
diff --git a/contrib/gdb/gdb/tui/tui-win.h b/gdb/tui/tui-win.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-win.h
rename to gdb/tui/tui-win.h
diff --git a/contrib/gdb/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-windata.c
rename to gdb/tui/tui-windata.c
diff --git a/contrib/gdb/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-windata.h
rename to gdb/tui/tui-windata.h
diff --git a/contrib/gdb/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-wingeneral.c
rename to gdb/tui/tui-wingeneral.c
diff --git a/contrib/gdb/gdb/tui/tui-wingeneral.h b/gdb/tui/tui-wingeneral.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-wingeneral.h
rename to gdb/tui/tui-wingeneral.h
diff --git a/contrib/gdb/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-winsource.c
rename to gdb/tui/tui-winsource.c
diff --git a/contrib/gdb/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui-winsource.h
rename to gdb/tui/tui-winsource.h
diff --git a/contrib/gdb/gdb/tui/tui.c b/gdb/tui/tui.c
similarity index 100%
rename from contrib/gdb/gdb/tui/tui.c
rename to gdb/tui/tui.c
diff --git a/contrib/gdb/gdb/tui/tui.h b/gdb/tui/tui.h
similarity index 100%
rename from contrib/gdb/gdb/tui/tui.h
rename to gdb/tui/tui.h
diff --git a/contrib/gdb/gdb/typeprint.c b/gdb/typeprint.c
similarity index 100%
rename from contrib/gdb/gdb/typeprint.c
rename to gdb/typeprint.c
diff --git a/contrib/gdb/gdb/typeprint.h b/gdb/typeprint.h
similarity index 100%
rename from contrib/gdb/gdb/typeprint.h
rename to gdb/typeprint.h
diff --git a/contrib/gdb/gdb/ui-file.c b/gdb/ui-file.c
similarity index 100%
rename from contrib/gdb/gdb/ui-file.c
rename to gdb/ui-file.c
diff --git a/contrib/gdb/gdb/ui-file.h b/gdb/ui-file.h
similarity index 100%
rename from contrib/gdb/gdb/ui-file.h
rename to gdb/ui-file.h
diff --git a/contrib/gdb/gdb/ui-out.c b/gdb/ui-out.c
similarity index 100%
rename from contrib/gdb/gdb/ui-out.c
rename to gdb/ui-out.c
diff --git a/contrib/gdb/gdb/ui-out.h b/gdb/ui-out.h
similarity index 100%
rename from contrib/gdb/gdb/ui-out.h
rename to gdb/ui-out.h
diff --git a/contrib/gdb/gdb/user-regs.c b/gdb/user-regs.c
similarity index 100%
rename from contrib/gdb/gdb/user-regs.c
rename to gdb/user-regs.c
diff --git a/contrib/gdb/gdb/user-regs.h b/gdb/user-regs.h
similarity index 100%
rename from contrib/gdb/gdb/user-regs.h
rename to gdb/user-regs.h
diff --git a/contrib/gdb/gdb/utils.c b/gdb/utils.c
similarity index 100%
rename from contrib/gdb/gdb/utils.c
rename to gdb/utils.c
diff --git a/contrib/gdb/gdb/uw-thread.c b/gdb/uw-thread.c
similarity index 100%
rename from contrib/gdb/gdb/uw-thread.c
rename to gdb/uw-thread.c
diff --git a/contrib/gdb/gdb/valarith.c b/gdb/valarith.c
similarity index 100%
rename from contrib/gdb/gdb/valarith.c
rename to gdb/valarith.c
diff --git a/contrib/gdb/gdb/valops.c b/gdb/valops.c
similarity index 100%
rename from contrib/gdb/gdb/valops.c
rename to gdb/valops.c
diff --git a/contrib/gdb/gdb/valprint.c b/gdb/valprint.c
similarity index 100%
rename from contrib/gdb/gdb/valprint.c
rename to gdb/valprint.c
diff --git a/contrib/gdb/gdb/valprint.h b/gdb/valprint.h
similarity index 100%
rename from contrib/gdb/gdb/valprint.h
rename to gdb/valprint.h
diff --git a/contrib/gdb/gdb/value.h b/gdb/value.h
similarity index 100%
rename from contrib/gdb/gdb/value.h
rename to gdb/value.h
diff --git a/contrib/gdb/gdb/values.c b/gdb/values.c
similarity index 100%
rename from contrib/gdb/gdb/values.c
rename to gdb/values.c
diff --git a/contrib/gdb/gdb/varobj.c b/gdb/varobj.c
similarity index 100%
rename from contrib/gdb/gdb/varobj.c
rename to gdb/varobj.c
diff --git a/contrib/gdb/gdb/varobj.h b/gdb/varobj.h
similarity index 100%
rename from contrib/gdb/gdb/varobj.h
rename to gdb/varobj.h
diff --git a/contrib/gdb/gdb/version.h b/gdb/version.h
similarity index 100%
rename from contrib/gdb/gdb/version.h
rename to gdb/version.h
diff --git a/contrib/gdb/gdb/version.in b/gdb/version.in
similarity index 100%
rename from contrib/gdb/gdb/version.in
rename to gdb/version.in
diff --git a/contrib/gdb/gdb/win32-nat.c b/gdb/win32-nat.c
similarity index 100%
rename from contrib/gdb/gdb/win32-nat.c
rename to gdb/win32-nat.c
diff --git a/contrib/gdb/gdb/wince-stub.c b/gdb/wince-stub.c
similarity index 100%
rename from contrib/gdb/gdb/wince-stub.c
rename to gdb/wince-stub.c
diff --git a/contrib/gdb/gdb/wince-stub.h b/gdb/wince-stub.h
similarity index 100%
rename from contrib/gdb/gdb/wince-stub.h
rename to gdb/wince-stub.h
diff --git a/contrib/gdb/gdb/wince.c b/gdb/wince.c
similarity index 100%
rename from contrib/gdb/gdb/wince.c
rename to gdb/wince.c
diff --git a/contrib/gdb/gdb/wrapper.c b/gdb/wrapper.c
similarity index 100%
rename from contrib/gdb/gdb/wrapper.c
rename to gdb/wrapper.c
diff --git a/contrib/gdb/gdb/wrapper.h b/gdb/wrapper.h
similarity index 100%
rename from contrib/gdb/gdb/wrapper.h
rename to gdb/wrapper.h
diff --git a/contrib/gdb/gdb/xcoffread.c b/gdb/xcoffread.c
similarity index 100%
rename from contrib/gdb/gdb/xcoffread.c
rename to gdb/xcoffread.c
diff --git a/contrib/gdb/gdb/xcoffsolib.c b/gdb/xcoffsolib.c
similarity index 100%
rename from contrib/gdb/gdb/xcoffsolib.c
rename to gdb/xcoffsolib.c
diff --git a/contrib/gdb/gdb/xcoffsolib.h b/gdb/xcoffsolib.h
similarity index 100%
rename from contrib/gdb/gdb/xcoffsolib.h
rename to gdb/xcoffsolib.h
diff --git a/contrib/gdb/gdb/xmodem.c b/gdb/xmodem.c
similarity index 100%
rename from contrib/gdb/gdb/xmodem.c
rename to gdb/xmodem.c
diff --git a/contrib/gdb/gdb/xmodem.h b/gdb/xmodem.h
similarity index 100%
rename from contrib/gdb/gdb/xmodem.h
rename to gdb/xmodem.h
diff --git a/contrib/gdb/gettext.m4 b/gettext.m4
similarity index 100%
rename from contrib/gdb/gettext.m4
rename to gettext.m4
diff --git a/contrib/gdb/include/COPYING b/include/COPYING
similarity index 100%
rename from contrib/gdb/include/COPYING
rename to include/COPYING
diff --git a/contrib/gdb/include/MAINTAINERS b/include/MAINTAINERS
similarity index 100%
rename from contrib/gdb/include/MAINTAINERS
rename to include/MAINTAINERS
diff --git a/contrib/gdb/include/alloca-conf.h b/include/alloca-conf.h
similarity index 100%
rename from contrib/gdb/include/alloca-conf.h
rename to include/alloca-conf.h
diff --git a/contrib/gdb/include/ansidecl.h b/include/ansidecl.h
similarity index 100%
rename from contrib/gdb/include/ansidecl.h
rename to include/ansidecl.h
diff --git a/contrib/gdb/include/bfdlink.h b/include/bfdlink.h
similarity index 100%
rename from contrib/gdb/include/bfdlink.h
rename to include/bfdlink.h
diff --git a/contrib/gdb/include/bin-bugs.h b/include/bin-bugs.h
similarity index 100%
rename from contrib/gdb/include/bin-bugs.h
rename to include/bin-bugs.h
diff --git a/contrib/gdb/include/bout.h b/include/bout.h
similarity index 100%
rename from contrib/gdb/include/bout.h
rename to include/bout.h
diff --git a/contrib/gdb/include/demangle.h b/include/demangle.h
similarity index 100%
rename from contrib/gdb/include/demangle.h
rename to include/demangle.h
diff --git a/contrib/gdb/include/dis-asm.h b/include/dis-asm.h
similarity index 100%
rename from contrib/gdb/include/dis-asm.h
rename to include/dis-asm.h
diff --git a/contrib/gdb/include/dyn-string.h b/include/dyn-string.h
similarity index 100%
rename from contrib/gdb/include/dyn-string.h
rename to include/dyn-string.h
diff --git a/contrib/gdb/include/fibheap.h b/include/fibheap.h
similarity index 100%
rename from contrib/gdb/include/fibheap.h
rename to include/fibheap.h
diff --git a/contrib/gdb/include/filenames.h b/include/filenames.h
similarity index 100%
rename from contrib/gdb/include/filenames.h
rename to include/filenames.h
diff --git a/contrib/gdb/include/floatformat.h b/include/floatformat.h
similarity index 100%
rename from contrib/gdb/include/floatformat.h
rename to include/floatformat.h
diff --git a/contrib/gdb/include/fnmatch.h b/include/fnmatch.h
similarity index 100%
rename from contrib/gdb/include/fnmatch.h
rename to include/fnmatch.h
diff --git a/contrib/gdb/include/fopen-bin.h b/include/fopen-bin.h
similarity index 100%
rename from contrib/gdb/include/fopen-bin.h
rename to include/fopen-bin.h
diff --git a/contrib/gdb/include/fopen-same.h b/include/fopen-same.h
similarity index 100%
rename from contrib/gdb/include/fopen-same.h
rename to include/fopen-same.h
diff --git a/contrib/gdb/include/fopen-vms.h b/include/fopen-vms.h
similarity index 100%
rename from contrib/gdb/include/fopen-vms.h
rename to include/fopen-vms.h
diff --git a/contrib/gdb/include/gdb/callback.h b/include/gdb/callback.h
similarity index 100%
rename from contrib/gdb/include/gdb/callback.h
rename to include/gdb/callback.h
diff --git a/contrib/gdb/include/gdb/fileio.h b/include/gdb/fileio.h
similarity index 100%
rename from contrib/gdb/include/gdb/fileio.h
rename to include/gdb/fileio.h
diff --git a/contrib/gdb/include/gdb/remote-sim.h b/include/gdb/remote-sim.h
similarity index 100%
rename from contrib/gdb/include/gdb/remote-sim.h
rename to include/gdb/remote-sim.h
diff --git a/contrib/gdb/include/gdb/signals.h b/include/gdb/signals.h
similarity index 100%
rename from contrib/gdb/include/gdb/signals.h
rename to include/gdb/signals.h
diff --git a/contrib/gdb/include/gdb/sim-arm.h b/include/gdb/sim-arm.h
similarity index 100%
rename from contrib/gdb/include/gdb/sim-arm.h
rename to include/gdb/sim-arm.h
diff --git a/contrib/gdb/include/gdb/sim-d10v.h b/include/gdb/sim-d10v.h
similarity index 100%
rename from contrib/gdb/include/gdb/sim-d10v.h
rename to include/gdb/sim-d10v.h
diff --git a/contrib/gdb/include/gdb/sim-frv.h b/include/gdb/sim-frv.h
similarity index 100%
rename from contrib/gdb/include/gdb/sim-frv.h
rename to include/gdb/sim-frv.h
diff --git a/contrib/gdb/include/gdb/sim-h8300.h b/include/gdb/sim-h8300.h
similarity index 100%
rename from contrib/gdb/include/gdb/sim-h8300.h
rename to include/gdb/sim-h8300.h
diff --git a/contrib/gdb/include/gdb/sim-sh.h b/include/gdb/sim-sh.h
similarity index 100%
rename from contrib/gdb/include/gdb/sim-sh.h
rename to include/gdb/sim-sh.h
diff --git a/contrib/gdb/include/gdbm.h b/include/gdbm.h
similarity index 100%
rename from contrib/gdb/include/gdbm.h
rename to include/gdbm.h
diff --git a/contrib/gdb/include/getopt.h b/include/getopt.h
similarity index 100%
rename from contrib/gdb/include/getopt.h
rename to include/getopt.h
diff --git a/contrib/gdb/include/hashtab.h b/include/hashtab.h
similarity index 100%
rename from contrib/gdb/include/hashtab.h
rename to include/hashtab.h
diff --git a/contrib/gdb/include/hp-symtab.h b/include/hp-symtab.h
similarity index 100%
rename from contrib/gdb/include/hp-symtab.h
rename to include/hp-symtab.h
diff --git a/contrib/gdb/include/ieee.h b/include/ieee.h
similarity index 100%
rename from contrib/gdb/include/ieee.h
rename to include/ieee.h
diff --git a/contrib/gdb/include/libiberty.h b/include/libiberty.h
similarity index 100%
rename from contrib/gdb/include/libiberty.h
rename to include/libiberty.h
diff --git a/contrib/gdb/include/md5.h b/include/md5.h
similarity index 100%
rename from contrib/gdb/include/md5.h
rename to include/md5.h
diff --git a/contrib/gdb/include/oasys.h b/include/oasys.h
similarity index 100%
rename from contrib/gdb/include/oasys.h
rename to include/oasys.h
diff --git a/contrib/gdb/include/objalloc.h b/include/objalloc.h
similarity index 100%
rename from contrib/gdb/include/objalloc.h
rename to include/objalloc.h
diff --git a/contrib/gdb/include/obstack.h b/include/obstack.h
similarity index 100%
rename from contrib/gdb/include/obstack.h
rename to include/obstack.h
diff --git a/contrib/gdb/include/os9k.h b/include/os9k.h
similarity index 100%
rename from contrib/gdb/include/os9k.h
rename to include/os9k.h
diff --git a/contrib/gdb/include/partition.h b/include/partition.h
similarity index 100%
rename from contrib/gdb/include/partition.h
rename to include/partition.h
diff --git a/contrib/gdb/include/progress.h b/include/progress.h
similarity index 100%
rename from contrib/gdb/include/progress.h
rename to include/progress.h
diff --git a/contrib/gdb/include/safe-ctype.h b/include/safe-ctype.h
similarity index 100%
rename from contrib/gdb/include/safe-ctype.h
rename to include/safe-ctype.h
diff --git a/contrib/gdb/include/sort.h b/include/sort.h
similarity index 100%
rename from contrib/gdb/include/sort.h
rename to include/sort.h
diff --git a/contrib/gdb/include/splay-tree.h b/include/splay-tree.h
similarity index 100%
rename from contrib/gdb/include/splay-tree.h
rename to include/splay-tree.h
diff --git a/contrib/gdb/include/symcat.h b/include/symcat.h
similarity index 100%
rename from contrib/gdb/include/symcat.h
rename to include/symcat.h
diff --git a/contrib/gdb/include/ternary.h b/include/ternary.h
similarity index 100%
rename from contrib/gdb/include/ternary.h
rename to include/ternary.h
diff --git a/contrib/gdb/include/xregex.h b/include/xregex.h
similarity index 100%
rename from contrib/gdb/include/xregex.h
rename to include/xregex.h
diff --git a/contrib/gdb/include/xregex2.h b/include/xregex2.h
similarity index 100%
rename from contrib/gdb/include/xregex2.h
rename to include/xregex2.h
diff --git a/contrib/gdb/include/xtensa-isa-internal.h b/include/xtensa-isa-internal.h
similarity index 100%
rename from contrib/gdb/include/xtensa-isa-internal.h
rename to include/xtensa-isa-internal.h
diff --git a/contrib/gdb/include/xtensa-isa.h b/include/xtensa-isa.h
similarity index 100%
rename from contrib/gdb/include/xtensa-isa.h
rename to include/xtensa-isa.h
diff --git a/contrib/gdb/install-sh b/install-sh
similarity index 100%
rename from contrib/gdb/install-sh
rename to install-sh
diff --git a/contrib/gdb/libtool.m4 b/libtool.m4
similarity index 100%
rename from contrib/gdb/libtool.m4
rename to libtool.m4
diff --git a/contrib/gdb/ltcf-c.sh b/ltcf-c.sh
similarity index 100%
rename from contrib/gdb/ltcf-c.sh
rename to ltcf-c.sh
diff --git a/contrib/gdb/ltcf-cxx.sh b/ltcf-cxx.sh
similarity index 100%
rename from contrib/gdb/ltcf-cxx.sh
rename to ltcf-cxx.sh
diff --git a/contrib/gdb/ltcf-gcj.sh b/ltcf-gcj.sh
similarity index 100%
rename from contrib/gdb/ltcf-gcj.sh
rename to ltcf-gcj.sh
diff --git a/contrib/gdb/ltconfig b/ltconfig
similarity index 100%
rename from contrib/gdb/ltconfig
rename to ltconfig
diff --git a/contrib/gdb/ltmain.sh b/ltmain.sh
similarity index 100%
rename from contrib/gdb/ltmain.sh
rename to ltmain.sh
diff --git a/contrib/gdb/md5.sum b/md5.sum
similarity index 100%
rename from contrib/gdb/md5.sum
rename to md5.sum
diff --git a/contrib/gdb/missing b/missing
similarity index 100%
rename from contrib/gdb/missing
rename to missing
diff --git a/contrib/gdb/mkinstalldirs b/mkinstalldirs
similarity index 100%
rename from contrib/gdb/mkinstalldirs
rename to mkinstalldirs
diff --git a/contrib/gdb/move-if-change b/move-if-change
similarity index 100%
rename from contrib/gdb/move-if-change
rename to move-if-change
diff --git a/contrib/gdb/src-release b/src-release
similarity index 100%
rename from contrib/gdb/src-release
rename to src-release
diff --git a/contrib/gdb/symlink-tree b/symlink-tree
similarity index 100%
rename from contrib/gdb/symlink-tree
rename to symlink-tree
diff --git a/contrib/gdb/ylwrap b/ylwrap
similarity index 100%
rename from contrib/gdb/ylwrap
rename to ylwrap