diff --git a/lld/test/elf/AArch64/Inputs/fn.c b/lld/test/old-elf/AArch64/Inputs/fn.c
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/fn.c
rename to lld/test/old-elf/AArch64/Inputs/fn.c
diff --git a/lld/test/elf/AArch64/Inputs/fn.o b/lld/test/old-elf/AArch64/Inputs/fn.o
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/fn.o
rename to lld/test/old-elf/AArch64/Inputs/fn.o
diff --git a/lld/test/elf/AArch64/Inputs/general-dyn-tls-0.yaml b/lld/test/old-elf/AArch64/Inputs/general-dyn-tls-0.yaml
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/general-dyn-tls-0.yaml
rename to lld/test/old-elf/AArch64/Inputs/general-dyn-tls-0.yaml
diff --git a/lld/test/elf/AArch64/Inputs/initfini-option.c b/lld/test/old-elf/AArch64/Inputs/initfini-option.c
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/initfini-option.c
rename to lld/test/old-elf/AArch64/Inputs/initfini-option.c
diff --git a/lld/test/elf/AArch64/Inputs/initfini-option.o b/lld/test/old-elf/AArch64/Inputs/initfini-option.o
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/initfini-option.o
rename to lld/test/old-elf/AArch64/Inputs/initfini-option.o
diff --git a/lld/test/elf/AArch64/Inputs/initfini.c b/lld/test/old-elf/AArch64/Inputs/initfini.c
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/initfini.c
rename to lld/test/old-elf/AArch64/Inputs/initfini.c
diff --git a/lld/test/elf/AArch64/Inputs/initfini.o b/lld/test/old-elf/AArch64/Inputs/initfini.o
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/initfini.o
rename to lld/test/old-elf/AArch64/Inputs/initfini.o
diff --git a/lld/test/elf/AArch64/Inputs/initial-exec-tls-1.yaml b/lld/test/old-elf/AArch64/Inputs/initial-exec-tls-1.yaml
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/initial-exec-tls-1.yaml
rename to lld/test/old-elf/AArch64/Inputs/initial-exec-tls-1.yaml
diff --git a/lld/test/elf/AArch64/Inputs/main.c b/lld/test/old-elf/AArch64/Inputs/main.c
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/main.c
rename to lld/test/old-elf/AArch64/Inputs/main.c
diff --git a/lld/test/elf/AArch64/Inputs/main.o b/lld/test/old-elf/AArch64/Inputs/main.o
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/main.o
rename to lld/test/old-elf/AArch64/Inputs/main.o
diff --git a/lld/test/elf/AArch64/Inputs/no-interp-section.c b/lld/test/old-elf/AArch64/Inputs/no-interp-section.c
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/no-interp-section.c
rename to lld/test/old-elf/AArch64/Inputs/no-interp-section.c
diff --git a/lld/test/elf/AArch64/Inputs/no-interp-section.o b/lld/test/old-elf/AArch64/Inputs/no-interp-section.o
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/no-interp-section.o
rename to lld/test/old-elf/AArch64/Inputs/no-interp-section.o
diff --git a/lld/test/elf/AArch64/Inputs/zerosizedsection.o b/lld/test/old-elf/AArch64/Inputs/zerosizedsection.o
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/zerosizedsection.o
rename to lld/test/old-elf/AArch64/Inputs/zerosizedsection.o
diff --git a/lld/test/elf/AArch64/Inputs/zerosizedsection.s b/lld/test/old-elf/AArch64/Inputs/zerosizedsection.s
similarity index 100%
rename from lld/test/elf/AArch64/Inputs/zerosizedsection.s
rename to lld/test/old-elf/AArch64/Inputs/zerosizedsection.s
diff --git a/lld/test/elf/AArch64/defsym.test b/lld/test/old-elf/AArch64/defsym.test
similarity index 100%
rename from lld/test/elf/AArch64/defsym.test
rename to lld/test/old-elf/AArch64/defsym.test
diff --git a/lld/test/elf/AArch64/dontignorezerosize-sections.test b/lld/test/old-elf/AArch64/dontignorezerosize-sections.test
similarity index 100%
rename from lld/test/elf/AArch64/dontignorezerosize-sections.test
rename to lld/test/old-elf/AArch64/dontignorezerosize-sections.test
diff --git a/lld/test/elf/AArch64/dynamicvars.test b/lld/test/old-elf/AArch64/dynamicvars.test
similarity index 100%
rename from lld/test/elf/AArch64/dynamicvars.test
rename to lld/test/old-elf/AArch64/dynamicvars.test
diff --git a/lld/test/elf/AArch64/dynlib-nointerp-section.test b/lld/test/old-elf/AArch64/dynlib-nointerp-section.test
similarity index 100%
rename from lld/test/elf/AArch64/dynlib-nointerp-section.test
rename to lld/test/old-elf/AArch64/dynlib-nointerp-section.test
diff --git a/lld/test/elf/AArch64/general-dyn-tls-0.test b/lld/test/old-elf/AArch64/general-dyn-tls-0.test
similarity index 100%
rename from lld/test/elf/AArch64/general-dyn-tls-0.test
rename to lld/test/old-elf/AArch64/general-dyn-tls-0.test
diff --git a/lld/test/elf/AArch64/initfini.test b/lld/test/old-elf/AArch64/initfini.test
similarity index 100%
rename from lld/test/elf/AArch64/initfini.test
rename to lld/test/old-elf/AArch64/initfini.test
diff --git a/lld/test/elf/AArch64/initial-exec-tls-0.test b/lld/test/old-elf/AArch64/initial-exec-tls-0.test
similarity index 100%
rename from lld/test/elf/AArch64/initial-exec-tls-0.test
rename to lld/test/old-elf/AArch64/initial-exec-tls-0.test
diff --git a/lld/test/elf/AArch64/local-tls.test b/lld/test/old-elf/AArch64/local-tls.test
similarity index 100%
rename from lld/test/elf/AArch64/local-tls.test
rename to lld/test/old-elf/AArch64/local-tls.test
diff --git a/lld/test/elf/AArch64/rel-abs16-overflow.test b/lld/test/old-elf/AArch64/rel-abs16-overflow.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-abs16-overflow.test
rename to lld/test/old-elf/AArch64/rel-abs16-overflow.test
diff --git a/lld/test/elf/AArch64/rel-abs16.test b/lld/test/old-elf/AArch64/rel-abs16.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-abs16.test
rename to lld/test/old-elf/AArch64/rel-abs16.test
diff --git a/lld/test/elf/AArch64/rel-abs32-overflow.test b/lld/test/old-elf/AArch64/rel-abs32-overflow.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-abs32-overflow.test
rename to lld/test/old-elf/AArch64/rel-abs32-overflow.test
diff --git a/lld/test/elf/AArch64/rel-abs32.test b/lld/test/old-elf/AArch64/rel-abs32.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-abs32.test
rename to lld/test/old-elf/AArch64/rel-abs32.test
diff --git a/lld/test/elf/AArch64/rel-abs64.test b/lld/test/old-elf/AArch64/rel-abs64.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-abs64.test
rename to lld/test/old-elf/AArch64/rel-abs64.test
diff --git a/lld/test/elf/AArch64/rel-adr_prel_lo21-overflow.test b/lld/test/old-elf/AArch64/rel-adr_prel_lo21-overflow.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-adr_prel_lo21-overflow.test
rename to lld/test/old-elf/AArch64/rel-adr_prel_lo21-overflow.test
diff --git a/lld/test/elf/AArch64/rel-adr_prel_lo21.test b/lld/test/old-elf/AArch64/rel-adr_prel_lo21.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-adr_prel_lo21.test
rename to lld/test/old-elf/AArch64/rel-adr_prel_lo21.test
diff --git a/lld/test/elf/AArch64/rel-adr_prel_pg_hi21-overflow.test b/lld/test/old-elf/AArch64/rel-adr_prel_pg_hi21-overflow.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-adr_prel_pg_hi21-overflow.test
rename to lld/test/old-elf/AArch64/rel-adr_prel_pg_hi21-overflow.test
diff --git a/lld/test/elf/AArch64/rel-adr_prel_pg_hi21.test b/lld/test/old-elf/AArch64/rel-adr_prel_pg_hi21.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-adr_prel_pg_hi21.test
rename to lld/test/old-elf/AArch64/rel-adr_prel_pg_hi21.test
diff --git a/lld/test/elf/AArch64/rel-bad.test b/lld/test/old-elf/AArch64/rel-bad.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-bad.test
rename to lld/test/old-elf/AArch64/rel-bad.test
diff --git a/lld/test/elf/AArch64/rel-prel16-overflow.test b/lld/test/old-elf/AArch64/rel-prel16-overflow.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-prel16-overflow.test
rename to lld/test/old-elf/AArch64/rel-prel16-overflow.test
diff --git a/lld/test/elf/AArch64/rel-prel16.test b/lld/test/old-elf/AArch64/rel-prel16.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-prel16.test
rename to lld/test/old-elf/AArch64/rel-prel16.test
diff --git a/lld/test/elf/AArch64/rel-prel32-overflow.test b/lld/test/old-elf/AArch64/rel-prel32-overflow.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-prel32-overflow.test
rename to lld/test/old-elf/AArch64/rel-prel32-overflow.test
diff --git a/lld/test/elf/AArch64/rel-prel32.test b/lld/test/old-elf/AArch64/rel-prel32.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-prel32.test
rename to lld/test/old-elf/AArch64/rel-prel32.test
diff --git a/lld/test/elf/AArch64/rel-prel64.test b/lld/test/old-elf/AArch64/rel-prel64.test
similarity index 100%
rename from lld/test/elf/AArch64/rel-prel64.test
rename to lld/test/old-elf/AArch64/rel-prel64.test
diff --git a/lld/test/elf/AMDGPU/hsa.test b/lld/test/old-elf/AMDGPU/hsa.test
similarity index 100%
rename from lld/test/elf/AMDGPU/hsa.test
rename to lld/test/old-elf/AMDGPU/hsa.test
diff --git a/lld/test/elf/ARM/Inputs/fn.c b/lld/test/old-elf/ARM/Inputs/fn.c
similarity index 100%
rename from lld/test/elf/ARM/Inputs/fn.c
rename to lld/test/old-elf/ARM/Inputs/fn.c
diff --git a/lld/test/elf/ARM/Inputs/libfn.so b/lld/test/old-elf/ARM/Inputs/libfn.so
similarity index 100%
rename from lld/test/elf/ARM/Inputs/libfn.so
rename to lld/test/old-elf/ARM/Inputs/libfn.so
diff --git a/lld/test/elf/ARM/Inputs/libobj.so b/lld/test/old-elf/ARM/Inputs/libobj.so
similarity index 100%
rename from lld/test/elf/ARM/Inputs/libobj.so
rename to lld/test/old-elf/ARM/Inputs/libobj.so
diff --git a/lld/test/elf/ARM/Inputs/obj.c b/lld/test/old-elf/ARM/Inputs/obj.c
similarity index 100%
rename from lld/test/elf/ARM/Inputs/obj.c
rename to lld/test/old-elf/ARM/Inputs/obj.c
diff --git a/lld/test/elf/ARM/arm-symbols.test b/lld/test/old-elf/ARM/arm-symbols.test
similarity index 100%
rename from lld/test/elf/ARM/arm-symbols.test
rename to lld/test/old-elf/ARM/arm-symbols.test
diff --git a/lld/test/elf/ARM/defsym.test b/lld/test/old-elf/ARM/defsym.test
similarity index 100%
rename from lld/test/elf/ARM/defsym.test
rename to lld/test/old-elf/ARM/defsym.test
diff --git a/lld/test/elf/ARM/dynamic-symbols.test b/lld/test/old-elf/ARM/dynamic-symbols.test
similarity index 100%
rename from lld/test/elf/ARM/dynamic-symbols.test
rename to lld/test/old-elf/ARM/dynamic-symbols.test
diff --git a/lld/test/elf/ARM/entry-point.test b/lld/test/old-elf/ARM/entry-point.test
similarity index 100%
rename from lld/test/elf/ARM/entry-point.test
rename to lld/test/old-elf/ARM/entry-point.test
diff --git a/lld/test/elf/ARM/exidx.test b/lld/test/old-elf/ARM/exidx.test
similarity index 100%
rename from lld/test/elf/ARM/exidx.test
rename to lld/test/old-elf/ARM/exidx.test
diff --git a/lld/test/elf/ARM/header-flags.test b/lld/test/old-elf/ARM/header-flags.test
similarity index 100%
rename from lld/test/elf/ARM/header-flags.test
rename to lld/test/old-elf/ARM/header-flags.test
diff --git a/lld/test/elf/ARM/mapping-code-model.test b/lld/test/old-elf/ARM/mapping-code-model.test
similarity index 100%
rename from lld/test/elf/ARM/mapping-code-model.test
rename to lld/test/old-elf/ARM/mapping-code-model.test
diff --git a/lld/test/elf/ARM/mapping-symbols.test b/lld/test/old-elf/ARM/mapping-symbols.test
similarity index 100%
rename from lld/test/elf/ARM/mapping-symbols.test
rename to lld/test/old-elf/ARM/mapping-symbols.test
diff --git a/lld/test/elf/ARM/missing-symbol.test b/lld/test/old-elf/ARM/missing-symbol.test
similarity index 100%
rename from lld/test/elf/ARM/missing-symbol.test
rename to lld/test/old-elf/ARM/missing-symbol.test
diff --git a/lld/test/elf/ARM/plt-dynamic.test b/lld/test/old-elf/ARM/plt-dynamic.test
similarity index 100%
rename from lld/test/elf/ARM/plt-dynamic.test
rename to lld/test/old-elf/ARM/plt-dynamic.test
diff --git a/lld/test/elf/ARM/plt-ifunc-interwork.test b/lld/test/old-elf/ARM/plt-ifunc-interwork.test
similarity index 100%
rename from lld/test/elf/ARM/plt-ifunc-interwork.test
rename to lld/test/old-elf/ARM/plt-ifunc-interwork.test
diff --git a/lld/test/elf/ARM/plt-ifunc-mapping.test b/lld/test/old-elf/ARM/plt-ifunc-mapping.test
similarity index 100%
rename from lld/test/elf/ARM/plt-ifunc-mapping.test
rename to lld/test/old-elf/ARM/plt-ifunc-mapping.test
diff --git a/lld/test/elf/ARM/rel-abs32.test b/lld/test/old-elf/ARM/rel-abs32.test
similarity index 100%
rename from lld/test/elf/ARM/rel-abs32.test
rename to lld/test/old-elf/ARM/rel-abs32.test
diff --git a/lld/test/elf/ARM/rel-arm-call.test b/lld/test/old-elf/ARM/rel-arm-call.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-call.test
rename to lld/test/old-elf/ARM/rel-arm-call.test
diff --git a/lld/test/elf/ARM/rel-arm-jump24-veneer-b.test b/lld/test/old-elf/ARM/rel-arm-jump24-veneer-b.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-jump24-veneer-b.test
rename to lld/test/old-elf/ARM/rel-arm-jump24-veneer-b.test
diff --git a/lld/test/elf/ARM/rel-arm-jump24-veneer-bl.test b/lld/test/old-elf/ARM/rel-arm-jump24-veneer-bl.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-jump24-veneer-bl.test
rename to lld/test/old-elf/ARM/rel-arm-jump24-veneer-bl.test
diff --git a/lld/test/elf/ARM/rel-arm-jump24.test b/lld/test/old-elf/ARM/rel-arm-jump24.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-jump24.test
rename to lld/test/old-elf/ARM/rel-arm-jump24.test
diff --git a/lld/test/elf/ARM/rel-arm-mov.test b/lld/test/old-elf/ARM/rel-arm-mov.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-mov.test
rename to lld/test/old-elf/ARM/rel-arm-mov.test
diff --git a/lld/test/elf/ARM/rel-arm-prel31.test b/lld/test/old-elf/ARM/rel-arm-prel31.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-prel31.test
rename to lld/test/old-elf/ARM/rel-arm-prel31.test
diff --git a/lld/test/elf/ARM/rel-arm-target1.test b/lld/test/old-elf/ARM/rel-arm-target1.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-target1.test
rename to lld/test/old-elf/ARM/rel-arm-target1.test
diff --git a/lld/test/elf/ARM/rel-arm-thm-interwork.test b/lld/test/old-elf/ARM/rel-arm-thm-interwork.test
similarity index 100%
rename from lld/test/elf/ARM/rel-arm-thm-interwork.test
rename to lld/test/old-elf/ARM/rel-arm-thm-interwork.test
diff --git a/lld/test/elf/ARM/rel-base-prel.test b/lld/test/old-elf/ARM/rel-base-prel.test
similarity index 100%
rename from lld/test/elf/ARM/rel-base-prel.test
rename to lld/test/old-elf/ARM/rel-base-prel.test
diff --git a/lld/test/elf/ARM/rel-copy.test b/lld/test/old-elf/ARM/rel-copy.test
similarity index 100%
rename from lld/test/elf/ARM/rel-copy.test
rename to lld/test/old-elf/ARM/rel-copy.test
diff --git a/lld/test/elf/ARM/rel-glob-dat.test b/lld/test/old-elf/ARM/rel-glob-dat.test
similarity index 100%
rename from lld/test/elf/ARM/rel-glob-dat.test
rename to lld/test/old-elf/ARM/rel-glob-dat.test
diff --git a/lld/test/elf/ARM/rel-got-brel.test b/lld/test/old-elf/ARM/rel-got-brel.test
similarity index 100%
rename from lld/test/elf/ARM/rel-got-brel.test
rename to lld/test/old-elf/ARM/rel-got-brel.test
diff --git a/lld/test/elf/ARM/rel-group-relocs.test b/lld/test/old-elf/ARM/rel-group-relocs.test
similarity index 100%
rename from lld/test/elf/ARM/rel-group-relocs.test
rename to lld/test/old-elf/ARM/rel-group-relocs.test
diff --git a/lld/test/elf/ARM/rel-ifunc.test b/lld/test/old-elf/ARM/rel-ifunc.test
similarity index 100%
rename from lld/test/elf/ARM/rel-ifunc.test
rename to lld/test/old-elf/ARM/rel-ifunc.test
diff --git a/lld/test/elf/ARM/rel-jump-slot.test b/lld/test/old-elf/ARM/rel-jump-slot.test
similarity index 100%
rename from lld/test/elf/ARM/rel-jump-slot.test
rename to lld/test/old-elf/ARM/rel-jump-slot.test
diff --git a/lld/test/elf/ARM/rel-rel32.test b/lld/test/old-elf/ARM/rel-rel32.test
similarity index 100%
rename from lld/test/elf/ARM/rel-rel32.test
rename to lld/test/old-elf/ARM/rel-rel32.test
diff --git a/lld/test/elf/ARM/rel-thm-call.test b/lld/test/old-elf/ARM/rel-thm-call.test
similarity index 100%
rename from lld/test/elf/ARM/rel-thm-call.test
rename to lld/test/old-elf/ARM/rel-thm-call.test
diff --git a/lld/test/elf/ARM/rel-thm-jump11.test b/lld/test/old-elf/ARM/rel-thm-jump11.test
similarity index 100%
rename from lld/test/elf/ARM/rel-thm-jump11.test
rename to lld/test/old-elf/ARM/rel-thm-jump11.test
diff --git a/lld/test/elf/ARM/rel-thm-jump24-veneer.test b/lld/test/old-elf/ARM/rel-thm-jump24-veneer.test
similarity index 100%
rename from lld/test/elf/ARM/rel-thm-jump24-veneer.test
rename to lld/test/old-elf/ARM/rel-thm-jump24-veneer.test
diff --git a/lld/test/elf/ARM/rel-thm-jump24.test b/lld/test/old-elf/ARM/rel-thm-jump24.test
similarity index 100%
rename from lld/test/elf/ARM/rel-thm-jump24.test
rename to lld/test/old-elf/ARM/rel-thm-jump24.test
diff --git a/lld/test/elf/ARM/rel-thm-mov.test b/lld/test/old-elf/ARM/rel-thm-mov.test
similarity index 100%
rename from lld/test/elf/ARM/rel-thm-mov.test
rename to lld/test/old-elf/ARM/rel-thm-mov.test
diff --git a/lld/test/elf/ARM/rel-tls-ie32.test b/lld/test/old-elf/ARM/rel-tls-ie32.test
similarity index 100%
rename from lld/test/elf/ARM/rel-tls-ie32.test
rename to lld/test/old-elf/ARM/rel-tls-ie32.test
diff --git a/lld/test/elf/ARM/rel-tls-le32.test b/lld/test/old-elf/ARM/rel-tls-le32.test
similarity index 100%
rename from lld/test/elf/ARM/rel-tls-le32.test
rename to lld/test/old-elf/ARM/rel-tls-le32.test
diff --git a/lld/test/elf/ARM/rel-v4bx.test b/lld/test/old-elf/ARM/rel-v4bx.test
similarity index 100%
rename from lld/test/elf/ARM/rel-v4bx.test
rename to lld/test/old-elf/ARM/rel-v4bx.test
diff --git a/lld/test/elf/ARM/thm-symbols.test b/lld/test/old-elf/ARM/thm-symbols.test
similarity index 100%
rename from lld/test/elf/ARM/thm-symbols.test
rename to lld/test/old-elf/ARM/thm-symbols.test
diff --git a/lld/test/elf/ARM/two-got-for-symbol.test b/lld/test/old-elf/ARM/two-got-for-symbol.test
similarity index 100%
rename from lld/test/elf/ARM/two-got-for-symbol.test
rename to lld/test/old-elf/ARM/two-got-for-symbol.test
diff --git a/lld/test/elf/ARM/undef-lazy-symbol.test b/lld/test/old-elf/ARM/undef-lazy-symbol.test
similarity index 100%
rename from lld/test/elf/ARM/undef-lazy-symbol.test
rename to lld/test/old-elf/ARM/undef-lazy-symbol.test
diff --git a/lld/test/elf/ARM/veneer-mapping.test b/lld/test/old-elf/ARM/veneer-mapping.test
similarity index 100%
rename from lld/test/elf/ARM/veneer-mapping.test
rename to lld/test/old-elf/ARM/veneer-mapping.test
diff --git a/lld/test/elf/ARM/weak-branch.test b/lld/test/old-elf/ARM/weak-branch.test
similarity index 100%
rename from lld/test/elf/ARM/weak-branch.test
rename to lld/test/old-elf/ARM/weak-branch.test
diff --git a/lld/test/elf/Hexagon/Inputs/dynobj-data.c b/lld/test/old-elf/Hexagon/Inputs/dynobj-data.c
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/dynobj-data.c
rename to lld/test/old-elf/Hexagon/Inputs/dynobj-data.c
diff --git a/lld/test/elf/Hexagon/Inputs/dynobj-data.o b/lld/test/old-elf/Hexagon/Inputs/dynobj-data.o
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/dynobj-data.o
rename to lld/test/old-elf/Hexagon/Inputs/dynobj-data.o
diff --git a/lld/test/elf/Hexagon/Inputs/dynobj.c b/lld/test/old-elf/Hexagon/Inputs/dynobj.c
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/dynobj.c
rename to lld/test/old-elf/Hexagon/Inputs/dynobj.c
diff --git a/lld/test/elf/Hexagon/Inputs/dynobj.o b/lld/test/old-elf/Hexagon/Inputs/dynobj.o
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/dynobj.o
rename to lld/test/old-elf/Hexagon/Inputs/dynobj.o
diff --git a/lld/test/elf/Hexagon/Inputs/got-plt-order.c b/lld/test/old-elf/Hexagon/Inputs/got-plt-order.c
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/got-plt-order.c
rename to lld/test/old-elf/Hexagon/Inputs/got-plt-order.c
diff --git a/lld/test/elf/Hexagon/Inputs/got-plt-order.o b/lld/test/old-elf/Hexagon/Inputs/got-plt-order.o
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/got-plt-order.o
rename to lld/test/old-elf/Hexagon/Inputs/got-plt-order.o
diff --git a/lld/test/elf/Hexagon/Inputs/libMaxAlignment.a b/lld/test/old-elf/Hexagon/Inputs/libMaxAlignment.a
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/libMaxAlignment.a
rename to lld/test/old-elf/Hexagon/Inputs/libMaxAlignment.a
diff --git a/lld/test/elf/Hexagon/Inputs/sda-base.o b/lld/test/old-elf/Hexagon/Inputs/sda-base.o
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/sda-base.o
rename to lld/test/old-elf/Hexagon/Inputs/sda-base.o
diff --git a/lld/test/elf/Hexagon/Inputs/sdata1.c b/lld/test/old-elf/Hexagon/Inputs/sdata1.c
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/sdata1.c
rename to lld/test/old-elf/Hexagon/Inputs/sdata1.c
diff --git a/lld/test/elf/Hexagon/Inputs/sdata1.o b/lld/test/old-elf/Hexagon/Inputs/sdata1.o
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/sdata1.o
rename to lld/test/old-elf/Hexagon/Inputs/sdata1.o
diff --git a/lld/test/elf/Hexagon/Inputs/sdata2.c b/lld/test/old-elf/Hexagon/Inputs/sdata2.c
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/sdata2.c
rename to lld/test/old-elf/Hexagon/Inputs/sdata2.c
diff --git a/lld/test/elf/Hexagon/Inputs/sdata2.o b/lld/test/old-elf/Hexagon/Inputs/sdata2.o
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/sdata2.o
rename to lld/test/old-elf/Hexagon/Inputs/sdata2.o
diff --git a/lld/test/elf/Hexagon/Inputs/use-shared.hexagon b/lld/test/old-elf/Hexagon/Inputs/use-shared.hexagon
similarity index 100%
rename from lld/test/elf/Hexagon/Inputs/use-shared.hexagon
rename to lld/test/old-elf/Hexagon/Inputs/use-shared.hexagon
diff --git a/lld/test/elf/Hexagon/dynlib-data.test b/lld/test/old-elf/Hexagon/dynlib-data.test
similarity index 100%
rename from lld/test/elf/Hexagon/dynlib-data.test
rename to lld/test/old-elf/Hexagon/dynlib-data.test
diff --git a/lld/test/elf/Hexagon/dynlib-gotoff.test b/lld/test/old-elf/Hexagon/dynlib-gotoff.test
similarity index 100%
rename from lld/test/elf/Hexagon/dynlib-gotoff.test
rename to lld/test/old-elf/Hexagon/dynlib-gotoff.test
diff --git a/lld/test/elf/Hexagon/dynlib-hash.test b/lld/test/old-elf/Hexagon/dynlib-hash.test
similarity index 100%
rename from lld/test/elf/Hexagon/dynlib-hash.test
rename to lld/test/old-elf/Hexagon/dynlib-hash.test
diff --git a/lld/test/elf/Hexagon/dynlib-rela.test b/lld/test/old-elf/Hexagon/dynlib-rela.test
similarity index 100%
rename from lld/test/elf/Hexagon/dynlib-rela.test
rename to lld/test/old-elf/Hexagon/dynlib-rela.test
diff --git a/lld/test/elf/Hexagon/dynlib-syms.test b/lld/test/old-elf/Hexagon/dynlib-syms.test
similarity index 100%
rename from lld/test/elf/Hexagon/dynlib-syms.test
rename to lld/test/old-elf/Hexagon/dynlib-syms.test
diff --git a/lld/test/elf/Hexagon/dynlib.test b/lld/test/old-elf/Hexagon/dynlib.test
similarity index 100%
rename from lld/test/elf/Hexagon/dynlib.test
rename to lld/test/old-elf/Hexagon/dynlib.test
diff --git a/lld/test/elf/Hexagon/hexagon-got-plt-order.test b/lld/test/old-elf/Hexagon/hexagon-got-plt-order.test
similarity index 100%
rename from lld/test/elf/Hexagon/hexagon-got-plt-order.test
rename to lld/test/old-elf/Hexagon/hexagon-got-plt-order.test
diff --git a/lld/test/elf/Hexagon/hexagon-plt-setup.test b/lld/test/old-elf/Hexagon/hexagon-plt-setup.test
similarity index 100%
rename from lld/test/elf/Hexagon/hexagon-plt-setup.test
rename to lld/test/old-elf/Hexagon/hexagon-plt-setup.test
diff --git a/lld/test/elf/Hexagon/maxalignment.test b/lld/test/old-elf/Hexagon/maxalignment.test
similarity index 100%
rename from lld/test/elf/Hexagon/maxalignment.test
rename to lld/test/old-elf/Hexagon/maxalignment.test
diff --git a/lld/test/elf/Hexagon/rela-order.test b/lld/test/old-elf/Hexagon/rela-order.test
similarity index 100%
rename from lld/test/elf/Hexagon/rela-order.test
rename to lld/test/old-elf/Hexagon/rela-order.test
diff --git a/lld/test/elf/Hexagon/sda-base.test b/lld/test/old-elf/Hexagon/sda-base.test
similarity index 100%
rename from lld/test/elf/Hexagon/sda-base.test
rename to lld/test/old-elf/Hexagon/sda-base.test
diff --git a/lld/test/elf/Hexagon/zerofillquick-sdata.test b/lld/test/old-elf/Hexagon/zerofillquick-sdata.test
similarity index 100%
rename from lld/test/elf/Hexagon/zerofillquick-sdata.test
rename to lld/test/old-elf/Hexagon/zerofillquick-sdata.test
diff --git a/lld/test/elf/Inputs/abs-test.i386 b/lld/test/old-elf/Inputs/abs-test.i386
similarity index 100%
rename from lld/test/elf/Inputs/abs-test.i386
rename to lld/test/old-elf/Inputs/abs-test.i386
diff --git a/lld/test/elf/Inputs/allowduplicates.objtxt b/lld/test/old-elf/Inputs/allowduplicates.objtxt
similarity index 100%
rename from lld/test/elf/Inputs/allowduplicates.objtxt
rename to lld/test/old-elf/Inputs/allowduplicates.objtxt
diff --git a/lld/test/elf/Inputs/bar.o.x86-64 b/lld/test/old-elf/Inputs/bar.o.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/bar.o.x86-64
rename to lld/test/old-elf/Inputs/bar.o.x86-64
diff --git a/lld/test/elf/Inputs/branch-test.hexagon b/lld/test/old-elf/Inputs/branch-test.hexagon
similarity index 100%
rename from lld/test/elf/Inputs/branch-test.hexagon
rename to lld/test/old-elf/Inputs/branch-test.hexagon
diff --git a/lld/test/elf/Inputs/branch-test.ppc b/lld/test/old-elf/Inputs/branch-test.ppc
similarity index 100%
rename from lld/test/elf/Inputs/branch-test.ppc
rename to lld/test/old-elf/Inputs/branch-test.ppc
diff --git a/lld/test/elf/Inputs/consecutive-weak-defs.o.yaml b/lld/test/old-elf/Inputs/consecutive-weak-defs.o.yaml
similarity index 100%
rename from lld/test/elf/Inputs/consecutive-weak-defs.o.yaml
rename to lld/test/old-elf/Inputs/consecutive-weak-defs.o.yaml
diff --git a/lld/test/elf/Inputs/constants-merge.x86-64 b/lld/test/old-elf/Inputs/constants-merge.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/constants-merge.x86-64
rename to lld/test/old-elf/Inputs/constants-merge.x86-64
diff --git a/lld/test/elf/Inputs/constdata.x86-64 b/lld/test/old-elf/Inputs/constdata.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/constdata.x86-64
rename to lld/test/old-elf/Inputs/constdata.x86-64
diff --git a/lld/test/elf/Inputs/foo.o.x86-64 b/lld/test/old-elf/Inputs/foo.o.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/foo.o.x86-64
rename to lld/test/old-elf/Inputs/foo.o.x86-64
diff --git a/lld/test/elf/Inputs/globalconst.c b/lld/test/old-elf/Inputs/globalconst.c
similarity index 100%
rename from lld/test/elf/Inputs/globalconst.c
rename to lld/test/old-elf/Inputs/globalconst.c
diff --git a/lld/test/elf/Inputs/globalconst.o.x86-64 b/lld/test/old-elf/Inputs/globalconst.o.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/globalconst.o.x86-64
rename to lld/test/old-elf/Inputs/globalconst.o.x86-64
diff --git a/lld/test/elf/Inputs/gotpcrel.S b/lld/test/old-elf/Inputs/gotpcrel.S
similarity index 100%
rename from lld/test/elf/Inputs/gotpcrel.S
rename to lld/test/old-elf/Inputs/gotpcrel.S
diff --git a/lld/test/elf/Inputs/gotpcrel.x86-64 b/lld/test/old-elf/Inputs/gotpcrel.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/gotpcrel.x86-64
rename to lld/test/old-elf/Inputs/gotpcrel.x86-64
diff --git a/lld/test/elf/Inputs/group-cmd-search-1.ls b/lld/test/old-elf/Inputs/group-cmd-search-1.ls
similarity index 100%
rename from lld/test/elf/Inputs/group-cmd-search-1.ls
rename to lld/test/old-elf/Inputs/group-cmd-search-1.ls
diff --git a/lld/test/elf/Inputs/group-cmd-search-2.ls b/lld/test/old-elf/Inputs/group-cmd-search-2.ls
similarity index 100%
rename from lld/test/elf/Inputs/group-cmd-search-2.ls
rename to lld/test/old-elf/Inputs/group-cmd-search-2.ls
diff --git a/lld/test/elf/Inputs/group-cmd-search-3.ls b/lld/test/old-elf/Inputs/group-cmd-search-3.ls
similarity index 100%
rename from lld/test/elf/Inputs/group-cmd-search-3.ls
rename to lld/test/old-elf/Inputs/group-cmd-search-3.ls
diff --git a/lld/test/elf/Inputs/ifunc.S b/lld/test/old-elf/Inputs/ifunc.S
similarity index 100%
rename from lld/test/elf/Inputs/ifunc.S
rename to lld/test/old-elf/Inputs/ifunc.S
diff --git a/lld/test/elf/Inputs/ifunc.cpp b/lld/test/old-elf/Inputs/ifunc.cpp
similarity index 100%
rename from lld/test/elf/Inputs/ifunc.cpp
rename to lld/test/old-elf/Inputs/ifunc.cpp
diff --git a/lld/test/elf/Inputs/ifunc.cpp.x86-64 b/lld/test/old-elf/Inputs/ifunc.cpp.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/ifunc.cpp.x86-64
rename to lld/test/old-elf/Inputs/ifunc.cpp.x86-64
diff --git a/lld/test/elf/Inputs/ifunc.x86-64 b/lld/test/old-elf/Inputs/ifunc.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/ifunc.x86-64
rename to lld/test/old-elf/Inputs/ifunc.x86-64
diff --git a/lld/test/elf/Inputs/libfnarchive.a b/lld/test/old-elf/Inputs/libfnarchive.a
similarity index 100%
rename from lld/test/elf/Inputs/libfnarchive.a
rename to lld/test/old-elf/Inputs/libfnarchive.a
diff --git a/lld/test/elf/Inputs/libifunc.x86-64.so b/lld/test/old-elf/Inputs/libifunc.x86-64.so
similarity index 100%
rename from lld/test/elf/Inputs/libifunc.x86-64.so
rename to lld/test/old-elf/Inputs/libifunc.x86-64.so
diff --git a/lld/test/elf/Inputs/libundef.so b/lld/test/old-elf/Inputs/libundef.so
similarity index 100%
rename from lld/test/elf/Inputs/libundef.so
rename to lld/test/old-elf/Inputs/libundef.so
diff --git a/lld/test/elf/Inputs/libweaksym.so b/lld/test/old-elf/Inputs/libweaksym.so
similarity index 100%
rename from lld/test/elf/Inputs/libweaksym.so
rename to lld/test/old-elf/Inputs/libweaksym.so
diff --git a/lld/test/elf/Inputs/main-with-global-def.o.yaml b/lld/test/old-elf/Inputs/main-with-global-def.o.yaml
similarity index 100%
rename from lld/test/elf/Inputs/main-with-global-def.o.yaml
rename to lld/test/old-elf/Inputs/main-with-global-def.o.yaml
diff --git a/lld/test/elf/Inputs/mainobj.x86_64 b/lld/test/old-elf/Inputs/mainobj.x86_64
similarity index 100%
rename from lld/test/elf/Inputs/mainobj.x86_64
rename to lld/test/old-elf/Inputs/mainobj.x86_64
diff --git a/lld/test/elf/Inputs/no-unique-section-names.x86-64 b/lld/test/old-elf/Inputs/no-unique-section-names.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/no-unique-section-names.x86-64
rename to lld/test/old-elf/Inputs/no-unique-section-names.x86-64
diff --git a/lld/test/elf/Inputs/object-test.elf-hexagon b/lld/test/old-elf/Inputs/object-test.elf-hexagon
similarity index 100%
rename from lld/test/elf/Inputs/object-test.elf-hexagon
rename to lld/test/old-elf/Inputs/object-test.elf-hexagon
diff --git a/lld/test/elf/Inputs/object-test.elf-i386 b/lld/test/old-elf/Inputs/object-test.elf-i386
similarity index 100%
rename from lld/test/elf/Inputs/object-test.elf-i386
rename to lld/test/old-elf/Inputs/object-test.elf-i386
diff --git a/lld/test/elf/Inputs/phdr.i386 b/lld/test/old-elf/Inputs/phdr.i386
similarity index 100%
rename from lld/test/elf/Inputs/phdr.i386
rename to lld/test/old-elf/Inputs/phdr.i386
diff --git a/lld/test/elf/Inputs/quickdata-sort-test.o.elf-hexagon b/lld/test/old-elf/Inputs/quickdata-sort-test.o.elf-hexagon
similarity index 100%
rename from lld/test/elf/Inputs/quickdata-sort-test.o.elf-hexagon
rename to lld/test/old-elf/Inputs/quickdata-sort-test.o.elf-hexagon
diff --git a/lld/test/elf/Inputs/quickdata-sortcommon-test.o.elf-hexagon b/lld/test/old-elf/Inputs/quickdata-sortcommon-test.o.elf-hexagon
similarity index 100%
rename from lld/test/elf/Inputs/quickdata-sortcommon-test.o.elf-hexagon
rename to lld/test/old-elf/Inputs/quickdata-sortcommon-test.o.elf-hexagon
diff --git a/lld/test/elf/Inputs/quickdata-test.elf-hexagon b/lld/test/old-elf/Inputs/quickdata-test.elf-hexagon
similarity index 100%
rename from lld/test/elf/Inputs/quickdata-test.elf-hexagon
rename to lld/test/old-elf/Inputs/quickdata-test.elf-hexagon
diff --git a/lld/test/elf/Inputs/reloc-test.elf-i386 b/lld/test/old-elf/Inputs/reloc-test.elf-i386
similarity index 100%
rename from lld/test/elf/Inputs/reloc-test.elf-i386
rename to lld/test/old-elf/Inputs/reloc-test.elf-i386
diff --git a/lld/test/elf/Inputs/reloc-xb.x86 b/lld/test/old-elf/Inputs/reloc-xb.x86
similarity index 100%
rename from lld/test/elf/Inputs/reloc-xb.x86
rename to lld/test/old-elf/Inputs/reloc-xb.x86
diff --git a/lld/test/elf/Inputs/reloc-xt.x86 b/lld/test/old-elf/Inputs/reloc-xt.x86
similarity index 100%
rename from lld/test/elf/Inputs/reloc-xt.x86
rename to lld/test/old-elf/Inputs/reloc-xt.x86
diff --git a/lld/test/elf/Inputs/relocs-dynamic.x86-64 b/lld/test/old-elf/Inputs/relocs-dynamic.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/relocs-dynamic.x86-64
rename to lld/test/old-elf/Inputs/relocs-dynamic.x86-64
diff --git a/lld/test/elf/Inputs/relocs.x86-64 b/lld/test/old-elf/Inputs/relocs.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/relocs.x86-64
rename to lld/test/old-elf/Inputs/relocs.x86-64
diff --git a/lld/test/elf/Inputs/responsefile b/lld/test/old-elf/Inputs/responsefile
similarity index 100%
rename from lld/test/elf/Inputs/responsefile
rename to lld/test/old-elf/Inputs/responsefile
diff --git a/lld/test/elf/Inputs/rodata-test.hexagon b/lld/test/old-elf/Inputs/rodata-test.hexagon
similarity index 100%
rename from lld/test/elf/Inputs/rodata-test.hexagon
rename to lld/test/old-elf/Inputs/rodata-test.hexagon
diff --git a/lld/test/elf/Inputs/rodata-test.i386 b/lld/test/old-elf/Inputs/rodata-test.i386
similarity index 100%
rename from lld/test/elf/Inputs/rodata-test.i386
rename to lld/test/old-elf/Inputs/rodata-test.i386
diff --git a/lld/test/elf/Inputs/rodata.c b/lld/test/old-elf/Inputs/rodata.c
similarity index 100%
rename from lld/test/elf/Inputs/rodata.c
rename to lld/test/old-elf/Inputs/rodata.c
diff --git a/lld/test/elf/Inputs/rodata.o b/lld/test/old-elf/Inputs/rodata.o
similarity index 100%
rename from lld/test/elf/Inputs/rodata.o
rename to lld/test/old-elf/Inputs/rodata.o
diff --git a/lld/test/elf/Inputs/section-test.i386 b/lld/test/old-elf/Inputs/section-test.i386
similarity index 100%
rename from lld/test/elf/Inputs/section-test.i386
rename to lld/test/old-elf/Inputs/section-test.i386
diff --git a/lld/test/elf/Inputs/shared.c b/lld/test/old-elf/Inputs/shared.c
similarity index 100%
rename from lld/test/elf/Inputs/shared.c
rename to lld/test/old-elf/Inputs/shared.c
diff --git a/lld/test/elf/Inputs/shared.so-x86-64 b/lld/test/old-elf/Inputs/shared.so-x86-64
similarity index 100%
rename from lld/test/elf/Inputs/shared.so-x86-64
rename to lld/test/old-elf/Inputs/shared.so-x86-64
diff --git a/lld/test/elf/Inputs/shndx.o-x86_64 b/lld/test/old-elf/Inputs/shndx.o-x86_64
similarity index 100%
rename from lld/test/elf/Inputs/shndx.o-x86_64
rename to lld/test/old-elf/Inputs/shndx.o-x86_64
diff --git a/lld/test/elf/Inputs/stripped-empty.x86_64 b/lld/test/old-elf/Inputs/stripped-empty.x86_64
similarity index 100%
rename from lld/test/elf/Inputs/stripped-empty.x86_64
rename to lld/test/old-elf/Inputs/stripped-empty.x86_64
diff --git a/lld/test/elf/Inputs/target-test.hexagon b/lld/test/old-elf/Inputs/target-test.hexagon
similarity index 100%
rename from lld/test/elf/Inputs/target-test.hexagon
rename to lld/test/old-elf/Inputs/target-test.hexagon
diff --git a/lld/test/elf/Inputs/target-test.ppc b/lld/test/old-elf/Inputs/target-test.ppc
similarity index 100%
rename from lld/test/elf/Inputs/target-test.ppc
rename to lld/test/old-elf/Inputs/target-test.ppc
diff --git a/lld/test/elf/Inputs/tls-tbss-size.yaml b/lld/test/old-elf/Inputs/tls-tbss-size.yaml
similarity index 100%
rename from lld/test/elf/Inputs/tls-tbss-size.yaml
rename to lld/test/old-elf/Inputs/tls-tbss-size.yaml
diff --git a/lld/test/elf/Inputs/tls.S b/lld/test/old-elf/Inputs/tls.S
similarity index 100%
rename from lld/test/elf/Inputs/tls.S
rename to lld/test/old-elf/Inputs/tls.S
diff --git a/lld/test/elf/Inputs/tls.c b/lld/test/old-elf/Inputs/tls.c
similarity index 100%
rename from lld/test/elf/Inputs/tls.c
rename to lld/test/old-elf/Inputs/tls.c
diff --git a/lld/test/elf/Inputs/tls.x86-64 b/lld/test/old-elf/Inputs/tls.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/tls.x86-64
rename to lld/test/old-elf/Inputs/tls.x86-64
diff --git a/lld/test/elf/Inputs/tlsAddr.x86-64 b/lld/test/old-elf/Inputs/tlsAddr.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/tlsAddr.x86-64
rename to lld/test/old-elf/Inputs/tlsAddr.x86-64
diff --git a/lld/test/elf/Inputs/tlsaddr.c b/lld/test/old-elf/Inputs/tlsaddr.c
similarity index 100%
rename from lld/test/elf/Inputs/tlsaddr.c
rename to lld/test/old-elf/Inputs/tlsaddr.c
diff --git a/lld/test/elf/Inputs/undef-from-main-so.c b/lld/test/old-elf/Inputs/undef-from-main-so.c
similarity index 100%
rename from lld/test/elf/Inputs/undef-from-main-so.c
rename to lld/test/old-elf/Inputs/undef-from-main-so.c
diff --git a/lld/test/elf/Inputs/undef-from-main.c b/lld/test/old-elf/Inputs/undef-from-main.c
similarity index 100%
rename from lld/test/elf/Inputs/undef-from-main.c
rename to lld/test/old-elf/Inputs/undef-from-main.c
diff --git a/lld/test/elf/Inputs/undef-pc32.o b/lld/test/old-elf/Inputs/undef-pc32.o
similarity index 100%
rename from lld/test/elf/Inputs/undef-pc32.o
rename to lld/test/old-elf/Inputs/undef-pc32.o
diff --git a/lld/test/elf/Inputs/undef.o b/lld/test/old-elf/Inputs/undef.o
similarity index 100%
rename from lld/test/elf/Inputs/undef.o
rename to lld/test/old-elf/Inputs/undef.o
diff --git a/lld/test/elf/Inputs/undef2-so.o.yaml b/lld/test/old-elf/Inputs/undef2-so.o.yaml
similarity index 100%
rename from lld/test/elf/Inputs/undef2-so.o.yaml
rename to lld/test/old-elf/Inputs/undef2-so.o.yaml
diff --git a/lld/test/elf/Inputs/use-shared-32s.c b/lld/test/old-elf/Inputs/use-shared-32s.c
similarity index 100%
rename from lld/test/elf/Inputs/use-shared-32s.c
rename to lld/test/old-elf/Inputs/use-shared-32s.c
diff --git a/lld/test/elf/Inputs/use-shared-32s.x86-64 b/lld/test/old-elf/Inputs/use-shared-32s.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/use-shared-32s.x86-64
rename to lld/test/old-elf/Inputs/use-shared-32s.x86-64
diff --git a/lld/test/elf/Inputs/use-shared.c b/lld/test/old-elf/Inputs/use-shared.c
similarity index 100%
rename from lld/test/elf/Inputs/use-shared.c
rename to lld/test/old-elf/Inputs/use-shared.c
diff --git a/lld/test/elf/Inputs/use-shared.x86-64 b/lld/test/old-elf/Inputs/use-shared.x86-64
similarity index 100%
rename from lld/test/elf/Inputs/use-shared.x86-64
rename to lld/test/old-elf/Inputs/use-shared.x86-64
diff --git a/lld/test/elf/Inputs/weaksym.o b/lld/test/old-elf/Inputs/weaksym.o
similarity index 100%
rename from lld/test/elf/Inputs/weaksym.o
rename to lld/test/old-elf/Inputs/weaksym.o
diff --git a/lld/test/elf/Inputs/writersyms.o b/lld/test/old-elf/Inputs/writersyms.o
similarity index 100%
rename from lld/test/elf/Inputs/writersyms.o
rename to lld/test/old-elf/Inputs/writersyms.o
diff --git a/lld/test/elf/Inputs/x86-64-relocs.S b/lld/test/old-elf/Inputs/x86-64-relocs.S
similarity index 100%
rename from lld/test/elf/Inputs/x86-64-relocs.S
rename to lld/test/old-elf/Inputs/x86-64-relocs.S
diff --git a/lld/test/elf/Mips/abi-flags-01.test b/lld/test/old-elf/Mips/abi-flags-01.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-01.test
rename to lld/test/old-elf/Mips/abi-flags-01.test
diff --git a/lld/test/elf/Mips/abi-flags-02.test b/lld/test/old-elf/Mips/abi-flags-02.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-02.test
rename to lld/test/old-elf/Mips/abi-flags-02.test
diff --git a/lld/test/elf/Mips/abi-flags-03.test b/lld/test/old-elf/Mips/abi-flags-03.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-03.test
rename to lld/test/old-elf/Mips/abi-flags-03.test
diff --git a/lld/test/elf/Mips/abi-flags-04.test b/lld/test/old-elf/Mips/abi-flags-04.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-04.test
rename to lld/test/old-elf/Mips/abi-flags-04.test
diff --git a/lld/test/elf/Mips/abi-flags-05.test b/lld/test/old-elf/Mips/abi-flags-05.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-05.test
rename to lld/test/old-elf/Mips/abi-flags-05.test
diff --git a/lld/test/elf/Mips/abi-flags-06.test b/lld/test/old-elf/Mips/abi-flags-06.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-06.test
rename to lld/test/old-elf/Mips/abi-flags-06.test
diff --git a/lld/test/elf/Mips/abi-flags-07.test b/lld/test/old-elf/Mips/abi-flags-07.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-07.test
rename to lld/test/old-elf/Mips/abi-flags-07.test
diff --git a/lld/test/elf/Mips/abi-flags-08.test b/lld/test/old-elf/Mips/abi-flags-08.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-08.test
rename to lld/test/old-elf/Mips/abi-flags-08.test
diff --git a/lld/test/elf/Mips/abi-flags-09.test b/lld/test/old-elf/Mips/abi-flags-09.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-09.test
rename to lld/test/old-elf/Mips/abi-flags-09.test
diff --git a/lld/test/elf/Mips/abi-flags-10.test b/lld/test/old-elf/Mips/abi-flags-10.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-10.test
rename to lld/test/old-elf/Mips/abi-flags-10.test
diff --git a/lld/test/elf/Mips/abi-flags-11.test b/lld/test/old-elf/Mips/abi-flags-11.test
similarity index 100%
rename from lld/test/elf/Mips/abi-flags-11.test
rename to lld/test/old-elf/Mips/abi-flags-11.test
diff --git a/lld/test/elf/Mips/base-address-64.test b/lld/test/old-elf/Mips/base-address-64.test
similarity index 100%
rename from lld/test/elf/Mips/base-address-64.test
rename to lld/test/old-elf/Mips/base-address-64.test
diff --git a/lld/test/elf/Mips/base-address.test b/lld/test/old-elf/Mips/base-address.test
similarity index 100%
rename from lld/test/elf/Mips/base-address.test
rename to lld/test/old-elf/Mips/base-address.test
diff --git a/lld/test/elf/Mips/ctors-order.test b/lld/test/old-elf/Mips/ctors-order.test
similarity index 100%
rename from lld/test/elf/Mips/ctors-order.test
rename to lld/test/old-elf/Mips/ctors-order.test
diff --git a/lld/test/elf/Mips/driver-hash-style.test b/lld/test/old-elf/Mips/driver-hash-style.test
similarity index 100%
rename from lld/test/elf/Mips/driver-hash-style.test
rename to lld/test/old-elf/Mips/driver-hash-style.test
diff --git a/lld/test/elf/Mips/dt-textrel-64.test b/lld/test/old-elf/Mips/dt-textrel-64.test
similarity index 100%
rename from lld/test/elf/Mips/dt-textrel-64.test
rename to lld/test/old-elf/Mips/dt-textrel-64.test
diff --git a/lld/test/elf/Mips/dt-textrel.test b/lld/test/old-elf/Mips/dt-textrel.test
similarity index 100%
rename from lld/test/elf/Mips/dt-textrel.test
rename to lld/test/old-elf/Mips/dt-textrel.test
diff --git a/lld/test/elf/Mips/dynamic-linking.test b/lld/test/old-elf/Mips/dynamic-linking.test
similarity index 100%
rename from lld/test/elf/Mips/dynamic-linking.test
rename to lld/test/old-elf/Mips/dynamic-linking.test
diff --git a/lld/test/elf/Mips/dynamic-sym.test b/lld/test/old-elf/Mips/dynamic-sym.test
similarity index 100%
rename from lld/test/elf/Mips/dynamic-sym.test
rename to lld/test/old-elf/Mips/dynamic-sym.test
diff --git a/lld/test/elf/Mips/dynlib-dynamic.test b/lld/test/old-elf/Mips/dynlib-dynamic.test
similarity index 100%
rename from lld/test/elf/Mips/dynlib-dynamic.test
rename to lld/test/old-elf/Mips/dynlib-dynamic.test
diff --git a/lld/test/elf/Mips/dynlib-dynsym-micro.test b/lld/test/old-elf/Mips/dynlib-dynsym-micro.test
similarity index 100%
rename from lld/test/elf/Mips/dynlib-dynsym-micro.test
rename to lld/test/old-elf/Mips/dynlib-dynsym-micro.test
diff --git a/lld/test/elf/Mips/dynlib-dynsym.test b/lld/test/old-elf/Mips/dynlib-dynsym.test
similarity index 100%
rename from lld/test/elf/Mips/dynlib-dynsym.test
rename to lld/test/old-elf/Mips/dynlib-dynsym.test
diff --git a/lld/test/elf/Mips/dynlib-fileheader-64.test b/lld/test/old-elf/Mips/dynlib-fileheader-64.test
similarity index 100%
rename from lld/test/elf/Mips/dynlib-fileheader-64.test
rename to lld/test/old-elf/Mips/dynlib-fileheader-64.test
diff --git a/lld/test/elf/Mips/dynlib-fileheader-micro-64.test b/lld/test/old-elf/Mips/dynlib-fileheader-micro-64.test
similarity index 100%
rename from lld/test/elf/Mips/dynlib-fileheader-micro-64.test
rename to lld/test/old-elf/Mips/dynlib-fileheader-micro-64.test
diff --git a/lld/test/elf/Mips/dynlib-fileheader-micro.test b/lld/test/old-elf/Mips/dynlib-fileheader-micro.test
similarity index 100%
rename from lld/test/elf/Mips/dynlib-fileheader-micro.test
rename to lld/test/old-elf/Mips/dynlib-fileheader-micro.test
diff --git a/lld/test/elf/Mips/dynlib-fileheader.test b/lld/test/old-elf/Mips/dynlib-fileheader.test
similarity index 100%
rename from lld/test/elf/Mips/dynlib-fileheader.test
rename to lld/test/old-elf/Mips/dynlib-fileheader.test
diff --git a/lld/test/elf/Mips/dynsym-table-1.test b/lld/test/old-elf/Mips/dynsym-table-1.test
similarity index 100%
rename from lld/test/elf/Mips/dynsym-table-1.test
rename to lld/test/old-elf/Mips/dynsym-table-1.test
diff --git a/lld/test/elf/Mips/dynsym-table-2.test b/lld/test/old-elf/Mips/dynsym-table-2.test
similarity index 100%
rename from lld/test/elf/Mips/dynsym-table-2.test
rename to lld/test/old-elf/Mips/dynsym-table-2.test
diff --git a/lld/test/elf/Mips/e-flags-merge-1-64.test b/lld/test/old-elf/Mips/e-flags-merge-1-64.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-1-64.test
rename to lld/test/old-elf/Mips/e-flags-merge-1-64.test
diff --git a/lld/test/elf/Mips/e-flags-merge-1.test b/lld/test/old-elf/Mips/e-flags-merge-1.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-1.test
rename to lld/test/old-elf/Mips/e-flags-merge-1.test
diff --git a/lld/test/elf/Mips/e-flags-merge-10.test b/lld/test/old-elf/Mips/e-flags-merge-10.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-10.test
rename to lld/test/old-elf/Mips/e-flags-merge-10.test
diff --git a/lld/test/elf/Mips/e-flags-merge-11.test b/lld/test/old-elf/Mips/e-flags-merge-11.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-11.test
rename to lld/test/old-elf/Mips/e-flags-merge-11.test
diff --git a/lld/test/elf/Mips/e-flags-merge-12.test b/lld/test/old-elf/Mips/e-flags-merge-12.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-12.test
rename to lld/test/old-elf/Mips/e-flags-merge-12.test
diff --git a/lld/test/elf/Mips/e-flags-merge-2-64.test b/lld/test/old-elf/Mips/e-flags-merge-2-64.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-2-64.test
rename to lld/test/old-elf/Mips/e-flags-merge-2-64.test
diff --git a/lld/test/elf/Mips/e-flags-merge-2.test b/lld/test/old-elf/Mips/e-flags-merge-2.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-2.test
rename to lld/test/old-elf/Mips/e-flags-merge-2.test
diff --git a/lld/test/elf/Mips/e-flags-merge-3-64.test b/lld/test/old-elf/Mips/e-flags-merge-3-64.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-3-64.test
rename to lld/test/old-elf/Mips/e-flags-merge-3-64.test
diff --git a/lld/test/elf/Mips/e-flags-merge-3.test b/lld/test/old-elf/Mips/e-flags-merge-3.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-3.test
rename to lld/test/old-elf/Mips/e-flags-merge-3.test
diff --git a/lld/test/elf/Mips/e-flags-merge-4-64.test b/lld/test/old-elf/Mips/e-flags-merge-4-64.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-4-64.test
rename to lld/test/old-elf/Mips/e-flags-merge-4-64.test
diff --git a/lld/test/elf/Mips/e-flags-merge-4.test b/lld/test/old-elf/Mips/e-flags-merge-4.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-4.test
rename to lld/test/old-elf/Mips/e-flags-merge-4.test
diff --git a/lld/test/elf/Mips/e-flags-merge-5-64.test b/lld/test/old-elf/Mips/e-flags-merge-5-64.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-5-64.test
rename to lld/test/old-elf/Mips/e-flags-merge-5-64.test
diff --git a/lld/test/elf/Mips/e-flags-merge-5.test b/lld/test/old-elf/Mips/e-flags-merge-5.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-5.test
rename to lld/test/old-elf/Mips/e-flags-merge-5.test
diff --git a/lld/test/elf/Mips/e-flags-merge-6-64.test b/lld/test/old-elf/Mips/e-flags-merge-6-64.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-6-64.test
rename to lld/test/old-elf/Mips/e-flags-merge-6-64.test
diff --git a/lld/test/elf/Mips/e-flags-merge-6.test b/lld/test/old-elf/Mips/e-flags-merge-6.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-6.test
rename to lld/test/old-elf/Mips/e-flags-merge-6.test
diff --git a/lld/test/elf/Mips/e-flags-merge-7-64.test b/lld/test/old-elf/Mips/e-flags-merge-7-64.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-7-64.test
rename to lld/test/old-elf/Mips/e-flags-merge-7-64.test
diff --git a/lld/test/elf/Mips/e-flags-merge-7.test b/lld/test/old-elf/Mips/e-flags-merge-7.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-7.test
rename to lld/test/old-elf/Mips/e-flags-merge-7.test
diff --git a/lld/test/elf/Mips/e-flags-merge-8.test b/lld/test/old-elf/Mips/e-flags-merge-8.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-8.test
rename to lld/test/old-elf/Mips/e-flags-merge-8.test
diff --git a/lld/test/elf/Mips/e-flags-merge-9.test b/lld/test/old-elf/Mips/e-flags-merge-9.test
similarity index 100%
rename from lld/test/elf/Mips/e-flags-merge-9.test
rename to lld/test/old-elf/Mips/e-flags-merge-9.test
diff --git a/lld/test/elf/Mips/entry-name.test b/lld/test/old-elf/Mips/entry-name.test
similarity index 100%
rename from lld/test/elf/Mips/entry-name.test
rename to lld/test/old-elf/Mips/entry-name.test
diff --git a/lld/test/elf/Mips/exe-dynamic.test b/lld/test/old-elf/Mips/exe-dynamic.test
similarity index 100%
rename from lld/test/elf/Mips/exe-dynamic.test
rename to lld/test/old-elf/Mips/exe-dynamic.test
diff --git a/lld/test/elf/Mips/exe-dynsym-micro.test b/lld/test/old-elf/Mips/exe-dynsym-micro.test
similarity index 100%
rename from lld/test/elf/Mips/exe-dynsym-micro.test
rename to lld/test/old-elf/Mips/exe-dynsym-micro.test
diff --git a/lld/test/elf/Mips/exe-dynsym.test b/lld/test/old-elf/Mips/exe-dynsym.test
similarity index 100%
rename from lld/test/elf/Mips/exe-dynsym.test
rename to lld/test/old-elf/Mips/exe-dynsym.test
diff --git a/lld/test/elf/Mips/exe-fileheader-02.test b/lld/test/old-elf/Mips/exe-fileheader-02.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-02.test
rename to lld/test/old-elf/Mips/exe-fileheader-02.test
diff --git a/lld/test/elf/Mips/exe-fileheader-03.test b/lld/test/old-elf/Mips/exe-fileheader-03.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-03.test
rename to lld/test/old-elf/Mips/exe-fileheader-03.test
diff --git a/lld/test/elf/Mips/exe-fileheader-64.test b/lld/test/old-elf/Mips/exe-fileheader-64.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-64.test
rename to lld/test/old-elf/Mips/exe-fileheader-64.test
diff --git a/lld/test/elf/Mips/exe-fileheader-be-64.test b/lld/test/old-elf/Mips/exe-fileheader-be-64.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-be-64.test
rename to lld/test/old-elf/Mips/exe-fileheader-be-64.test
diff --git a/lld/test/elf/Mips/exe-fileheader-be.test b/lld/test/old-elf/Mips/exe-fileheader-be.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-be.test
rename to lld/test/old-elf/Mips/exe-fileheader-be.test
diff --git a/lld/test/elf/Mips/exe-fileheader-micro-64.test b/lld/test/old-elf/Mips/exe-fileheader-micro-64.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-micro-64.test
rename to lld/test/old-elf/Mips/exe-fileheader-micro-64.test
diff --git a/lld/test/elf/Mips/exe-fileheader-micro.test b/lld/test/old-elf/Mips/exe-fileheader-micro.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-micro.test
rename to lld/test/old-elf/Mips/exe-fileheader-micro.test
diff --git a/lld/test/elf/Mips/exe-fileheader-n32.test b/lld/test/old-elf/Mips/exe-fileheader-n32.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader-n32.test
rename to lld/test/old-elf/Mips/exe-fileheader-n32.test
diff --git a/lld/test/elf/Mips/exe-fileheader.test b/lld/test/old-elf/Mips/exe-fileheader.test
similarity index 100%
rename from lld/test/elf/Mips/exe-fileheader.test
rename to lld/test/old-elf/Mips/exe-fileheader.test
diff --git a/lld/test/elf/Mips/exe-got-micro.test b/lld/test/old-elf/Mips/exe-got-micro.test
similarity index 100%
rename from lld/test/elf/Mips/exe-got-micro.test
rename to lld/test/old-elf/Mips/exe-got-micro.test
diff --git a/lld/test/elf/Mips/exe-got.test b/lld/test/old-elf/Mips/exe-got.test
similarity index 100%
rename from lld/test/elf/Mips/exe-got.test
rename to lld/test/old-elf/Mips/exe-got.test
diff --git a/lld/test/elf/Mips/got-page-32-micro.test b/lld/test/old-elf/Mips/got-page-32-micro.test
similarity index 100%
rename from lld/test/elf/Mips/got-page-32-micro.test
rename to lld/test/old-elf/Mips/got-page-32-micro.test
diff --git a/lld/test/elf/Mips/got-page-32.test b/lld/test/old-elf/Mips/got-page-32.test
similarity index 100%
rename from lld/test/elf/Mips/got-page-32.test
rename to lld/test/old-elf/Mips/got-page-32.test
diff --git a/lld/test/elf/Mips/got-page-64-micro.test b/lld/test/old-elf/Mips/got-page-64-micro.test
similarity index 100%
rename from lld/test/elf/Mips/got-page-64-micro.test
rename to lld/test/old-elf/Mips/got-page-64-micro.test
diff --git a/lld/test/elf/Mips/got-page-64.test b/lld/test/old-elf/Mips/got-page-64.test
similarity index 100%
rename from lld/test/elf/Mips/got-page-64.test
rename to lld/test/old-elf/Mips/got-page-64.test
diff --git a/lld/test/elf/Mips/got16-2.test b/lld/test/old-elf/Mips/got16-2.test
similarity index 100%
rename from lld/test/elf/Mips/got16-2.test
rename to lld/test/old-elf/Mips/got16-2.test
diff --git a/lld/test/elf/Mips/got16-micro.test b/lld/test/old-elf/Mips/got16-micro.test
similarity index 100%
rename from lld/test/elf/Mips/got16-micro.test
rename to lld/test/old-elf/Mips/got16-micro.test
diff --git a/lld/test/elf/Mips/got16.test b/lld/test/old-elf/Mips/got16.test
similarity index 100%
rename from lld/test/elf/Mips/got16.test
rename to lld/test/old-elf/Mips/got16.test
diff --git a/lld/test/elf/Mips/gotsym.test b/lld/test/old-elf/Mips/gotsym.test
similarity index 100%
rename from lld/test/elf/Mips/gotsym.test
rename to lld/test/old-elf/Mips/gotsym.test
diff --git a/lld/test/elf/Mips/gp-sym-1-micro.test b/lld/test/old-elf/Mips/gp-sym-1-micro.test
similarity index 100%
rename from lld/test/elf/Mips/gp-sym-1-micro.test
rename to lld/test/old-elf/Mips/gp-sym-1-micro.test
diff --git a/lld/test/elf/Mips/gp-sym-1.test b/lld/test/old-elf/Mips/gp-sym-1.test
similarity index 100%
rename from lld/test/elf/Mips/gp-sym-1.test
rename to lld/test/old-elf/Mips/gp-sym-1.test
diff --git a/lld/test/elf/Mips/gp-sym-2.test b/lld/test/old-elf/Mips/gp-sym-2.test
similarity index 100%
rename from lld/test/elf/Mips/gp-sym-2.test
rename to lld/test/old-elf/Mips/gp-sym-2.test
diff --git a/lld/test/elf/Mips/hilo16-1.test b/lld/test/old-elf/Mips/hilo16-1.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-1.test
rename to lld/test/old-elf/Mips/hilo16-1.test
diff --git a/lld/test/elf/Mips/hilo16-2.test b/lld/test/old-elf/Mips/hilo16-2.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-2.test
rename to lld/test/old-elf/Mips/hilo16-2.test
diff --git a/lld/test/elf/Mips/hilo16-3-overflow.test b/lld/test/old-elf/Mips/hilo16-3-overflow.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-3-overflow.test
rename to lld/test/old-elf/Mips/hilo16-3-overflow.test
diff --git a/lld/test/elf/Mips/hilo16-3.test b/lld/test/old-elf/Mips/hilo16-3.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-3.test
rename to lld/test/old-elf/Mips/hilo16-3.test
diff --git a/lld/test/elf/Mips/hilo16-4.test b/lld/test/old-elf/Mips/hilo16-4.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-4.test
rename to lld/test/old-elf/Mips/hilo16-4.test
diff --git a/lld/test/elf/Mips/hilo16-5.test b/lld/test/old-elf/Mips/hilo16-5.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-5.test
rename to lld/test/old-elf/Mips/hilo16-5.test
diff --git a/lld/test/elf/Mips/hilo16-8-micro.test b/lld/test/old-elf/Mips/hilo16-8-micro.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-8-micro.test
rename to lld/test/old-elf/Mips/hilo16-8-micro.test
diff --git a/lld/test/elf/Mips/hilo16-9-micro.test b/lld/test/old-elf/Mips/hilo16-9-micro.test
similarity index 100%
rename from lld/test/elf/Mips/hilo16-9-micro.test
rename to lld/test/old-elf/Mips/hilo16-9-micro.test
diff --git a/lld/test/elf/Mips/initfini-micro.test b/lld/test/old-elf/Mips/initfini-micro.test
similarity index 100%
rename from lld/test/elf/Mips/initfini-micro.test
rename to lld/test/old-elf/Mips/initfini-micro.test
diff --git a/lld/test/elf/Mips/interpreter-64.test b/lld/test/old-elf/Mips/interpreter-64.test
similarity index 100%
rename from lld/test/elf/Mips/interpreter-64.test
rename to lld/test/old-elf/Mips/interpreter-64.test
diff --git a/lld/test/elf/Mips/interpreter-n32.test b/lld/test/old-elf/Mips/interpreter-n32.test
similarity index 100%
rename from lld/test/elf/Mips/interpreter-n32.test
rename to lld/test/old-elf/Mips/interpreter-n32.test
diff --git a/lld/test/elf/Mips/interpreter.test b/lld/test/old-elf/Mips/interpreter.test
similarity index 100%
rename from lld/test/elf/Mips/interpreter.test
rename to lld/test/old-elf/Mips/interpreter.test
diff --git a/lld/test/elf/Mips/invalid-reginfo.test b/lld/test/old-elf/Mips/invalid-reginfo.test
similarity index 100%
rename from lld/test/elf/Mips/invalid-reginfo.test
rename to lld/test/old-elf/Mips/invalid-reginfo.test
diff --git a/lld/test/elf/Mips/jalx-align-err.test b/lld/test/old-elf/Mips/jalx-align-err.test
similarity index 100%
rename from lld/test/elf/Mips/jalx-align-err.test
rename to lld/test/old-elf/Mips/jalx-align-err.test
diff --git a/lld/test/elf/Mips/jalx-jalr.test b/lld/test/old-elf/Mips/jalx-jalr.test
similarity index 100%
rename from lld/test/elf/Mips/jalx-jalr.test
rename to lld/test/old-elf/Mips/jalx-jalr.test
diff --git a/lld/test/elf/Mips/jalx.test b/lld/test/old-elf/Mips/jalx.test
similarity index 100%
rename from lld/test/elf/Mips/jalx.test
rename to lld/test/old-elf/Mips/jalx.test
diff --git a/lld/test/elf/Mips/jump-fix-err.test b/lld/test/old-elf/Mips/jump-fix-err.test
similarity index 100%
rename from lld/test/elf/Mips/jump-fix-err.test
rename to lld/test/old-elf/Mips/jump-fix-err.test
diff --git a/lld/test/elf/Mips/la25-stub-be.test b/lld/test/old-elf/Mips/la25-stub-be.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub-be.test
rename to lld/test/old-elf/Mips/la25-stub-be.test
diff --git a/lld/test/elf/Mips/la25-stub-micro-be.test b/lld/test/old-elf/Mips/la25-stub-micro-be.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub-micro-be.test
rename to lld/test/old-elf/Mips/la25-stub-micro-be.test
diff --git a/lld/test/elf/Mips/la25-stub-micro.test b/lld/test/old-elf/Mips/la25-stub-micro.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub-micro.test
rename to lld/test/old-elf/Mips/la25-stub-micro.test
diff --git a/lld/test/elf/Mips/la25-stub-npic-01.test b/lld/test/old-elf/Mips/la25-stub-npic-01.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub-npic-01.test
rename to lld/test/old-elf/Mips/la25-stub-npic-01.test
diff --git a/lld/test/elf/Mips/la25-stub-npic-02.test b/lld/test/old-elf/Mips/la25-stub-npic-02.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub-npic-02.test
rename to lld/test/old-elf/Mips/la25-stub-npic-02.test
diff --git a/lld/test/elf/Mips/la25-stub-npic-shared.test b/lld/test/old-elf/Mips/la25-stub-npic-shared.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub-npic-shared.test
rename to lld/test/old-elf/Mips/la25-stub-npic-shared.test
diff --git a/lld/test/elf/Mips/la25-stub-pic.test b/lld/test/old-elf/Mips/la25-stub-pic.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub-pic.test
rename to lld/test/old-elf/Mips/la25-stub-pic.test
diff --git a/lld/test/elf/Mips/la25-stub.test b/lld/test/old-elf/Mips/la25-stub.test
similarity index 100%
rename from lld/test/elf/Mips/la25-stub.test
rename to lld/test/old-elf/Mips/la25-stub.test
diff --git a/lld/test/elf/Mips/mips-options-01.test b/lld/test/old-elf/Mips/mips-options-01.test
similarity index 100%
rename from lld/test/elf/Mips/mips-options-01.test
rename to lld/test/old-elf/Mips/mips-options-01.test
diff --git a/lld/test/elf/Mips/mips-options-02.test b/lld/test/old-elf/Mips/mips-options-02.test
similarity index 100%
rename from lld/test/elf/Mips/mips-options-02.test
rename to lld/test/old-elf/Mips/mips-options-02.test
diff --git a/lld/test/elf/Mips/mips-options-03.test b/lld/test/old-elf/Mips/mips-options-03.test
similarity index 100%
rename from lld/test/elf/Mips/mips-options-03.test
rename to lld/test/old-elf/Mips/mips-options-03.test
diff --git a/lld/test/elf/Mips/mips-options-04.test b/lld/test/old-elf/Mips/mips-options-04.test
similarity index 100%
rename from lld/test/elf/Mips/mips-options-04.test
rename to lld/test/old-elf/Mips/mips-options-04.test
diff --git a/lld/test/elf/Mips/mips-options-05.test b/lld/test/old-elf/Mips/mips-options-05.test
similarity index 100%
rename from lld/test/elf/Mips/mips-options-05.test
rename to lld/test/old-elf/Mips/mips-options-05.test
diff --git a/lld/test/elf/Mips/mips-options-gp0.test b/lld/test/old-elf/Mips/mips-options-gp0.test
similarity index 100%
rename from lld/test/elf/Mips/mips-options-gp0.test
rename to lld/test/old-elf/Mips/mips-options-gp0.test
diff --git a/lld/test/elf/Mips/n32-rela-chain.test b/lld/test/old-elf/Mips/n32-rela-chain.test
similarity index 100%
rename from lld/test/elf/Mips/n32-rela-chain.test
rename to lld/test/old-elf/Mips/n32-rela-chain.test
diff --git a/lld/test/elf/Mips/n64-rel-chain.test b/lld/test/old-elf/Mips/n64-rel-chain.test
similarity index 100%
rename from lld/test/elf/Mips/n64-rel-chain.test
rename to lld/test/old-elf/Mips/n64-rel-chain.test
diff --git a/lld/test/elf/Mips/n64-rel-shift.test b/lld/test/old-elf/Mips/n64-rel-shift.test
similarity index 100%
rename from lld/test/elf/Mips/n64-rel-shift.test
rename to lld/test/old-elf/Mips/n64-rel-shift.test
diff --git a/lld/test/elf/Mips/opt-emulation.test b/lld/test/old-elf/Mips/opt-emulation.test
similarity index 100%
rename from lld/test/elf/Mips/opt-emulation.test
rename to lld/test/old-elf/Mips/opt-emulation.test
diff --git a/lld/test/elf/Mips/pc23-range.test b/lld/test/old-elf/Mips/pc23-range.test
similarity index 100%
rename from lld/test/elf/Mips/pc23-range.test
rename to lld/test/old-elf/Mips/pc23-range.test
diff --git a/lld/test/elf/Mips/plt-entry-mixed-1.test b/lld/test/old-elf/Mips/plt-entry-mixed-1.test
similarity index 100%
rename from lld/test/elf/Mips/plt-entry-mixed-1.test
rename to lld/test/old-elf/Mips/plt-entry-mixed-1.test
diff --git a/lld/test/elf/Mips/plt-entry-mixed-2.test b/lld/test/old-elf/Mips/plt-entry-mixed-2.test
similarity index 100%
rename from lld/test/elf/Mips/plt-entry-mixed-2.test
rename to lld/test/old-elf/Mips/plt-entry-mixed-2.test
diff --git a/lld/test/elf/Mips/plt-entry-mixed-3.test b/lld/test/old-elf/Mips/plt-entry-mixed-3.test
similarity index 100%
rename from lld/test/elf/Mips/plt-entry-mixed-3.test
rename to lld/test/old-elf/Mips/plt-entry-mixed-3.test
diff --git a/lld/test/elf/Mips/plt-entry-mixed-4.test b/lld/test/old-elf/Mips/plt-entry-mixed-4.test
similarity index 100%
rename from lld/test/elf/Mips/plt-entry-mixed-4.test
rename to lld/test/old-elf/Mips/plt-entry-mixed-4.test
diff --git a/lld/test/elf/Mips/plt-entry-r6-be.test b/lld/test/old-elf/Mips/plt-entry-r6-be.test
similarity index 100%
rename from lld/test/elf/Mips/plt-entry-r6-be.test
rename to lld/test/old-elf/Mips/plt-entry-r6-be.test
diff --git a/lld/test/elf/Mips/plt-entry-r6.test b/lld/test/old-elf/Mips/plt-entry-r6.test
similarity index 100%
rename from lld/test/elf/Mips/plt-entry-r6.test
rename to lld/test/old-elf/Mips/plt-entry-r6.test
diff --git a/lld/test/elf/Mips/plt-header-be.test b/lld/test/old-elf/Mips/plt-header-be.test
similarity index 100%
rename from lld/test/elf/Mips/plt-header-be.test
rename to lld/test/old-elf/Mips/plt-header-be.test
diff --git a/lld/test/elf/Mips/plt-header-micro-be.test b/lld/test/old-elf/Mips/plt-header-micro-be.test
similarity index 100%
rename from lld/test/elf/Mips/plt-header-micro-be.test
rename to lld/test/old-elf/Mips/plt-header-micro-be.test
diff --git a/lld/test/elf/Mips/plt-header-micro.test b/lld/test/old-elf/Mips/plt-header-micro.test
similarity index 100%
rename from lld/test/elf/Mips/plt-header-micro.test
rename to lld/test/old-elf/Mips/plt-header-micro.test
diff --git a/lld/test/elf/Mips/plt-header-mixed.test b/lld/test/old-elf/Mips/plt-header-mixed.test
similarity index 100%
rename from lld/test/elf/Mips/plt-header-mixed.test
rename to lld/test/old-elf/Mips/plt-header-mixed.test
diff --git a/lld/test/elf/Mips/plt-header.test b/lld/test/old-elf/Mips/plt-header.test
similarity index 100%
rename from lld/test/elf/Mips/plt-header.test
rename to lld/test/old-elf/Mips/plt-header.test
diff --git a/lld/test/elf/Mips/r26-1-micro.test b/lld/test/old-elf/Mips/r26-1-micro.test
similarity index 100%
rename from lld/test/elf/Mips/r26-1-micro.test
rename to lld/test/old-elf/Mips/r26-1-micro.test
diff --git a/lld/test/elf/Mips/r26-1.test b/lld/test/old-elf/Mips/r26-1.test
similarity index 100%
rename from lld/test/elf/Mips/r26-1.test
rename to lld/test/old-elf/Mips/r26-1.test
diff --git a/lld/test/elf/Mips/r26-2-micro.test b/lld/test/old-elf/Mips/r26-2-micro.test
similarity index 100%
rename from lld/test/elf/Mips/r26-2-micro.test
rename to lld/test/old-elf/Mips/r26-2-micro.test
diff --git a/lld/test/elf/Mips/r26-2.test b/lld/test/old-elf/Mips/r26-2.test
similarity index 100%
rename from lld/test/elf/Mips/r26-2.test
rename to lld/test/old-elf/Mips/r26-2.test
diff --git a/lld/test/elf/Mips/reginfo-01.test b/lld/test/old-elf/Mips/reginfo-01.test
similarity index 100%
rename from lld/test/elf/Mips/reginfo-01.test
rename to lld/test/old-elf/Mips/reginfo-01.test
diff --git a/lld/test/elf/Mips/reginfo-02.test b/lld/test/old-elf/Mips/reginfo-02.test
similarity index 100%
rename from lld/test/elf/Mips/reginfo-02.test
rename to lld/test/old-elf/Mips/reginfo-02.test
diff --git a/lld/test/elf/Mips/reginfo-03.test b/lld/test/old-elf/Mips/reginfo-03.test
similarity index 100%
rename from lld/test/elf/Mips/reginfo-03.test
rename to lld/test/old-elf/Mips/reginfo-03.test
diff --git a/lld/test/elf/Mips/reginfo-04.test b/lld/test/old-elf/Mips/reginfo-04.test
similarity index 100%
rename from lld/test/elf/Mips/reginfo-04.test
rename to lld/test/old-elf/Mips/reginfo-04.test
diff --git a/lld/test/elf/Mips/reginfo-05.test b/lld/test/old-elf/Mips/reginfo-05.test
similarity index 100%
rename from lld/test/elf/Mips/reginfo-05.test
rename to lld/test/old-elf/Mips/reginfo-05.test
diff --git a/lld/test/elf/Mips/rel-16-overflow.test b/lld/test/old-elf/Mips/rel-16-overflow.test
similarity index 100%
rename from lld/test/elf/Mips/rel-16-overflow.test
rename to lld/test/old-elf/Mips/rel-16-overflow.test
diff --git a/lld/test/elf/Mips/rel-16.test b/lld/test/old-elf/Mips/rel-16.test
similarity index 100%
rename from lld/test/elf/Mips/rel-16.test
rename to lld/test/old-elf/Mips/rel-16.test
diff --git a/lld/test/elf/Mips/rel-32-be.test b/lld/test/old-elf/Mips/rel-32-be.test
similarity index 100%
rename from lld/test/elf/Mips/rel-32-be.test
rename to lld/test/old-elf/Mips/rel-32-be.test
diff --git a/lld/test/elf/Mips/rel-32.test b/lld/test/old-elf/Mips/rel-32.test
similarity index 100%
rename from lld/test/elf/Mips/rel-32.test
rename to lld/test/old-elf/Mips/rel-32.test
diff --git a/lld/test/elf/Mips/rel-64.test b/lld/test/old-elf/Mips/rel-64.test
similarity index 100%
rename from lld/test/elf/Mips/rel-64.test
rename to lld/test/old-elf/Mips/rel-64.test
diff --git a/lld/test/elf/Mips/rel-call-hilo-01.test b/lld/test/old-elf/Mips/rel-call-hilo-01.test
similarity index 100%
rename from lld/test/elf/Mips/rel-call-hilo-01.test
rename to lld/test/old-elf/Mips/rel-call-hilo-01.test
diff --git a/lld/test/elf/Mips/rel-call-hilo-micro.test b/lld/test/old-elf/Mips/rel-call-hilo-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-call-hilo-micro.test
rename to lld/test/old-elf/Mips/rel-call-hilo-micro.test
diff --git a/lld/test/elf/Mips/rel-copy-micro.test b/lld/test/old-elf/Mips/rel-copy-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-copy-micro.test
rename to lld/test/old-elf/Mips/rel-copy-micro.test
diff --git a/lld/test/elf/Mips/rel-copy-pc.test b/lld/test/old-elf/Mips/rel-copy-pc.test
similarity index 100%
rename from lld/test/elf/Mips/rel-copy-pc.test
rename to lld/test/old-elf/Mips/rel-copy-pc.test
diff --git a/lld/test/elf/Mips/rel-copy.test b/lld/test/old-elf/Mips/rel-copy.test
similarity index 100%
rename from lld/test/elf/Mips/rel-copy.test
rename to lld/test/old-elf/Mips/rel-copy.test
diff --git a/lld/test/elf/Mips/rel-dynamic-01-micro.test b/lld/test/old-elf/Mips/rel-dynamic-01-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-01-micro.test
rename to lld/test/old-elf/Mips/rel-dynamic-01-micro.test
diff --git a/lld/test/elf/Mips/rel-dynamic-01.test b/lld/test/old-elf/Mips/rel-dynamic-01.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-01.test
rename to lld/test/old-elf/Mips/rel-dynamic-01.test
diff --git a/lld/test/elf/Mips/rel-dynamic-02.test b/lld/test/old-elf/Mips/rel-dynamic-02.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-02.test
rename to lld/test/old-elf/Mips/rel-dynamic-02.test
diff --git a/lld/test/elf/Mips/rel-dynamic-03-micro.test b/lld/test/old-elf/Mips/rel-dynamic-03-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-03-micro.test
rename to lld/test/old-elf/Mips/rel-dynamic-03-micro.test
diff --git a/lld/test/elf/Mips/rel-dynamic-03.test b/lld/test/old-elf/Mips/rel-dynamic-03.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-03.test
rename to lld/test/old-elf/Mips/rel-dynamic-03.test
diff --git a/lld/test/elf/Mips/rel-dynamic-04-micro.test b/lld/test/old-elf/Mips/rel-dynamic-04-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-04-micro.test
rename to lld/test/old-elf/Mips/rel-dynamic-04-micro.test
diff --git a/lld/test/elf/Mips/rel-dynamic-04.test b/lld/test/old-elf/Mips/rel-dynamic-04.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-04.test
rename to lld/test/old-elf/Mips/rel-dynamic-04.test
diff --git a/lld/test/elf/Mips/rel-dynamic-05-micro.test b/lld/test/old-elf/Mips/rel-dynamic-05-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-05-micro.test
rename to lld/test/old-elf/Mips/rel-dynamic-05-micro.test
diff --git a/lld/test/elf/Mips/rel-dynamic-05.test b/lld/test/old-elf/Mips/rel-dynamic-05.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-05.test
rename to lld/test/old-elf/Mips/rel-dynamic-05.test
diff --git a/lld/test/elf/Mips/rel-dynamic-06-64.test b/lld/test/old-elf/Mips/rel-dynamic-06-64.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-06-64.test
rename to lld/test/old-elf/Mips/rel-dynamic-06-64.test
diff --git a/lld/test/elf/Mips/rel-dynamic-06.test b/lld/test/old-elf/Mips/rel-dynamic-06.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-06.test
rename to lld/test/old-elf/Mips/rel-dynamic-06.test
diff --git a/lld/test/elf/Mips/rel-dynamic-07-64.test b/lld/test/old-elf/Mips/rel-dynamic-07-64.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-07-64.test
rename to lld/test/old-elf/Mips/rel-dynamic-07-64.test
diff --git a/lld/test/elf/Mips/rel-dynamic-07.test b/lld/test/old-elf/Mips/rel-dynamic-07.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-07.test
rename to lld/test/old-elf/Mips/rel-dynamic-07.test
diff --git a/lld/test/elf/Mips/rel-dynamic-08-64.test b/lld/test/old-elf/Mips/rel-dynamic-08-64.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-08-64.test
rename to lld/test/old-elf/Mips/rel-dynamic-08-64.test
diff --git a/lld/test/elf/Mips/rel-dynamic-08-micro.test b/lld/test/old-elf/Mips/rel-dynamic-08-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-08-micro.test
rename to lld/test/old-elf/Mips/rel-dynamic-08-micro.test
diff --git a/lld/test/elf/Mips/rel-dynamic-08.test b/lld/test/old-elf/Mips/rel-dynamic-08.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-08.test
rename to lld/test/old-elf/Mips/rel-dynamic-08.test
diff --git a/lld/test/elf/Mips/rel-dynamic-09-micro.test b/lld/test/old-elf/Mips/rel-dynamic-09-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-09-micro.test
rename to lld/test/old-elf/Mips/rel-dynamic-09-micro.test
diff --git a/lld/test/elf/Mips/rel-dynamic-09.test b/lld/test/old-elf/Mips/rel-dynamic-09.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-09.test
rename to lld/test/old-elf/Mips/rel-dynamic-09.test
diff --git a/lld/test/elf/Mips/rel-dynamic-10-micro.test b/lld/test/old-elf/Mips/rel-dynamic-10-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-10-micro.test
rename to lld/test/old-elf/Mips/rel-dynamic-10-micro.test
diff --git a/lld/test/elf/Mips/rel-dynamic-10.test b/lld/test/old-elf/Mips/rel-dynamic-10.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-10.test
rename to lld/test/old-elf/Mips/rel-dynamic-10.test
diff --git a/lld/test/elf/Mips/rel-dynamic-11.test b/lld/test/old-elf/Mips/rel-dynamic-11.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-11.test
rename to lld/test/old-elf/Mips/rel-dynamic-11.test
diff --git a/lld/test/elf/Mips/rel-dynamic-12.test b/lld/test/old-elf/Mips/rel-dynamic-12.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-12.test
rename to lld/test/old-elf/Mips/rel-dynamic-12.test
diff --git a/lld/test/elf/Mips/rel-dynamic-13.test b/lld/test/old-elf/Mips/rel-dynamic-13.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-13.test
rename to lld/test/old-elf/Mips/rel-dynamic-13.test
diff --git a/lld/test/elf/Mips/rel-dynamic-14.test b/lld/test/old-elf/Mips/rel-dynamic-14.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-14.test
rename to lld/test/old-elf/Mips/rel-dynamic-14.test
diff --git a/lld/test/elf/Mips/rel-dynamic-15.test b/lld/test/old-elf/Mips/rel-dynamic-15.test
similarity index 100%
rename from lld/test/elf/Mips/rel-dynamic-15.test
rename to lld/test/old-elf/Mips/rel-dynamic-15.test
diff --git a/lld/test/elf/Mips/rel-eh-01.test b/lld/test/old-elf/Mips/rel-eh-01.test
similarity index 100%
rename from lld/test/elf/Mips/rel-eh-01.test
rename to lld/test/old-elf/Mips/rel-eh-01.test
diff --git a/lld/test/elf/Mips/rel-eh-02.test b/lld/test/old-elf/Mips/rel-eh-02.test
similarity index 100%
rename from lld/test/elf/Mips/rel-eh-02.test
rename to lld/test/old-elf/Mips/rel-eh-02.test
diff --git a/lld/test/elf/Mips/rel-eh-03.test b/lld/test/old-elf/Mips/rel-eh-03.test
similarity index 100%
rename from lld/test/elf/Mips/rel-eh-03.test
rename to lld/test/old-elf/Mips/rel-eh-03.test
diff --git a/lld/test/elf/Mips/rel-got-hilo-01.test b/lld/test/old-elf/Mips/rel-got-hilo-01.test
similarity index 100%
rename from lld/test/elf/Mips/rel-got-hilo-01.test
rename to lld/test/old-elf/Mips/rel-got-hilo-01.test
diff --git a/lld/test/elf/Mips/rel-got-hilo-micro.test b/lld/test/old-elf/Mips/rel-got-hilo-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-got-hilo-micro.test
rename to lld/test/old-elf/Mips/rel-got-hilo-micro.test
diff --git a/lld/test/elf/Mips/rel-gprel16-micro-overflow.test b/lld/test/old-elf/Mips/rel-gprel16-micro-overflow.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel16-micro-overflow.test
rename to lld/test/old-elf/Mips/rel-gprel16-micro-overflow.test
diff --git a/lld/test/elf/Mips/rel-gprel16-micro.test b/lld/test/old-elf/Mips/rel-gprel16-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel16-micro.test
rename to lld/test/old-elf/Mips/rel-gprel16-micro.test
diff --git a/lld/test/elf/Mips/rel-gprel16-overflow.test b/lld/test/old-elf/Mips/rel-gprel16-overflow.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel16-overflow.test
rename to lld/test/old-elf/Mips/rel-gprel16-overflow.test
diff --git a/lld/test/elf/Mips/rel-gprel16.test b/lld/test/old-elf/Mips/rel-gprel16.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel16.test
rename to lld/test/old-elf/Mips/rel-gprel16.test
diff --git a/lld/test/elf/Mips/rel-gprel32-64.test b/lld/test/old-elf/Mips/rel-gprel32-64.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel32-64.test
rename to lld/test/old-elf/Mips/rel-gprel32-64.test
diff --git a/lld/test/elf/Mips/rel-gprel32.test b/lld/test/old-elf/Mips/rel-gprel32.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel32.test
rename to lld/test/old-elf/Mips/rel-gprel32.test
diff --git a/lld/test/elf/Mips/rel-gprel7-micro-overflow.test b/lld/test/old-elf/Mips/rel-gprel7-micro-overflow.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel7-micro-overflow.test
rename to lld/test/old-elf/Mips/rel-gprel7-micro-overflow.test
diff --git a/lld/test/elf/Mips/rel-gprel7-micro.test b/lld/test/old-elf/Mips/rel-gprel7-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-gprel7-micro.test
rename to lld/test/old-elf/Mips/rel-gprel7-micro.test
diff --git a/lld/test/elf/Mips/rel-hi0-lo16-micro.test b/lld/test/old-elf/Mips/rel-hi0-lo16-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-hi0-lo16-micro.test
rename to lld/test/old-elf/Mips/rel-hi0-lo16-micro.test
diff --git a/lld/test/elf/Mips/rel-high-01.test b/lld/test/old-elf/Mips/rel-high-01.test
similarity index 100%
rename from lld/test/elf/Mips/rel-high-01.test
rename to lld/test/old-elf/Mips/rel-high-01.test
diff --git a/lld/test/elf/Mips/rel-high-02.test b/lld/test/old-elf/Mips/rel-high-02.test
similarity index 100%
rename from lld/test/elf/Mips/rel-high-02.test
rename to lld/test/old-elf/Mips/rel-high-02.test
diff --git a/lld/test/elf/Mips/rel-jalr-01.test b/lld/test/old-elf/Mips/rel-jalr-01.test
similarity index 100%
rename from lld/test/elf/Mips/rel-jalr-01.test
rename to lld/test/old-elf/Mips/rel-jalr-01.test
diff --git a/lld/test/elf/Mips/rel-jalr-02.test b/lld/test/old-elf/Mips/rel-jalr-02.test
similarity index 100%
rename from lld/test/elf/Mips/rel-jalr-02.test
rename to lld/test/old-elf/Mips/rel-jalr-02.test
diff --git a/lld/test/elf/Mips/rel-lit-micro.test b/lld/test/old-elf/Mips/rel-lit-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-lit-micro.test
rename to lld/test/old-elf/Mips/rel-lit-micro.test
diff --git a/lld/test/elf/Mips/rel-lit.test b/lld/test/old-elf/Mips/rel-lit.test
similarity index 100%
rename from lld/test/elf/Mips/rel-lit.test
rename to lld/test/old-elf/Mips/rel-lit.test
diff --git a/lld/test/elf/Mips/rel-pc-hilo.test b/lld/test/old-elf/Mips/rel-pc-hilo.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc-hilo.test
rename to lld/test/old-elf/Mips/rel-pc-hilo.test
diff --git a/lld/test/elf/Mips/rel-pc16-align.test b/lld/test/old-elf/Mips/rel-pc16-align.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc16-align.test
rename to lld/test/old-elf/Mips/rel-pc16-align.test
diff --git a/lld/test/elf/Mips/rel-pc16-overflow.test b/lld/test/old-elf/Mips/rel-pc16-overflow.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc16-overflow.test
rename to lld/test/old-elf/Mips/rel-pc16-overflow.test
diff --git a/lld/test/elf/Mips/rel-pc16.test b/lld/test/old-elf/Mips/rel-pc16.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc16.test
rename to lld/test/old-elf/Mips/rel-pc16.test
diff --git a/lld/test/elf/Mips/rel-pc18-s3-align.test b/lld/test/old-elf/Mips/rel-pc18-s3-align.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc18-s3-align.test
rename to lld/test/old-elf/Mips/rel-pc18-s3-align.test
diff --git a/lld/test/elf/Mips/rel-pc18-s3-micro.test b/lld/test/old-elf/Mips/rel-pc18-s3-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc18-s3-micro.test
rename to lld/test/old-elf/Mips/rel-pc18-s3-micro.test
diff --git a/lld/test/elf/Mips/rel-pc18-s3.test b/lld/test/old-elf/Mips/rel-pc18-s3.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc18-s3.test
rename to lld/test/old-elf/Mips/rel-pc18-s3.test
diff --git a/lld/test/elf/Mips/rel-pc19-s2-align.test b/lld/test/old-elf/Mips/rel-pc19-s2-align.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc19-s2-align.test
rename to lld/test/old-elf/Mips/rel-pc19-s2-align.test
diff --git a/lld/test/elf/Mips/rel-pc19-s2-micro.test b/lld/test/old-elf/Mips/rel-pc19-s2-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc19-s2-micro.test
rename to lld/test/old-elf/Mips/rel-pc19-s2-micro.test
diff --git a/lld/test/elf/Mips/rel-pc19-s2.test b/lld/test/old-elf/Mips/rel-pc19-s2.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc19-s2.test
rename to lld/test/old-elf/Mips/rel-pc19-s2.test
diff --git a/lld/test/elf/Mips/rel-pc21-s2-align.test b/lld/test/old-elf/Mips/rel-pc21-s2-align.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc21-s2-align.test
rename to lld/test/old-elf/Mips/rel-pc21-s2-align.test
diff --git a/lld/test/elf/Mips/rel-pc21-s2-micro.test b/lld/test/old-elf/Mips/rel-pc21-s2-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc21-s2-micro.test
rename to lld/test/old-elf/Mips/rel-pc21-s2-micro.test
diff --git a/lld/test/elf/Mips/rel-pc21-s2-overflow.test b/lld/test/old-elf/Mips/rel-pc21-s2-overflow.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc21-s2-overflow.test
rename to lld/test/old-elf/Mips/rel-pc21-s2-overflow.test
diff --git a/lld/test/elf/Mips/rel-pc21-s2.test b/lld/test/old-elf/Mips/rel-pc21-s2.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc21-s2.test
rename to lld/test/old-elf/Mips/rel-pc21-s2.test
diff --git a/lld/test/elf/Mips/rel-pc26-s2-align.test b/lld/test/old-elf/Mips/rel-pc26-s2-align.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc26-s2-align.test
rename to lld/test/old-elf/Mips/rel-pc26-s2-align.test
diff --git a/lld/test/elf/Mips/rel-pc26-s2-micro.test b/lld/test/old-elf/Mips/rel-pc26-s2-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc26-s2-micro.test
rename to lld/test/old-elf/Mips/rel-pc26-s2-micro.test
diff --git a/lld/test/elf/Mips/rel-pc26-s2.test b/lld/test/old-elf/Mips/rel-pc26-s2.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc26-s2.test
rename to lld/test/old-elf/Mips/rel-pc26-s2.test
diff --git a/lld/test/elf/Mips/rel-pc32.test b/lld/test/old-elf/Mips/rel-pc32.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc32.test
rename to lld/test/old-elf/Mips/rel-pc32.test
diff --git a/lld/test/elf/Mips/rel-pc7-10-16-23.test b/lld/test/old-elf/Mips/rel-pc7-10-16-23.test
similarity index 100%
rename from lld/test/elf/Mips/rel-pc7-10-16-23.test
rename to lld/test/old-elf/Mips/rel-pc7-10-16-23.test
diff --git a/lld/test/elf/Mips/rel-sub-micro.test b/lld/test/old-elf/Mips/rel-sub-micro.test
similarity index 100%
rename from lld/test/elf/Mips/rel-sub-micro.test
rename to lld/test/old-elf/Mips/rel-sub-micro.test
diff --git a/lld/test/elf/Mips/rel-sub.test b/lld/test/old-elf/Mips/rel-sub.test
similarity index 100%
rename from lld/test/elf/Mips/rel-sub.test
rename to lld/test/old-elf/Mips/rel-sub.test
diff --git a/lld/test/elf/Mips/rld_map.test b/lld/test/old-elf/Mips/rld_map.test
similarity index 100%
rename from lld/test/elf/Mips/rld_map.test
rename to lld/test/old-elf/Mips/rld_map.test
diff --git a/lld/test/elf/Mips/sign-rela.test b/lld/test/old-elf/Mips/sign-rela.test
similarity index 100%
rename from lld/test/elf/Mips/sign-rela.test
rename to lld/test/old-elf/Mips/sign-rela.test
diff --git a/lld/test/elf/Mips/st-other.test b/lld/test/old-elf/Mips/st-other.test
similarity index 100%
rename from lld/test/elf/Mips/st-other.test
rename to lld/test/old-elf/Mips/st-other.test
diff --git a/lld/test/elf/Mips/static-01.test b/lld/test/old-elf/Mips/static-01.test
similarity index 100%
rename from lld/test/elf/Mips/static-01.test
rename to lld/test/old-elf/Mips/static-01.test
diff --git a/lld/test/elf/Mips/tls-1-micro.test b/lld/test/old-elf/Mips/tls-1-micro.test
similarity index 100%
rename from lld/test/elf/Mips/tls-1-micro.test
rename to lld/test/old-elf/Mips/tls-1-micro.test
diff --git a/lld/test/elf/Mips/tls-1.test b/lld/test/old-elf/Mips/tls-1.test
similarity index 100%
rename from lld/test/elf/Mips/tls-1.test
rename to lld/test/old-elf/Mips/tls-1.test
diff --git a/lld/test/elf/Mips/tls-2-64-static.test b/lld/test/old-elf/Mips/tls-2-64-static.test
similarity index 100%
rename from lld/test/elf/Mips/tls-2-64-static.test
rename to lld/test/old-elf/Mips/tls-2-64-static.test
diff --git a/lld/test/elf/Mips/tls-2-64.test b/lld/test/old-elf/Mips/tls-2-64.test
similarity index 100%
rename from lld/test/elf/Mips/tls-2-64.test
rename to lld/test/old-elf/Mips/tls-2-64.test
diff --git a/lld/test/elf/Mips/tls-2-micro.test b/lld/test/old-elf/Mips/tls-2-micro.test
similarity index 100%
rename from lld/test/elf/Mips/tls-2-micro.test
rename to lld/test/old-elf/Mips/tls-2-micro.test
diff --git a/lld/test/elf/Mips/tls-2-static.test b/lld/test/old-elf/Mips/tls-2-static.test
similarity index 100%
rename from lld/test/elf/Mips/tls-2-static.test
rename to lld/test/old-elf/Mips/tls-2-static.test
diff --git a/lld/test/elf/Mips/tls-2.test b/lld/test/old-elf/Mips/tls-2.test
similarity index 100%
rename from lld/test/elf/Mips/tls-2.test
rename to lld/test/old-elf/Mips/tls-2.test
diff --git a/lld/test/elf/Mips/tls-3-64-static.test b/lld/test/old-elf/Mips/tls-3-64-static.test
similarity index 100%
rename from lld/test/elf/Mips/tls-3-64-static.test
rename to lld/test/old-elf/Mips/tls-3-64-static.test
diff --git a/lld/test/elf/Mips/tls-3-micro.test b/lld/test/old-elf/Mips/tls-3-micro.test
similarity index 100%
rename from lld/test/elf/Mips/tls-3-micro.test
rename to lld/test/old-elf/Mips/tls-3-micro.test
diff --git a/lld/test/elf/Mips/tls-3-static.test b/lld/test/old-elf/Mips/tls-3-static.test
similarity index 100%
rename from lld/test/elf/Mips/tls-3-static.test
rename to lld/test/old-elf/Mips/tls-3-static.test
diff --git a/lld/test/elf/Mips/tls-3.test b/lld/test/old-elf/Mips/tls-3.test
similarity index 100%
rename from lld/test/elf/Mips/tls-3.test
rename to lld/test/old-elf/Mips/tls-3.test
diff --git a/lld/test/elf/Mips/tls-4-64-static.test b/lld/test/old-elf/Mips/tls-4-64-static.test
similarity index 100%
rename from lld/test/elf/Mips/tls-4-64-static.test
rename to lld/test/old-elf/Mips/tls-4-64-static.test
diff --git a/lld/test/elf/Mips/tls-4-micro.test b/lld/test/old-elf/Mips/tls-4-micro.test
similarity index 100%
rename from lld/test/elf/Mips/tls-4-micro.test
rename to lld/test/old-elf/Mips/tls-4-micro.test
diff --git a/lld/test/elf/Mips/tls-4-static.test b/lld/test/old-elf/Mips/tls-4-static.test
similarity index 100%
rename from lld/test/elf/Mips/tls-4-static.test
rename to lld/test/old-elf/Mips/tls-4-static.test
diff --git a/lld/test/elf/Mips/tls-4.test b/lld/test/old-elf/Mips/tls-4.test
similarity index 100%
rename from lld/test/elf/Mips/tls-4.test
rename to lld/test/old-elf/Mips/tls-4.test
diff --git a/lld/test/elf/Mips/tls-5-64.test b/lld/test/old-elf/Mips/tls-5-64.test
similarity index 100%
rename from lld/test/elf/Mips/tls-5-64.test
rename to lld/test/old-elf/Mips/tls-5-64.test
diff --git a/lld/test/elf/Mips/tls-5-micro.test b/lld/test/old-elf/Mips/tls-5-micro.test
similarity index 100%
rename from lld/test/elf/Mips/tls-5-micro.test
rename to lld/test/old-elf/Mips/tls-5-micro.test
diff --git a/lld/test/elf/Mips/tls-5.test b/lld/test/old-elf/Mips/tls-5.test
similarity index 100%
rename from lld/test/elf/Mips/tls-5.test
rename to lld/test/old-elf/Mips/tls-5.test
diff --git a/lld/test/elf/Mips/validate-rel-01.test b/lld/test/old-elf/Mips/validate-rel-01.test
similarity index 100%
rename from lld/test/elf/Mips/validate-rel-01.test
rename to lld/test/old-elf/Mips/validate-rel-01.test
diff --git a/lld/test/elf/Mips/validate-rel-03.test b/lld/test/old-elf/Mips/validate-rel-03.test
similarity index 100%
rename from lld/test/elf/Mips/validate-rel-03.test
rename to lld/test/old-elf/Mips/validate-rel-03.test
diff --git a/lld/test/elf/X86_64/ExampleTarget/triple.test b/lld/test/old-elf/X86_64/ExampleTarget/triple.test
similarity index 100%
rename from lld/test/elf/X86_64/ExampleTarget/triple.test
rename to lld/test/old-elf/X86_64/ExampleTarget/triple.test
diff --git a/lld/test/elf/X86_64/Inputs/constint.c b/lld/test/old-elf/X86_64/Inputs/constint.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/constint.c
rename to lld/test/old-elf/X86_64/Inputs/constint.c
diff --git a/lld/test/elf/X86_64/Inputs/constint.o b/lld/test/old-elf/X86_64/Inputs/constint.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/constint.o
rename to lld/test/old-elf/X86_64/Inputs/constint.o
diff --git a/lld/test/elf/X86_64/Inputs/debug0.c b/lld/test/old-elf/X86_64/Inputs/debug0.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/debug0.c
rename to lld/test/old-elf/X86_64/Inputs/debug0.c
diff --git a/lld/test/elf/X86_64/Inputs/debug0.x86-64 b/lld/test/old-elf/X86_64/Inputs/debug0.x86-64
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/debug0.x86-64
rename to lld/test/old-elf/X86_64/Inputs/debug0.x86-64
diff --git a/lld/test/elf/X86_64/Inputs/debug1.c b/lld/test/old-elf/X86_64/Inputs/debug1.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/debug1.c
rename to lld/test/old-elf/X86_64/Inputs/debug1.c
diff --git a/lld/test/elf/X86_64/Inputs/debug1.x86-64 b/lld/test/old-elf/X86_64/Inputs/debug1.x86-64
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/debug1.x86-64
rename to lld/test/old-elf/X86_64/Inputs/debug1.x86-64
diff --git a/lld/test/elf/X86_64/Inputs/externtls.c b/lld/test/old-elf/X86_64/Inputs/externtls.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/externtls.c
rename to lld/test/old-elf/X86_64/Inputs/externtls.c
diff --git a/lld/test/elf/X86_64/Inputs/externtls.x86-64 b/lld/test/old-elf/X86_64/Inputs/externtls.x86-64
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/externtls.x86-64
rename to lld/test/old-elf/X86_64/Inputs/externtls.x86-64
diff --git a/lld/test/elf/X86_64/Inputs/fn.c b/lld/test/old-elf/X86_64/Inputs/fn.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/fn.c
rename to lld/test/old-elf/X86_64/Inputs/fn.c
diff --git a/lld/test/elf/X86_64/Inputs/fn.o b/lld/test/old-elf/X86_64/Inputs/fn.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/fn.o
rename to lld/test/old-elf/X86_64/Inputs/fn.o
diff --git a/lld/test/elf/X86_64/Inputs/generaltls-so.o.yaml b/lld/test/old-elf/X86_64/Inputs/generaltls-so.o.yaml
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/generaltls-so.o.yaml
rename to lld/test/old-elf/X86_64/Inputs/generaltls-so.o.yaml
diff --git a/lld/test/elf/X86_64/Inputs/group/1.c b/lld/test/old-elf/X86_64/Inputs/group/1.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/1.c
rename to lld/test/old-elf/X86_64/Inputs/group/1.c
diff --git a/lld/test/elf/X86_64/Inputs/group/1.o b/lld/test/old-elf/X86_64/Inputs/group/1.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/1.o
rename to lld/test/old-elf/X86_64/Inputs/group/1.o
diff --git a/lld/test/elf/X86_64/Inputs/group/fn.c b/lld/test/old-elf/X86_64/Inputs/group/fn.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/fn.c
rename to lld/test/old-elf/X86_64/Inputs/group/fn.c
diff --git a/lld/test/elf/X86_64/Inputs/group/fn.o b/lld/test/old-elf/X86_64/Inputs/group/fn.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/fn.o
rename to lld/test/old-elf/X86_64/Inputs/group/fn.o
diff --git a/lld/test/elf/X86_64/Inputs/group/fn1.c b/lld/test/old-elf/X86_64/Inputs/group/fn1.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/fn1.c
rename to lld/test/old-elf/X86_64/Inputs/group/fn1.c
diff --git a/lld/test/elf/X86_64/Inputs/group/fn1.o b/lld/test/old-elf/X86_64/Inputs/group/fn1.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/fn1.o
rename to lld/test/old-elf/X86_64/Inputs/group/fn1.o
diff --git a/lld/test/elf/X86_64/Inputs/group/fn2.c b/lld/test/old-elf/X86_64/Inputs/group/fn2.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/fn2.c
rename to lld/test/old-elf/X86_64/Inputs/group/fn2.c
diff --git a/lld/test/elf/X86_64/Inputs/group/fn2.o b/lld/test/old-elf/X86_64/Inputs/group/fn2.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/fn2.o
rename to lld/test/old-elf/X86_64/Inputs/group/fn2.o
diff --git a/lld/test/elf/X86_64/Inputs/group/group.sh b/lld/test/old-elf/X86_64/Inputs/group/group.sh
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/group.sh
rename to lld/test/old-elf/X86_64/Inputs/group/group.sh
diff --git a/lld/test/elf/X86_64/Inputs/group/libfn.a b/lld/test/old-elf/X86_64/Inputs/group/libfn.a
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/libfn.a
rename to lld/test/old-elf/X86_64/Inputs/group/libfn.a
diff --git a/lld/test/elf/X86_64/Inputs/group/libfn.so b/lld/test/old-elf/X86_64/Inputs/group/libfn.so
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/libfn.so
rename to lld/test/old-elf/X86_64/Inputs/group/libfn.so
diff --git a/lld/test/elf/X86_64/Inputs/group/libfn1.a b/lld/test/old-elf/X86_64/Inputs/group/libfn1.a
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/libfn1.a
rename to lld/test/old-elf/X86_64/Inputs/group/libfn1.a
diff --git a/lld/test/elf/X86_64/Inputs/group/libfn2.so b/lld/test/old-elf/X86_64/Inputs/group/libfn2.so
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/group/libfn2.so
rename to lld/test/old-elf/X86_64/Inputs/group/libfn2.so
diff --git a/lld/test/elf/X86_64/Inputs/initfini-option.c b/lld/test/old-elf/X86_64/Inputs/initfini-option.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/initfini-option.c
rename to lld/test/old-elf/X86_64/Inputs/initfini-option.c
diff --git a/lld/test/elf/X86_64/Inputs/initfini-option.o b/lld/test/old-elf/X86_64/Inputs/initfini-option.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/initfini-option.o
rename to lld/test/old-elf/X86_64/Inputs/initfini-option.o
diff --git a/lld/test/elf/X86_64/Inputs/initfini.c b/lld/test/old-elf/X86_64/Inputs/initfini.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/initfini.c
rename to lld/test/old-elf/X86_64/Inputs/initfini.c
diff --git a/lld/test/elf/X86_64/Inputs/initfini.o b/lld/test/old-elf/X86_64/Inputs/initfini.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/initfini.o
rename to lld/test/old-elf/X86_64/Inputs/initfini.o
diff --git a/lld/test/elf/X86_64/Inputs/largebss.c b/lld/test/old-elf/X86_64/Inputs/largebss.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/largebss.c
rename to lld/test/old-elf/X86_64/Inputs/largebss.c
diff --git a/lld/test/elf/X86_64/Inputs/largebss.o b/lld/test/old-elf/X86_64/Inputs/largebss.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/largebss.o
rename to lld/test/old-elf/X86_64/Inputs/largebss.o
diff --git a/lld/test/elf/X86_64/Inputs/layoutpass/1.c b/lld/test/old-elf/X86_64/Inputs/layoutpass/1.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/layoutpass/1.c
rename to lld/test/old-elf/X86_64/Inputs/layoutpass/1.c
diff --git a/lld/test/elf/X86_64/Inputs/layoutpass/1.o b/lld/test/old-elf/X86_64/Inputs/layoutpass/1.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/layoutpass/1.o
rename to lld/test/old-elf/X86_64/Inputs/layoutpass/1.o
diff --git a/lld/test/elf/X86_64/Inputs/layoutpass/2.c b/lld/test/old-elf/X86_64/Inputs/layoutpass/2.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/layoutpass/2.c
rename to lld/test/old-elf/X86_64/Inputs/layoutpass/2.c
diff --git a/lld/test/elf/X86_64/Inputs/layoutpass/2.o b/lld/test/old-elf/X86_64/Inputs/layoutpass/2.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/layoutpass/2.o
rename to lld/test/old-elf/X86_64/Inputs/layoutpass/2.o
diff --git a/lld/test/elf/X86_64/Inputs/layoutpass/3.c b/lld/test/old-elf/X86_64/Inputs/layoutpass/3.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/layoutpass/3.c
rename to lld/test/old-elf/X86_64/Inputs/layoutpass/3.c
diff --git a/lld/test/elf/X86_64/Inputs/layoutpass/3.o b/lld/test/old-elf/X86_64/Inputs/layoutpass/3.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/layoutpass/3.o
rename to lld/test/old-elf/X86_64/Inputs/layoutpass/3.o
diff --git a/lld/test/elf/X86_64/Inputs/layoutpass/lib2.a b/lld/test/old-elf/X86_64/Inputs/layoutpass/lib2.a
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/layoutpass/lib2.a
rename to lld/test/old-elf/X86_64/Inputs/layoutpass/lib2.a
diff --git a/lld/test/elf/X86_64/Inputs/libfn.a b/lld/test/old-elf/X86_64/Inputs/libfn.a
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/libfn.a
rename to lld/test/old-elf/X86_64/Inputs/libfn.a
diff --git a/lld/test/elf/X86_64/Inputs/libfn.so b/lld/test/old-elf/X86_64/Inputs/libfn.so
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/libfn.so
rename to lld/test/old-elf/X86_64/Inputs/libfn.so
diff --git a/lld/test/elf/X86_64/Inputs/main.c b/lld/test/old-elf/X86_64/Inputs/main.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/main.c
rename to lld/test/old-elf/X86_64/Inputs/main.c
diff --git a/lld/test/elf/X86_64/Inputs/main.o b/lld/test/old-elf/X86_64/Inputs/main.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/main.o
rename to lld/test/old-elf/X86_64/Inputs/main.o
diff --git a/lld/test/elf/X86_64/Inputs/multi-ovrd.c b/lld/test/old-elf/X86_64/Inputs/multi-ovrd.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/multi-ovrd.c
rename to lld/test/old-elf/X86_64/Inputs/multi-ovrd.c
diff --git a/lld/test/elf/X86_64/Inputs/multi-ovrd.o b/lld/test/old-elf/X86_64/Inputs/multi-ovrd.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/multi-ovrd.o
rename to lld/test/old-elf/X86_64/Inputs/multi-ovrd.o
diff --git a/lld/test/elf/X86_64/Inputs/multi-weak.c b/lld/test/old-elf/X86_64/Inputs/multi-weak.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/multi-weak.c
rename to lld/test/old-elf/X86_64/Inputs/multi-weak.c
diff --git a/lld/test/elf/X86_64/Inputs/multi-weak.o b/lld/test/old-elf/X86_64/Inputs/multi-weak.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/multi-weak.o
rename to lld/test/old-elf/X86_64/Inputs/multi-weak.o
diff --git a/lld/test/elf/X86_64/Inputs/multiweaksyms.o b/lld/test/old-elf/X86_64/Inputs/multiweaksyms.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/multiweaksyms.o
rename to lld/test/old-elf/X86_64/Inputs/multiweaksyms.o
diff --git a/lld/test/elf/X86_64/Inputs/nmagic.c b/lld/test/old-elf/X86_64/Inputs/nmagic.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/nmagic.c
rename to lld/test/old-elf/X86_64/Inputs/nmagic.c
diff --git a/lld/test/elf/X86_64/Inputs/nmagic.o b/lld/test/old-elf/X86_64/Inputs/nmagic.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/nmagic.o
rename to lld/test/old-elf/X86_64/Inputs/nmagic.o
diff --git a/lld/test/elf/X86_64/Inputs/no-interp-section.c b/lld/test/old-elf/X86_64/Inputs/no-interp-section.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/no-interp-section.c
rename to lld/test/old-elf/X86_64/Inputs/no-interp-section.c
diff --git a/lld/test/elf/X86_64/Inputs/no-interp-section.o b/lld/test/old-elf/X86_64/Inputs/no-interp-section.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/no-interp-section.o
rename to lld/test/old-elf/X86_64/Inputs/no-interp-section.o
diff --git a/lld/test/elf/X86_64/Inputs/note.o b/lld/test/old-elf/X86_64/Inputs/note.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/note.o
rename to lld/test/old-elf/X86_64/Inputs/note.o
diff --git a/lld/test/elf/X86_64/Inputs/note.s b/lld/test/old-elf/X86_64/Inputs/note.s
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/note.s
rename to lld/test/old-elf/X86_64/Inputs/note.s
diff --git a/lld/test/elf/X86_64/Inputs/note_ro_rw.o b/lld/test/old-elf/X86_64/Inputs/note_ro_rw.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/note_ro_rw.o
rename to lld/test/old-elf/X86_64/Inputs/note_ro_rw.o
diff --git a/lld/test/elf/X86_64/Inputs/note_ro_rw.s b/lld/test/old-elf/X86_64/Inputs/note_ro_rw.s
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/note_ro_rw.s
rename to lld/test/old-elf/X86_64/Inputs/note_ro_rw.s
diff --git a/lld/test/elf/X86_64/Inputs/ovrd.c b/lld/test/old-elf/X86_64/Inputs/ovrd.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/ovrd.c
rename to lld/test/old-elf/X86_64/Inputs/ovrd.c
diff --git a/lld/test/elf/X86_64/Inputs/ovrd.o b/lld/test/old-elf/X86_64/Inputs/ovrd.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/ovrd.o
rename to lld/test/old-elf/X86_64/Inputs/ovrd.o
diff --git a/lld/test/elf/X86_64/Inputs/rodata.c b/lld/test/old-elf/X86_64/Inputs/rodata.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/rodata.c
rename to lld/test/old-elf/X86_64/Inputs/rodata.c
diff --git a/lld/test/elf/X86_64/Inputs/rodata.o b/lld/test/old-elf/X86_64/Inputs/rodata.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/rodata.o
rename to lld/test/old-elf/X86_64/Inputs/rodata.o
diff --git a/lld/test/elf/X86_64/Inputs/rodata.s b/lld/test/old-elf/X86_64/Inputs/rodata.s
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/rodata.s
rename to lld/test/old-elf/X86_64/Inputs/rodata.s
diff --git a/lld/test/elf/X86_64/Inputs/rwint.c b/lld/test/old-elf/X86_64/Inputs/rwint.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/rwint.c
rename to lld/test/old-elf/X86_64/Inputs/rwint.c
diff --git a/lld/test/elf/X86_64/Inputs/rwint.o b/lld/test/old-elf/X86_64/Inputs/rwint.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/rwint.o
rename to lld/test/old-elf/X86_64/Inputs/rwint.o
diff --git a/lld/test/elf/X86_64/Inputs/sectionmap.c b/lld/test/old-elf/X86_64/Inputs/sectionmap.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/sectionmap.c
rename to lld/test/old-elf/X86_64/Inputs/sectionmap.c
diff --git a/lld/test/elf/X86_64/Inputs/sectionmap.o b/lld/test/old-elf/X86_64/Inputs/sectionmap.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/sectionmap.o
rename to lld/test/old-elf/X86_64/Inputs/sectionmap.o
diff --git a/lld/test/elf/X86_64/Inputs/undefcpp.c b/lld/test/old-elf/X86_64/Inputs/undefcpp.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/undefcpp.c
rename to lld/test/old-elf/X86_64/Inputs/undefcpp.c
diff --git a/lld/test/elf/X86_64/Inputs/undefcpp.o b/lld/test/old-elf/X86_64/Inputs/undefcpp.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/undefcpp.o
rename to lld/test/old-elf/X86_64/Inputs/undefcpp.o
diff --git a/lld/test/elf/X86_64/Inputs/weak-zero-sized.o b/lld/test/old-elf/X86_64/Inputs/weak-zero-sized.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/weak-zero-sized.o
rename to lld/test/old-elf/X86_64/Inputs/weak-zero-sized.o
diff --git a/lld/test/elf/X86_64/Inputs/weak.c b/lld/test/old-elf/X86_64/Inputs/weak.c
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/weak.c
rename to lld/test/old-elf/X86_64/Inputs/weak.c
diff --git a/lld/test/elf/X86_64/Inputs/weak.o b/lld/test/old-elf/X86_64/Inputs/weak.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/weak.o
rename to lld/test/old-elf/X86_64/Inputs/weak.o
diff --git a/lld/test/elf/X86_64/Inputs/weak.s b/lld/test/old-elf/X86_64/Inputs/weak.s
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/weak.s
rename to lld/test/old-elf/X86_64/Inputs/weak.s
diff --git a/lld/test/elf/X86_64/Inputs/zerosizedsection.o b/lld/test/old-elf/X86_64/Inputs/zerosizedsection.o
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/zerosizedsection.o
rename to lld/test/old-elf/X86_64/Inputs/zerosizedsection.o
diff --git a/lld/test/elf/X86_64/Inputs/zerosizedsection.s b/lld/test/old-elf/X86_64/Inputs/zerosizedsection.s
similarity index 100%
rename from lld/test/elf/X86_64/Inputs/zerosizedsection.s
rename to lld/test/old-elf/X86_64/Inputs/zerosizedsection.s
diff --git a/lld/test/elf/X86_64/alignoffset.test b/lld/test/old-elf/X86_64/alignoffset.test
similarity index 100%
rename from lld/test/elf/X86_64/alignoffset.test
rename to lld/test/old-elf/X86_64/alignoffset.test
diff --git a/lld/test/elf/X86_64/debug.test b/lld/test/old-elf/X86_64/debug.test
similarity index 100%
rename from lld/test/elf/X86_64/debug.test
rename to lld/test/old-elf/X86_64/debug.test
diff --git a/lld/test/elf/X86_64/defsym.test b/lld/test/old-elf/X86_64/defsym.test
similarity index 100%
rename from lld/test/elf/X86_64/defsym.test
rename to lld/test/old-elf/X86_64/defsym.test
diff --git a/lld/test/elf/X86_64/demangle.test b/lld/test/old-elf/X86_64/demangle.test
similarity index 100%
rename from lld/test/elf/X86_64/demangle.test
rename to lld/test/old-elf/X86_64/demangle.test
diff --git a/lld/test/elf/X86_64/dontignorezerosize-sections.test b/lld/test/old-elf/X86_64/dontignorezerosize-sections.test
similarity index 100%
rename from lld/test/elf/X86_64/dontignorezerosize-sections.test
rename to lld/test/old-elf/X86_64/dontignorezerosize-sections.test
diff --git a/lld/test/elf/X86_64/dynamicvars.test b/lld/test/old-elf/X86_64/dynamicvars.test
similarity index 100%
rename from lld/test/elf/X86_64/dynamicvars.test
rename to lld/test/old-elf/X86_64/dynamicvars.test
diff --git a/lld/test/elf/X86_64/dynlib-nointerp-section.test b/lld/test/old-elf/X86_64/dynlib-nointerp-section.test
similarity index 100%
rename from lld/test/elf/X86_64/dynlib-nointerp-section.test
rename to lld/test/old-elf/X86_64/dynlib-nointerp-section.test
diff --git a/lld/test/elf/X86_64/dynlib-search.test b/lld/test/old-elf/X86_64/dynlib-search.test
similarity index 100%
rename from lld/test/elf/X86_64/dynlib-search.test
rename to lld/test/old-elf/X86_64/dynlib-search.test
diff --git a/lld/test/elf/X86_64/dynsym-weak.test b/lld/test/old-elf/X86_64/dynsym-weak.test
similarity index 100%
rename from lld/test/elf/X86_64/dynsym-weak.test
rename to lld/test/old-elf/X86_64/dynsym-weak.test
diff --git a/lld/test/elf/X86_64/extern-tls.test b/lld/test/old-elf/X86_64/extern-tls.test
similarity index 100%
rename from lld/test/elf/X86_64/extern-tls.test
rename to lld/test/old-elf/X86_64/extern-tls.test
diff --git a/lld/test/elf/X86_64/general-dynamic-tls.test b/lld/test/old-elf/X86_64/general-dynamic-tls.test
similarity index 100%
rename from lld/test/elf/X86_64/general-dynamic-tls.test
rename to lld/test/old-elf/X86_64/general-dynamic-tls.test
diff --git a/lld/test/elf/X86_64/imagebase.test b/lld/test/old-elf/X86_64/imagebase.test
similarity index 100%
rename from lld/test/elf/X86_64/imagebase.test
rename to lld/test/old-elf/X86_64/imagebase.test
diff --git a/lld/test/elf/X86_64/initfini-order.test b/lld/test/old-elf/X86_64/initfini-order.test
similarity index 100%
rename from lld/test/elf/X86_64/initfini-order.test
rename to lld/test/old-elf/X86_64/initfini-order.test
diff --git a/lld/test/elf/X86_64/initfini.test b/lld/test/old-elf/X86_64/initfini.test
similarity index 100%
rename from lld/test/elf/X86_64/initfini.test
rename to lld/test/old-elf/X86_64/initfini.test
diff --git a/lld/test/elf/X86_64/largebss.test b/lld/test/old-elf/X86_64/largebss.test
similarity index 100%
rename from lld/test/elf/X86_64/largebss.test
rename to lld/test/old-elf/X86_64/largebss.test
diff --git a/lld/test/elf/X86_64/layoutpass-order.test b/lld/test/old-elf/X86_64/layoutpass-order.test
similarity index 100%
rename from lld/test/elf/X86_64/layoutpass-order.test
rename to lld/test/old-elf/X86_64/layoutpass-order.test
diff --git a/lld/test/elf/X86_64/maxpagesize.test b/lld/test/old-elf/X86_64/maxpagesize.test
similarity index 100%
rename from lld/test/elf/X86_64/maxpagesize.test
rename to lld/test/old-elf/X86_64/maxpagesize.test
diff --git a/lld/test/elf/X86_64/mergesimilarstrings.test b/lld/test/old-elf/X86_64/mergesimilarstrings.test
similarity index 100%
rename from lld/test/elf/X86_64/mergesimilarstrings.test
rename to lld/test/old-elf/X86_64/mergesimilarstrings.test
diff --git a/lld/test/elf/X86_64/multi-weak-layout.test b/lld/test/old-elf/X86_64/multi-weak-layout.test
similarity index 100%
rename from lld/test/elf/X86_64/multi-weak-layout.test
rename to lld/test/old-elf/X86_64/multi-weak-layout.test
diff --git a/lld/test/elf/X86_64/multi-weak-override.test b/lld/test/old-elf/X86_64/multi-weak-override.test
similarity index 100%
rename from lld/test/elf/X86_64/multi-weak-override.test
rename to lld/test/old-elf/X86_64/multi-weak-override.test
diff --git a/lld/test/elf/X86_64/multi-weak-syms-order.test b/lld/test/old-elf/X86_64/multi-weak-syms-order.test
similarity index 100%
rename from lld/test/elf/X86_64/multi-weak-syms-order.test
rename to lld/test/old-elf/X86_64/multi-weak-syms-order.test
diff --git a/lld/test/elf/X86_64/nmagic.test b/lld/test/old-elf/X86_64/nmagic.test
similarity index 100%
rename from lld/test/elf/X86_64/nmagic.test
rename to lld/test/old-elf/X86_64/nmagic.test
diff --git a/lld/test/elf/X86_64/noalignsegments.test b/lld/test/old-elf/X86_64/noalignsegments.test
similarity index 100%
rename from lld/test/elf/X86_64/noalignsegments.test
rename to lld/test/old-elf/X86_64/noalignsegments.test
diff --git a/lld/test/elf/X86_64/note-sections-ro_plus_rw.test b/lld/test/old-elf/X86_64/note-sections-ro_plus_rw.test
similarity index 100%
rename from lld/test/elf/X86_64/note-sections-ro_plus_rw.test
rename to lld/test/old-elf/X86_64/note-sections-ro_plus_rw.test
diff --git a/lld/test/elf/X86_64/note-sections.test b/lld/test/old-elf/X86_64/note-sections.test
similarity index 100%
rename from lld/test/elf/X86_64/note-sections.test
rename to lld/test/old-elf/X86_64/note-sections.test
diff --git a/lld/test/elf/X86_64/omagic.test b/lld/test/old-elf/X86_64/omagic.test
similarity index 100%
rename from lld/test/elf/X86_64/omagic.test
rename to lld/test/old-elf/X86_64/omagic.test
diff --git a/lld/test/elf/X86_64/outputsegments.test b/lld/test/old-elf/X86_64/outputsegments.test
similarity index 100%
rename from lld/test/elf/X86_64/outputsegments.test
rename to lld/test/old-elf/X86_64/outputsegments.test
diff --git a/lld/test/elf/X86_64/reloc_r_x86_64_16.test b/lld/test/old-elf/X86_64/reloc_r_x86_64_16.test
similarity index 100%
rename from lld/test/elf/X86_64/reloc_r_x86_64_16.test
rename to lld/test/old-elf/X86_64/reloc_r_x86_64_16.test
diff --git a/lld/test/elf/X86_64/reloc_r_x86_64_pc16.test b/lld/test/old-elf/X86_64/reloc_r_x86_64_pc16.test
similarity index 100%
rename from lld/test/elf/X86_64/reloc_r_x86_64_pc16.test
rename to lld/test/old-elf/X86_64/reloc_r_x86_64_pc16.test
diff --git a/lld/test/elf/X86_64/reloc_r_x86_64_pc64.test b/lld/test/old-elf/X86_64/reloc_r_x86_64_pc64.test
similarity index 100%
rename from lld/test/elf/X86_64/reloc_r_x86_64_pc64.test
rename to lld/test/old-elf/X86_64/reloc_r_x86_64_pc64.test
diff --git a/lld/test/elf/X86_64/rodata.test b/lld/test/old-elf/X86_64/rodata.test
similarity index 100%
rename from lld/test/elf/X86_64/rodata.test
rename to lld/test/old-elf/X86_64/rodata.test
diff --git a/lld/test/elf/X86_64/sectionchoice.test b/lld/test/old-elf/X86_64/sectionchoice.test
similarity index 100%
rename from lld/test/elf/X86_64/sectionchoice.test
rename to lld/test/old-elf/X86_64/sectionchoice.test
diff --git a/lld/test/elf/X86_64/sectionmap.test b/lld/test/old-elf/X86_64/sectionmap.test
similarity index 100%
rename from lld/test/elf/X86_64/sectionmap.test
rename to lld/test/old-elf/X86_64/sectionmap.test
diff --git a/lld/test/elf/X86_64/startGroupEndGroup.test b/lld/test/old-elf/X86_64/startGroupEndGroup.test
similarity index 100%
rename from lld/test/elf/X86_64/startGroupEndGroup.test
rename to lld/test/old-elf/X86_64/startGroupEndGroup.test
diff --git a/lld/test/elf/X86_64/startGroupEndGroupWithDynlib.test b/lld/test/old-elf/X86_64/startGroupEndGroupWithDynlib.test
similarity index 100%
rename from lld/test/elf/X86_64/startGroupEndGroupWithDynlib.test
rename to lld/test/old-elf/X86_64/startGroupEndGroupWithDynlib.test
diff --git a/lld/test/elf/X86_64/staticlib-search.test b/lld/test/old-elf/X86_64/staticlib-search.test
similarity index 100%
rename from lld/test/elf/X86_64/staticlib-search.test
rename to lld/test/old-elf/X86_64/staticlib-search.test
diff --git a/lld/test/elf/X86_64/undef.test b/lld/test/old-elf/X86_64/undef.test
similarity index 100%
rename from lld/test/elf/X86_64/undef.test
rename to lld/test/old-elf/X86_64/undef.test
diff --git a/lld/test/elf/X86_64/underscore-end.test b/lld/test/old-elf/X86_64/underscore-end.test
similarity index 100%
rename from lld/test/elf/X86_64/underscore-end.test
rename to lld/test/old-elf/X86_64/underscore-end.test
diff --git a/lld/test/elf/X86_64/weak-override.test b/lld/test/old-elf/X86_64/weak-override.test
similarity index 100%
rename from lld/test/elf/X86_64/weak-override.test
rename to lld/test/old-elf/X86_64/weak-override.test
diff --git a/lld/test/elf/X86_64/weak-zero-sized.test b/lld/test/old-elf/X86_64/weak-zero-sized.test
similarity index 100%
rename from lld/test/elf/X86_64/weak-zero-sized.test
rename to lld/test/old-elf/X86_64/weak-zero-sized.test
diff --git a/lld/test/elf/X86_64/weaksym.test b/lld/test/old-elf/X86_64/weaksym.test
similarity index 100%
rename from lld/test/elf/X86_64/weaksym.test
rename to lld/test/old-elf/X86_64/weaksym.test
diff --git a/lld/test/elf/X86_64/yamlinput.test b/lld/test/old-elf/X86_64/yamlinput.test
similarity index 100%
rename from lld/test/elf/X86_64/yamlinput.test
rename to lld/test/old-elf/X86_64/yamlinput.test
diff --git a/lld/test/elf/abs-dup.objtxt b/lld/test/old-elf/abs-dup.objtxt
similarity index 100%
rename from lld/test/elf/abs-dup.objtxt
rename to lld/test/old-elf/abs-dup.objtxt
diff --git a/lld/test/elf/abs.test b/lld/test/old-elf/abs.test
similarity index 100%
rename from lld/test/elf/abs.test
rename to lld/test/old-elf/abs.test
diff --git a/lld/test/elf/allowduplicates.objtxt b/lld/test/old-elf/allowduplicates.objtxt
similarity index 100%
rename from lld/test/elf/allowduplicates.objtxt
rename to lld/test/old-elf/allowduplicates.objtxt
diff --git a/lld/test/elf/archive-elf-forceload.test b/lld/test/old-elf/archive-elf-forceload.test
similarity index 100%
rename from lld/test/elf/archive-elf-forceload.test
rename to lld/test/old-elf/archive-elf-forceload.test
diff --git a/lld/test/elf/archive-elf.test b/lld/test/old-elf/archive-elf.test
similarity index 100%
rename from lld/test/elf/archive-elf.test
rename to lld/test/old-elf/archive-elf.test
diff --git a/lld/test/elf/as-needed.test b/lld/test/old-elf/as-needed.test
similarity index 100%
rename from lld/test/elf/as-needed.test
rename to lld/test/old-elf/as-needed.test
diff --git a/lld/test/elf/branch.test b/lld/test/old-elf/branch.test
similarity index 100%
rename from lld/test/elf/branch.test
rename to lld/test/old-elf/branch.test
diff --git a/lld/test/elf/check.test b/lld/test/old-elf/check.test
similarity index 100%
rename from lld/test/elf/check.test
rename to lld/test/old-elf/check.test
diff --git a/lld/test/elf/checkrodata.test b/lld/test/old-elf/checkrodata.test
similarity index 100%
rename from lld/test/elf/checkrodata.test
rename to lld/test/old-elf/checkrodata.test
diff --git a/lld/test/elf/common.test b/lld/test/old-elf/common.test
similarity index 100%
rename from lld/test/elf/common.test
rename to lld/test/old-elf/common.test
diff --git a/lld/test/elf/consecutive-weak-sym-defs.test b/lld/test/old-elf/consecutive-weak-sym-defs.test
similarity index 100%
rename from lld/test/elf/consecutive-weak-sym-defs.test
rename to lld/test/old-elf/consecutive-weak-sym-defs.test
diff --git a/lld/test/elf/defsym.objtxt b/lld/test/old-elf/defsym.objtxt
similarity index 100%
rename from lld/test/elf/defsym.objtxt
rename to lld/test/old-elf/defsym.objtxt
diff --git a/lld/test/elf/discard-all.test b/lld/test/old-elf/discard-all.test
similarity index 100%
rename from lld/test/elf/discard-all.test
rename to lld/test/old-elf/discard-all.test
diff --git a/lld/test/elf/discard-locals.test b/lld/test/old-elf/discard-locals.test
similarity index 100%
rename from lld/test/elf/discard-locals.test
rename to lld/test/old-elf/discard-locals.test
diff --git a/lld/test/elf/dynamic-segorder.test b/lld/test/old-elf/dynamic-segorder.test
similarity index 100%
rename from lld/test/elf/dynamic-segorder.test
rename to lld/test/old-elf/dynamic-segorder.test
diff --git a/lld/test/elf/dynamic-undef.test b/lld/test/old-elf/dynamic-undef.test
similarity index 100%
rename from lld/test/elf/dynamic-undef.test
rename to lld/test/old-elf/dynamic-undef.test
diff --git a/lld/test/elf/dynamic.test b/lld/test/old-elf/dynamic.test
similarity index 100%
rename from lld/test/elf/dynamic.test
rename to lld/test/old-elf/dynamic.test
diff --git a/lld/test/elf/eh_frame_hdr.test b/lld/test/old-elf/eh_frame_hdr.test
similarity index 100%
rename from lld/test/elf/eh_frame_hdr.test
rename to lld/test/old-elf/eh_frame_hdr.test
diff --git a/lld/test/elf/entry.objtxt b/lld/test/old-elf/entry.objtxt
similarity index 100%
rename from lld/test/elf/entry.objtxt
rename to lld/test/old-elf/entry.objtxt
diff --git a/lld/test/elf/export-dynamic.test b/lld/test/old-elf/export-dynamic.test
similarity index 100%
rename from lld/test/elf/export-dynamic.test
rename to lld/test/old-elf/export-dynamic.test
diff --git a/lld/test/elf/filenotfound.test b/lld/test/old-elf/filenotfound.test
similarity index 100%
rename from lld/test/elf/filenotfound.test
rename to lld/test/old-elf/filenotfound.test
diff --git a/lld/test/elf/gnulinkonce/gnulinkonce-report-discarded-reference.test b/lld/test/old-elf/gnulinkonce/gnulinkonce-report-discarded-reference.test
similarity index 100%
rename from lld/test/elf/gnulinkonce/gnulinkonce-report-discarded-reference.test
rename to lld/test/old-elf/gnulinkonce/gnulinkonce-report-discarded-reference.test
diff --git a/lld/test/elf/gnulinkonce/gnulinkonce-report-undef.test b/lld/test/old-elf/gnulinkonce/gnulinkonce-report-undef.test
similarity index 100%
rename from lld/test/elf/gnulinkonce/gnulinkonce-report-undef.test
rename to lld/test/old-elf/gnulinkonce/gnulinkonce-report-undef.test
diff --git a/lld/test/elf/gnulinkonce/gnulinkonce.test b/lld/test/old-elf/gnulinkonce/gnulinkonce.test
similarity index 100%
rename from lld/test/elf/gnulinkonce/gnulinkonce.test
rename to lld/test/old-elf/gnulinkonce/gnulinkonce.test
diff --git a/lld/test/elf/gotpcrel.test b/lld/test/old-elf/gotpcrel.test
similarity index 100%
rename from lld/test/elf/gotpcrel.test
rename to lld/test/old-elf/gotpcrel.test
diff --git a/lld/test/elf/gottpoff.test b/lld/test/old-elf/gottpoff.test
similarity index 100%
rename from lld/test/elf/gottpoff.test
rename to lld/test/old-elf/gottpoff.test
diff --git a/lld/test/elf/group-cmd-search.test b/lld/test/old-elf/group-cmd-search.test
similarity index 100%
rename from lld/test/elf/group-cmd-search.test
rename to lld/test/old-elf/group-cmd-search.test
diff --git a/lld/test/elf/hexagon-quickdata-sort.test b/lld/test/old-elf/hexagon-quickdata-sort.test
similarity index 100%
rename from lld/test/elf/hexagon-quickdata-sort.test
rename to lld/test/old-elf/hexagon-quickdata-sort.test
diff --git a/lld/test/elf/hexagon-quickdata-sortcommon.test b/lld/test/old-elf/hexagon-quickdata-sortcommon.test
similarity index 100%
rename from lld/test/elf/hexagon-quickdata-sortcommon.test
rename to lld/test/old-elf/hexagon-quickdata-sortcommon.test
diff --git a/lld/test/elf/ifunc.test b/lld/test/old-elf/ifunc.test
similarity index 100%
rename from lld/test/elf/ifunc.test
rename to lld/test/old-elf/ifunc.test
diff --git a/lld/test/elf/ignore-unknownoption.test b/lld/test/old-elf/ignore-unknownoption.test
similarity index 100%
rename from lld/test/elf/ignore-unknownoption.test
rename to lld/test/old-elf/ignore-unknownoption.test
diff --git a/lld/test/elf/init_array-order.test b/lld/test/old-elf/init_array-order.test
similarity index 100%
rename from lld/test/elf/init_array-order.test
rename to lld/test/old-elf/init_array-order.test
diff --git a/lld/test/elf/init_array.test b/lld/test/old-elf/init_array.test
similarity index 100%
rename from lld/test/elf/init_array.test
rename to lld/test/old-elf/init_array.test
diff --git a/lld/test/elf/initfini-options.test-1.test b/lld/test/old-elf/initfini-options.test-1.test
similarity index 100%
rename from lld/test/elf/initfini-options.test-1.test
rename to lld/test/old-elf/initfini-options.test-1.test
diff --git a/lld/test/elf/initfini-options.test-2.test b/lld/test/old-elf/initfini-options.test-2.test
similarity index 100%
rename from lld/test/elf/initfini-options.test-2.test
rename to lld/test/old-elf/initfini-options.test-2.test
diff --git a/lld/test/elf/initfini-options.test-3.test b/lld/test/old-elf/initfini-options.test-3.test
similarity index 100%
rename from lld/test/elf/initfini-options.test-3.test
rename to lld/test/old-elf/initfini-options.test-3.test
diff --git a/lld/test/elf/librarynotfound.test b/lld/test/old-elf/librarynotfound.test
similarity index 100%
rename from lld/test/elf/librarynotfound.test
rename to lld/test/old-elf/librarynotfound.test
diff --git a/lld/test/elf/linker-as-ld.test b/lld/test/old-elf/linker-as-ld.test
similarity index 100%
rename from lld/test/elf/linker-as-ld.test
rename to lld/test/old-elf/linker-as-ld.test
diff --git a/lld/test/elf/linkerscript/Inputs/externs.ls b/lld/test/old-elf/linkerscript/Inputs/externs.ls
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/externs.ls
rename to lld/test/old-elf/linkerscript/Inputs/externs.ls
diff --git a/lld/test/elf/linkerscript/Inputs/invalid.ls b/lld/test/old-elf/linkerscript/Inputs/invalid.ls
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/invalid.ls
rename to lld/test/old-elf/linkerscript/Inputs/invalid.ls
diff --git a/lld/test/elf/linkerscript/Inputs/prog1.o.yaml b/lld/test/old-elf/linkerscript/Inputs/prog1.o.yaml
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/prog1.o.yaml
rename to lld/test/old-elf/linkerscript/Inputs/prog1.o.yaml
diff --git a/lld/test/elf/linkerscript/Inputs/prog2.o.yaml b/lld/test/old-elf/linkerscript/Inputs/prog2.o.yaml
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/prog2.o.yaml
rename to lld/test/old-elf/linkerscript/Inputs/prog2.o.yaml
diff --git a/lld/test/elf/linkerscript/Inputs/prog3.o.yaml b/lld/test/old-elf/linkerscript/Inputs/prog3.o.yaml
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/prog3.o.yaml
rename to lld/test/old-elf/linkerscript/Inputs/prog3.o.yaml
diff --git a/lld/test/elf/linkerscript/Inputs/simple-pic.o.yaml b/lld/test/old-elf/linkerscript/Inputs/simple-pic.o.yaml
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/simple-pic.o.yaml
rename to lld/test/old-elf/linkerscript/Inputs/simple-pic.o.yaml
diff --git a/lld/test/elf/linkerscript/Inputs/simple.o.yaml b/lld/test/old-elf/linkerscript/Inputs/simple.o.yaml
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/simple.o.yaml
rename to lld/test/old-elf/linkerscript/Inputs/simple.o.yaml
diff --git a/lld/test/elf/linkerscript/Inputs/valid.ls b/lld/test/old-elf/linkerscript/Inputs/valid.ls
similarity index 100%
rename from lld/test/elf/linkerscript/Inputs/valid.ls
rename to lld/test/old-elf/linkerscript/Inputs/valid.ls
diff --git a/lld/test/elf/linkerscript/externs.objtxt b/lld/test/old-elf/linkerscript/externs.objtxt
similarity index 100%
rename from lld/test/elf/linkerscript/externs.objtxt
rename to lld/test/old-elf/linkerscript/externs.objtxt
diff --git a/lld/test/elf/linkerscript/filename-with-wildcards.test b/lld/test/old-elf/linkerscript/filename-with-wildcards.test
similarity index 100%
rename from lld/test/elf/linkerscript/filename-with-wildcards.test
rename to lld/test/old-elf/linkerscript/filename-with-wildcards.test
diff --git a/lld/test/elf/linkerscript/invalid-script-cli-1.test b/lld/test/old-elf/linkerscript/invalid-script-cli-1.test
similarity index 100%
rename from lld/test/elf/linkerscript/invalid-script-cli-1.test
rename to lld/test/old-elf/linkerscript/invalid-script-cli-1.test
diff --git a/lld/test/elf/linkerscript/invalid-script-cli-2.test b/lld/test/old-elf/linkerscript/invalid-script-cli-2.test
similarity index 100%
rename from lld/test/elf/linkerscript/invalid-script-cli-2.test
rename to lld/test/old-elf/linkerscript/invalid-script-cli-2.test
diff --git a/lld/test/elf/linkerscript/invalid.test b/lld/test/old-elf/linkerscript/invalid.test
similarity index 100%
rename from lld/test/elf/linkerscript/invalid.test
rename to lld/test/old-elf/linkerscript/invalid.test
diff --git a/lld/test/elf/linkerscript/phdrs-all-none.test b/lld/test/old-elf/linkerscript/phdrs-all-none.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-all-none.test
rename to lld/test/old-elf/linkerscript/phdrs-all-none.test
diff --git a/lld/test/elf/linkerscript/phdrs-custom-none.test b/lld/test/old-elf/linkerscript/phdrs-custom-none.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-custom-none.test
rename to lld/test/old-elf/linkerscript/phdrs-custom-none.test
diff --git a/lld/test/elf/linkerscript/phdrs-default.test b/lld/test/old-elf/linkerscript/phdrs-default.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-default.test
rename to lld/test/old-elf/linkerscript/phdrs-default.test
diff --git a/lld/test/elf/linkerscript/phdrs-different.test b/lld/test/old-elf/linkerscript/phdrs-different.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-different.test
rename to lld/test/old-elf/linkerscript/phdrs-different.test
diff --git a/lld/test/elf/linkerscript/phdrs-extra-program.test b/lld/test/old-elf/linkerscript/phdrs-extra-program.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-extra-program.test
rename to lld/test/old-elf/linkerscript/phdrs-extra-program.test
diff --git a/lld/test/elf/linkerscript/phdrs-flags.test b/lld/test/old-elf/linkerscript/phdrs-flags.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-flags.test
rename to lld/test/old-elf/linkerscript/phdrs-flags.test
diff --git a/lld/test/elf/linkerscript/phdrs-has-program.test b/lld/test/old-elf/linkerscript/phdrs-has-program.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-has-program.test
rename to lld/test/old-elf/linkerscript/phdrs-has-program.test
diff --git a/lld/test/elf/linkerscript/phdrs-invalid.test b/lld/test/old-elf/linkerscript/phdrs-invalid.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-invalid.test
rename to lld/test/old-elf/linkerscript/phdrs-invalid.test
diff --git a/lld/test/elf/linkerscript/phdrs-misplaced-program.test b/lld/test/old-elf/linkerscript/phdrs-misplaced-program.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-misplaced-program.test
rename to lld/test/old-elf/linkerscript/phdrs-misplaced-program.test
diff --git a/lld/test/elf/linkerscript/phdrs-no-program.test b/lld/test/old-elf/linkerscript/phdrs-no-program.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-no-program.test
rename to lld/test/old-elf/linkerscript/phdrs-no-program.test
diff --git a/lld/test/elf/linkerscript/phdrs-one-none.test b/lld/test/old-elf/linkerscript/phdrs-one-none.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-one-none.test
rename to lld/test/old-elf/linkerscript/phdrs-one-none.test
diff --git a/lld/test/elf/linkerscript/phdrs-program-flags.test b/lld/test/old-elf/linkerscript/phdrs-program-flags.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-program-flags.test
rename to lld/test/old-elf/linkerscript/phdrs-program-flags.test
diff --git a/lld/test/elf/linkerscript/phdrs-program-good-phdrs.test b/lld/test/old-elf/linkerscript/phdrs-program-good-phdrs.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-program-good-phdrs.test
rename to lld/test/old-elf/linkerscript/phdrs-program-good-phdrs.test
diff --git a/lld/test/elf/linkerscript/phdrs-program-no-phdrs.test b/lld/test/old-elf/linkerscript/phdrs-program-no-phdrs.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-program-no-phdrs.test
rename to lld/test/old-elf/linkerscript/phdrs-program-no-phdrs.test
diff --git a/lld/test/elf/linkerscript/phdrs-program-wrong-phdrs.test b/lld/test/old-elf/linkerscript/phdrs-program-wrong-phdrs.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-program-wrong-phdrs.test
rename to lld/test/old-elf/linkerscript/phdrs-program-wrong-phdrs.test
diff --git a/lld/test/elf/linkerscript/phdrs-same-flags.test b/lld/test/old-elf/linkerscript/phdrs-same-flags.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-same-flags.test
rename to lld/test/old-elf/linkerscript/phdrs-same-flags.test
diff --git a/lld/test/elf/linkerscript/phdrs-same.test b/lld/test/old-elf/linkerscript/phdrs-same.test
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs-same.test
rename to lld/test/old-elf/linkerscript/phdrs-same.test
diff --git a/lld/test/elf/linkerscript/phdrs/sections-empty-phdrs.script b/lld/test/old-elf/linkerscript/phdrs/sections-empty-phdrs.script
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs/sections-empty-phdrs.script
rename to lld/test/old-elf/linkerscript/phdrs/sections-empty-phdrs.script
diff --git a/lld/test/elf/linkerscript/phdrs/sections-no-phdrs.script b/lld/test/old-elf/linkerscript/phdrs/sections-no-phdrs.script
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs/sections-no-phdrs.script
rename to lld/test/old-elf/linkerscript/phdrs/sections-no-phdrs.script
diff --git a/lld/test/elf/linkerscript/phdrs/sections-none-phdrs.script b/lld/test/old-elf/linkerscript/phdrs/sections-none-phdrs.script
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs/sections-none-phdrs.script
rename to lld/test/old-elf/linkerscript/phdrs/sections-none-phdrs.script
diff --git a/lld/test/elf/linkerscript/phdrs/undef-empty-phdrs.script b/lld/test/old-elf/linkerscript/phdrs/undef-empty-phdrs.script
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs/undef-empty-phdrs.script
rename to lld/test/old-elf/linkerscript/phdrs/undef-empty-phdrs.script
diff --git a/lld/test/elf/linkerscript/phdrs/undef-id-phdrs.script b/lld/test/old-elf/linkerscript/phdrs/undef-id-phdrs.script
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs/undef-id-phdrs.script
rename to lld/test/old-elf/linkerscript/phdrs/undef-id-phdrs.script
diff --git a/lld/test/elf/linkerscript/phdrs/undef-no-phdrs.script b/lld/test/old-elf/linkerscript/phdrs/undef-no-phdrs.script
similarity index 100%
rename from lld/test/elf/linkerscript/phdrs/undef-no-phdrs.script
rename to lld/test/old-elf/linkerscript/phdrs/undef-no-phdrs.script
diff --git a/lld/test/elf/linkerscript/sections-order.test b/lld/test/old-elf/linkerscript/sections-order.test
similarity index 100%
rename from lld/test/elf/linkerscript/sections-order.test
rename to lld/test/old-elf/linkerscript/sections-order.test
diff --git a/lld/test/elf/linkerscript/sections-with-wildcards.test b/lld/test/old-elf/linkerscript/sections-with-wildcards.test
similarity index 100%
rename from lld/test/elf/linkerscript/sections-with-wildcards.test
rename to lld/test/old-elf/linkerscript/sections-with-wildcards.test
diff --git a/lld/test/elf/linkerscript/symbol-definition-so.test b/lld/test/old-elf/linkerscript/symbol-definition-so.test
similarity index 100%
rename from lld/test/elf/linkerscript/symbol-definition-so.test
rename to lld/test/old-elf/linkerscript/symbol-definition-so.test
diff --git a/lld/test/elf/linkerscript/symbol-definition.test b/lld/test/old-elf/linkerscript/symbol-definition.test
similarity index 100%
rename from lld/test/elf/linkerscript/symbol-definition.test
rename to lld/test/old-elf/linkerscript/symbol-definition.test
diff --git a/lld/test/elf/linkerscript/valid-script-cli.objtxt b/lld/test/old-elf/linkerscript/valid-script-cli.objtxt
similarity index 100%
rename from lld/test/elf/linkerscript/valid-script-cli.objtxt
rename to lld/test/old-elf/linkerscript/valid-script-cli.objtxt
diff --git a/lld/test/elf/loginputfiles.test b/lld/test/old-elf/loginputfiles.test
similarity index 100%
rename from lld/test/elf/loginputfiles.test
rename to lld/test/old-elf/loginputfiles.test
diff --git a/lld/test/elf/mergeatoms.test b/lld/test/old-elf/mergeatoms.test
similarity index 100%
rename from lld/test/elf/mergeatoms.test
rename to lld/test/old-elf/mergeatoms.test
diff --git a/lld/test/elf/mergeconstants.test b/lld/test/old-elf/mergeconstants.test
similarity index 100%
rename from lld/test/elf/mergeconstants.test
rename to lld/test/old-elf/mergeconstants.test
diff --git a/lld/test/elf/mergeglobalatoms.test b/lld/test/old-elf/mergeglobalatoms.test
similarity index 100%
rename from lld/test/elf/mergeglobalatoms.test
rename to lld/test/old-elf/mergeglobalatoms.test
diff --git a/lld/test/elf/no-unique-section-names.test b/lld/test/old-elf/no-unique-section-names.test
similarity index 100%
rename from lld/test/elf/no-unique-section-names.test
rename to lld/test/old-elf/no-unique-section-names.test
diff --git a/lld/test/elf/note.test b/lld/test/old-elf/note.test
similarity index 100%
rename from lld/test/elf/note.test
rename to lld/test/old-elf/note.test
diff --git a/lld/test/elf/options/dynamic-linker.test b/lld/test/old-elf/options/dynamic-linker.test
similarity index 100%
rename from lld/test/elf/options/dynamic-linker.test
rename to lld/test/old-elf/options/dynamic-linker.test
diff --git a/lld/test/elf/options/target-specific-args.test b/lld/test/old-elf/options/target-specific-args.test
similarity index 100%
rename from lld/test/elf/options/target-specific-args.test
rename to lld/test/old-elf/options/target-specific-args.test
diff --git a/lld/test/elf/phdr.test b/lld/test/old-elf/phdr.test
similarity index 100%
rename from lld/test/elf/phdr.test
rename to lld/test/old-elf/phdr.test
diff --git a/lld/test/elf/quickdata.test b/lld/test/old-elf/quickdata.test
similarity index 100%
rename from lld/test/elf/quickdata.test
rename to lld/test/old-elf/quickdata.test
diff --git a/lld/test/elf/reloc.test b/lld/test/old-elf/reloc.test
similarity index 100%
rename from lld/test/elf/reloc.test
rename to lld/test/old-elf/reloc.test
diff --git a/lld/test/elf/responsefile.test b/lld/test/old-elf/responsefile.test
similarity index 100%
rename from lld/test/elf/responsefile.test
rename to lld/test/old-elf/responsefile.test
diff --git a/lld/test/elf/rodata.test b/lld/test/old-elf/rodata.test
similarity index 100%
rename from lld/test/elf/rodata.test
rename to lld/test/old-elf/rodata.test
diff --git a/lld/test/elf/rosegment.test b/lld/test/old-elf/rosegment.test
similarity index 100%
rename from lld/test/elf/rosegment.test
rename to lld/test/old-elf/rosegment.test
diff --git a/lld/test/elf/sectionGroups/sectiongroup-new-members.test b/lld/test/old-elf/sectionGroups/sectiongroup-new-members.test
similarity index 100%
rename from lld/test/elf/sectionGroups/sectiongroup-new-members.test
rename to lld/test/old-elf/sectionGroups/sectiongroup-new-members.test
diff --git a/lld/test/elf/sectionGroups/sectiongroup-simple.test b/lld/test/old-elf/sectionGroups/sectiongroup-simple.test
similarity index 100%
rename from lld/test/elf/sectionGroups/sectiongroup-simple.test
rename to lld/test/old-elf/sectionGroups/sectiongroup-simple.test
diff --git a/lld/test/elf/sectionGroups/sectiongroup-undef-member-other.test b/lld/test/old-elf/sectionGroups/sectiongroup-undef-member-other.test
similarity index 100%
rename from lld/test/elf/sectionGroups/sectiongroup-undef-member-other.test
rename to lld/test/old-elf/sectionGroups/sectiongroup-undef-member-other.test
diff --git a/lld/test/elf/sectionGroups/sectiongroup-undef-member.test b/lld/test/old-elf/sectionGroups/sectiongroup-undef-member.test
similarity index 100%
rename from lld/test/elf/sectionGroups/sectiongroup-undef-member.test
rename to lld/test/old-elf/sectionGroups/sectiongroup-undef-member.test
diff --git a/lld/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test b/lld/test/old-elf/sectionGroups/sectiongroup-with-globalsymbols.test
similarity index 100%
rename from lld/test/elf/sectionGroups/sectiongroup-with-globalsymbols.test
rename to lld/test/old-elf/sectionGroups/sectiongroup-with-globalsymbols.test
diff --git a/lld/test/elf/sectionGroups/sectiongroup-with-undef-external-reference.test b/lld/test/old-elf/sectionGroups/sectiongroup-with-undef-external-reference.test
similarity index 100%
rename from lld/test/elf/sectionGroups/sectiongroup-with-undef-external-reference.test
rename to lld/test/old-elf/sectionGroups/sectiongroup-with-undef-external-reference.test
diff --git a/lld/test/elf/sectionGroups/sectiongroup-with-undef-signature.test b/lld/test/old-elf/sectionGroups/sectiongroup-with-undef-signature.test
similarity index 100%
rename from lld/test/elf/sectionGroups/sectiongroup-with-undef-signature.test
rename to lld/test/old-elf/sectionGroups/sectiongroup-with-undef-signature.test
diff --git a/lld/test/elf/sections.test b/lld/test/old-elf/sections.test
similarity index 100%
rename from lld/test/elf/sections.test
rename to lld/test/old-elf/sections.test
diff --git a/lld/test/elf/sh_addralign.test b/lld/test/old-elf/sh_addralign.test
similarity index 100%
rename from lld/test/elf/sh_addralign.test
rename to lld/test/old-elf/sh_addralign.test
diff --git a/lld/test/elf/shndx.test b/lld/test/old-elf/shndx.test
similarity index 100%
rename from lld/test/elf/shndx.test
rename to lld/test/old-elf/shndx.test
diff --git a/lld/test/elf/soname.test b/lld/test/old-elf/soname.test
similarity index 100%
rename from lld/test/elf/soname.test
rename to lld/test/old-elf/soname.test
diff --git a/lld/test/elf/start-stop-sym.test b/lld/test/old-elf/start-stop-sym.test
similarity index 100%
rename from lld/test/elf/start-stop-sym.test
rename to lld/test/old-elf/start-stop-sym.test
diff --git a/lld/test/elf/strip-all.test b/lld/test/old-elf/strip-all.test
similarity index 100%
rename from lld/test/elf/strip-all.test
rename to lld/test/old-elf/strip-all.test
diff --git a/lld/test/elf/stripped-empty.test b/lld/test/old-elf/stripped-empty.test
similarity index 100%
rename from lld/test/elf/stripped-empty.test
rename to lld/test/old-elf/stripped-empty.test
diff --git a/lld/test/elf/symbols.test b/lld/test/old-elf/symbols.test
similarity index 100%
rename from lld/test/elf/symbols.test
rename to lld/test/old-elf/symbols.test
diff --git a/lld/test/elf/tls-tbss-size.test b/lld/test/old-elf/tls-tbss-size.test
similarity index 100%
rename from lld/test/elf/tls-tbss-size.test
rename to lld/test/old-elf/tls-tbss-size.test
diff --git a/lld/test/elf/tls.test b/lld/test/old-elf/tls.test
similarity index 100%
rename from lld/test/elf/tls.test
rename to lld/test/old-elf/tls.test
diff --git a/lld/test/elf/tlsAddr.test b/lld/test/old-elf/tlsAddr.test
similarity index 100%
rename from lld/test/elf/tlsAddr.test
rename to lld/test/old-elf/tlsAddr.test
diff --git a/lld/test/elf/undef-from-dso-to-main.test b/lld/test/old-elf/undef-from-dso-to-main.test
similarity index 100%
rename from lld/test/elf/undef-from-dso-to-main.test
rename to lld/test/old-elf/undef-from-dso-to-main.test
diff --git a/lld/test/elf/undef-from-main-dso.test b/lld/test/old-elf/undef-from-main-dso.test
similarity index 100%
rename from lld/test/elf/undef-from-main-dso.test
rename to lld/test/old-elf/undef-from-main-dso.test
diff --git a/lld/test/elf/weaksym.test b/lld/test/old-elf/weaksym.test
similarity index 100%
rename from lld/test/elf/weaksym.test
rename to lld/test/old-elf/weaksym.test
diff --git a/lld/test/elf/wrap.test b/lld/test/old-elf/wrap.test
similarity index 100%
rename from lld/test/elf/wrap.test
rename to lld/test/old-elf/wrap.test
diff --git a/lld/test/elf/x86-64-dynamic-relocs.test b/lld/test/old-elf/x86-64-dynamic-relocs.test
similarity index 100%
rename from lld/test/elf/x86-64-dynamic-relocs.test
rename to lld/test/old-elf/x86-64-dynamic-relocs.test
diff --git a/lld/test/elf/x86-64-dynamic.test b/lld/test/old-elf/x86-64-dynamic.test
similarity index 100%
rename from lld/test/elf/x86-64-dynamic.test
rename to lld/test/old-elf/x86-64-dynamic.test
diff --git a/lld/test/elf/x86.test b/lld/test/old-elf/x86.test
similarity index 100%
rename from lld/test/elf/x86.test
rename to lld/test/old-elf/x86.test
diff --git a/lld/test/elf/x86_64-kinds.test b/lld/test/old-elf/x86_64-kinds.test
similarity index 100%
rename from lld/test/elf/x86_64-kinds.test
rename to lld/test/old-elf/x86_64-kinds.test
diff --git a/lld/test/elf/zoption_dtflags.test b/lld/test/old-elf/zoption_dtflags.test
similarity index 100%
rename from lld/test/elf/zoption_dtflags.test
rename to lld/test/old-elf/zoption_dtflags.test