diff --git a/llvm/test/tools/llvm-objdump/Inputs/eh_frame-coff.yaml b/llvm/test/tools/llvm-objdump/COFF/Inputs/eh_frame-coff.yaml rename from llvm/test/tools/llvm-objdump/Inputs/eh_frame-coff.yaml rename to llvm/test/tools/llvm-objdump/COFF/Inputs/eh_frame-coff.yaml diff --git a/llvm/test/tools/llvm-objdump/Inputs/export.dll.coff-i386 b/llvm/test/tools/llvm-objdump/COFF/Inputs/export.dll.coff-i386 rename from llvm/test/tools/llvm-objdump/Inputs/export.dll.coff-i386 rename to llvm/test/tools/llvm-objdump/COFF/Inputs/export.dll.coff-i386 diff --git a/llvm/test/tools/llvm-objdump/Inputs/file-aux-record.yaml b/llvm/test/tools/llvm-objdump/COFF/Inputs/file-aux-record.yaml rename from llvm/test/tools/llvm-objdump/Inputs/file-aux-record.yaml rename to llvm/test/tools/llvm-objdump/COFF/Inputs/file-aux-record.yaml diff --git a/llvm/test/tools/llvm-objdump/Inputs/file.obj.coff-arm b/llvm/test/tools/llvm-objdump/COFF/Inputs/file.obj.coff-arm rename from llvm/test/tools/llvm-objdump/Inputs/file.obj.coff-arm rename to llvm/test/tools/llvm-objdump/COFF/Inputs/file.obj.coff-arm diff --git a/llvm/test/tools/llvm-objdump/Inputs/large-bss.obj.coff-i386 b/llvm/test/tools/llvm-objdump/COFF/Inputs/large-bss.obj.coff-i386 rename from llvm/test/tools/llvm-objdump/Inputs/large-bss.obj.coff-i386 rename to llvm/test/tools/llvm-objdump/COFF/Inputs/large-bss.obj.coff-i386 diff --git a/llvm/test/tools/llvm-objdump/Inputs/library.lib b/llvm/test/tools/llvm-objdump/COFF/Inputs/library.lib rename from llvm/test/tools/llvm-objdump/Inputs/library.lib rename to llvm/test/tools/llvm-objdump/COFF/Inputs/library.lib diff --git a/llvm/test/tools/llvm-objdump/Inputs/many-relocs.obj-i386 b/llvm/test/tools/llvm-objdump/COFF/Inputs/many-relocs.obj-i386 rename from llvm/test/tools/llvm-objdump/Inputs/many-relocs.obj-i386 rename to llvm/test/tools/llvm-objdump/COFF/Inputs/many-relocs.obj-i386 diff --git a/llvm/test/tools/llvm-objdump/Inputs/nop.exe.coff-i386 b/llvm/test/tools/llvm-objdump/COFF/Inputs/nop.exe.coff-i386 rename from llvm/test/tools/llvm-objdump/Inputs/nop.exe.coff-i386 rename to llvm/test/tools/llvm-objdump/COFF/Inputs/nop.exe.coff-i386 diff --git a/llvm/test/tools/llvm-objdump/Inputs/tls.exe.coff-x86_64 b/llvm/test/tools/llvm-objdump/COFF/Inputs/tls.exe.coff-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/tls.exe.coff-x86_64 rename to llvm/test/tools/llvm-objdump/COFF/Inputs/tls.exe.coff-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/win64-unwind.exe.coff-x86_64.asm b/llvm/test/tools/llvm-objdump/COFF/Inputs/win64-unwind.exe.coff-x86_64.asm rename from llvm/test/tools/llvm-objdump/Inputs/win64-unwind.exe.coff-x86_64.asm rename to llvm/test/tools/llvm-objdump/COFF/Inputs/win64-unwind.exe.coff-x86_64.asm diff --git a/llvm/test/tools/llvm-objdump/Inputs/win64-unwind.exe.coff-x86_64.exe b/llvm/test/tools/llvm-objdump/COFF/Inputs/win64-unwind.exe.coff-x86_64.exe rename from llvm/test/tools/llvm-objdump/Inputs/win64-unwind.exe.coff-x86_64.exe rename to llvm/test/tools/llvm-objdump/COFF/Inputs/win64-unwind.exe.coff-x86_64.exe diff --git a/llvm/test/tools/llvm-objdump/Inputs/win64-unwind.exe.coff-x86_64.obj b/llvm/test/tools/llvm-objdump/COFF/Inputs/win64-unwind.exe.coff-x86_64.obj rename from llvm/test/tools/llvm-objdump/Inputs/win64-unwind.exe.coff-x86_64.obj rename to llvm/test/tools/llvm-objdump/COFF/Inputs/win64-unwind.exe.coff-x86_64.obj diff --git a/llvm/test/tools/llvm-objdump/eh_frame-coff.test b/llvm/test/tools/llvm-objdump/COFF/eh_frame.test rename from llvm/test/tools/llvm-objdump/eh_frame-coff.test rename to llvm/test/tools/llvm-objdump/COFF/eh_frame.test diff --git a/llvm/test/tools/llvm-objdump/file-headers-coff.test b/llvm/test/tools/llvm-objdump/COFF/file-headers.test rename from llvm/test/tools/llvm-objdump/file-headers-coff.test rename to llvm/test/tools/llvm-objdump/COFF/file-headers.test diff --git a/llvm/test/tools/llvm-objdump/coff-file.test b/llvm/test/tools/llvm-objdump/COFF/file.test rename from llvm/test/tools/llvm-objdump/coff-file.test rename to llvm/test/tools/llvm-objdump/COFF/file.test diff --git a/llvm/test/tools/llvm-objdump/hex-relocation-addr.test b/llvm/test/tools/llvm-objdump/COFF/hex-relocation-addr.test rename from llvm/test/tools/llvm-objdump/hex-relocation-addr.test rename to llvm/test/tools/llvm-objdump/COFF/hex-relocation-addr.test diff --git a/llvm/test/tools/llvm-objdump/coff-import-library.test b/llvm/test/tools/llvm-objdump/COFF/import-library.test rename from llvm/test/tools/llvm-objdump/coff-import-library.test rename to llvm/test/tools/llvm-objdump/COFF/import-library.test diff --git a/llvm/test/tools/llvm-objdump/coff-large-bss.test b/llvm/test/tools/llvm-objdump/COFF/large-bss.test rename from llvm/test/tools/llvm-objdump/coff-large-bss.test rename to llvm/test/tools/llvm-objdump/COFF/large-bss.test diff --git a/llvm/test/tools/llvm-objdump/coff-many-relocs.test b/llvm/test/tools/llvm-objdump/COFF/many-relocs.test rename from llvm/test/tools/llvm-objdump/coff-many-relocs.test rename to llvm/test/tools/llvm-objdump/COFF/many-relocs.test diff --git a/llvm/test/tools/llvm-objdump/coff-non-null-terminated-file.test b/llvm/test/tools/llvm-objdump/COFF/non-null-terminated-file.test rename from llvm/test/tools/llvm-objdump/coff-non-null-terminated-file.test rename to llvm/test/tools/llvm-objdump/COFF/non-null-terminated-file.test diff --git a/llvm/test/tools/llvm-objdump/coff-private-headers.test b/llvm/test/tools/llvm-objdump/COFF/private-headers.test rename from llvm/test/tools/llvm-objdump/coff-private-headers.test rename to llvm/test/tools/llvm-objdump/COFF/private-headers.test diff --git a/llvm/test/tools/llvm-objdump/win64-unwind-data.test b/llvm/test/tools/llvm-objdump/COFF/win64-unwind-data.test rename from llvm/test/tools/llvm-objdump/win64-unwind-data.test rename to llvm/test/tools/llvm-objdump/COFF/win64-unwind-data.test diff --git a/llvm/test/tools/llvm-objdump/Inputs/call-absolute-symbol.elf-x86_64 b/llvm/test/tools/llvm-objdump/ELF/Inputs/call-absolute-symbol.elf-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/call-absolute-symbol.elf-x86_64 rename to llvm/test/tools/llvm-objdump/ELF/Inputs/call-absolute-symbol.elf-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/proc-specific-section-elf b/llvm/test/tools/llvm-objdump/ELF/Inputs/proc-specific-section-elf rename from llvm/test/tools/llvm-objdump/Inputs/proc-specific-section-elf rename to llvm/test/tools/llvm-objdump/ELF/Inputs/proc-specific-section-elf diff --git a/llvm/test/tools/llvm-objdump/call-absolute-symbol-elf.test b/llvm/test/tools/llvm-objdump/ELF/call-absolute-symbol.test rename from llvm/test/tools/llvm-objdump/call-absolute-symbol-elf.test rename to llvm/test/tools/llvm-objdump/ELF/call-absolute-symbol.test diff --git a/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test b/llvm/test/tools/llvm-objdump/ELF/dynamic-section-machine-specific.test rename from llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test rename to llvm/test/tools/llvm-objdump/ELF/dynamic-section-machine-specific.test diff --git a/llvm/test/tools/llvm-objdump/elf-dynamic-section.test b/llvm/test/tools/llvm-objdump/ELF/dynamic-section.test rename from llvm/test/tools/llvm-objdump/elf-dynamic-section.test rename to llvm/test/tools/llvm-objdump/ELF/dynamic-section.test diff --git a/llvm/test/tools/llvm-objdump/file-headers-elf.test b/llvm/test/tools/llvm-objdump/ELF/file-headers.test rename from llvm/test/tools/llvm-objdump/file-headers-elf.test rename to llvm/test/tools/llvm-objdump/ELF/file-headers.test diff --git a/llvm/test/tools/llvm-objdump/proc-specific-section-elf.test b/llvm/test/tools/llvm-objdump/ELF/proc-specific-section.test rename from llvm/test/tools/llvm-objdump/proc-specific-section-elf.test rename to llvm/test/tools/llvm-objdump/ELF/proc-specific-section.test diff --git a/llvm/test/tools/llvm-objdump/elf-pt-gnu-property.test b/llvm/test/tools/llvm-objdump/ELF/pt-gnu-property.test rename from llvm/test/tools/llvm-objdump/elf-pt-gnu-property.test rename to llvm/test/tools/llvm-objdump/ELF/pt-gnu-property.test diff --git a/llvm/test/tools/llvm-objdump/relocations-elf.test b/llvm/test/tools/llvm-objdump/ELF/relocations.test rename from llvm/test/tools/llvm-objdump/relocations-elf.test rename to llvm/test/tools/llvm-objdump/ELF/relocations.test diff --git a/llvm/test/tools/llvm-objdump/elf-symbol-visibility.test b/llvm/test/tools/llvm-objdump/ELF/symbol-visibility.test rename from llvm/test/tools/llvm-objdump/elf-symbol-visibility.test rename to llvm/test/tools/llvm-objdump/ELF/symbol-visibility.test diff --git a/llvm/test/tools/llvm-objdump/verdef-elf.test b/llvm/test/tools/llvm-objdump/ELF/verdef.test rename from llvm/test/tools/llvm-objdump/verdef-elf.test rename to llvm/test/tools/llvm-objdump/ELF/verdef.test diff --git a/llvm/test/tools/llvm-objdump/verneed-elf.test b/llvm/test/tools/llvm-objdump/ELF/verneed.test rename from llvm/test/tools/llvm-objdump/verneed-elf.test rename to llvm/test/tools/llvm-objdump/ELF/verneed.test diff --git a/llvm/test/tools/llvm-objdump/Inputs/LLVM-bundle.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/LLVM-bundle.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/LLVM-bundle.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/LLVM-bundle.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/bad-ordinal.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/bad-ordinal.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/bad-ordinal.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/bad-ordinal.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/bind.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/bind.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/bind.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/bind.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/bind2.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/bind2.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/bind2.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/bind2.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/compact-unwind.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/compact-unwind.macho-i386 rename from llvm/test/tools/llvm-objdump/Inputs/compact-unwind.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/compact-unwind.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/Inputs/compact-unwind.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/compact-unwind.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/compact-unwind.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/compact-unwind.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/eh_frame.macho-arm64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/eh_frame.macho-arm64 rename from llvm/test/tools/llvm-objdump/Inputs/eh_frame.macho-arm64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/eh_frame.macho-arm64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/empty.macho-armv7 b/llvm/test/tools/llvm-objdump/MachO/Inputs/empty.macho-armv7 rename from llvm/test/tools/llvm-objdump/Inputs/empty.macho-armv7 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/empty.macho-armv7 diff --git a/llvm/test/tools/llvm-objdump/Inputs/exports-trie.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/exports-trie.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/exports-trie.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/exports-trie.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/lazy-bind.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/lazy-bind.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/lazy-bind.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/lazy-bind.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-add-addr-imm-scaled b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-add-addr-imm-scaled rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-add-addr-imm-scaled rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-add-addr-imm-scaled diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-add_addr_uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-add_addr_uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-add_addr_uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-add_addr_uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-bad-opcode-value b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-bad-opcode-value rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-bad-opcode-value rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-bad-opcode-value diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-bind-add-addr-uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-bind-add-addr-uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-bind-add-addr-uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-bind-add-addr-uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-do-bind-no-segIndex b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-do-bind-no-segIndex rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-do-bind-no-segIndex rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-do-bind-no-segIndex diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-ordinal-uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-ordinal-uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-ordinal-uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-ordinal-uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-ordinal-uleb-malformed-uleb128 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-ordinal-uleb-malformed-uleb128 rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-ordinal-uleb-malformed-uleb128 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-ordinal-uleb-malformed-uleb128 diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-ordinal-uleb-too-big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-ordinal-uleb-too-big rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-ordinal-uleb-too-big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-ordinal-uleb-too-big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-special-imm b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-special-imm rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-dylib-special-imm rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-dylib-special-imm diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-seg-too-big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-seg-too-big rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-seg-too-big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-seg-too-big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-segoff-too-big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-segoff-too-big rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-segoff-too-big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-segoff-too-big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-set-addend-sleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-set-addend-sleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-set-addend-sleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-set-addend-sleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-set-symbol b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-set-symbol rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-set-symbol rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-set-symbol diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-set-type-imm b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-set-type-imm rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-set-type-imm rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-set-type-imm diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-bind-uleb-times-skipping-uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-uleb-times-skipping-uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-bind-uleb-times-skipping-uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-bind-uleb-times-skipping-uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-do-bind-no-dylib-ordinal b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-do-bind-no-dylib-ordinal rename from llvm/test/tools/llvm-objdump/Inputs/macho-do-bind-no-dylib-ordinal rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-do-bind-no-dylib-ordinal diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-do-bind-no-symbol b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-do-bind-no-symbol rename from llvm/test/tools/llvm-objdump/Inputs/macho-do-bind-no-symbol rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-do-bind-no-symbol diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-inconsistant-export b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-inconsistant-export rename from llvm/test/tools/llvm-objdump/Inputs/macho-inconsistant-export rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-inconsistant-export diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-lazy-do-bind-add-addr-imm-scaled b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-lazy-do-bind-add-addr-imm-scaled rename from llvm/test/tools/llvm-objdump/Inputs/macho-lazy-do-bind-add-addr-imm-scaled rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-lazy-do-bind-add-addr-imm-scaled diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-lazy-do-bind-uleb-times-skipping-uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-lazy-do-bind-uleb-times-skipping-uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-lazy-do-bind-uleb-times-skipping-uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-lazy-do-bind-uleb-times-skipping-uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-lazy-do_bind_add_addr_uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-lazy-do_bind_add_addr_uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-lazy-do_bind_add_addr_uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-lazy-do_bind_add_addr_uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-add-addr-imm-scaled b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-add-addr-imm-scaled rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-add-addr-imm-scaled rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-add-addr-imm-scaled diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-add-addr-uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-add-addr-uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-add-addr-uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-add-addr-uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-add-addr-uleb-too-big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-add-addr-uleb-too-big rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-add-addr-uleb-too-big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-add-addr-uleb-too-big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-bad-opcode-value b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-bad-opcode-value rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-bad-opcode-value rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-bad-opcode-value diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-imm-times b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-imm-times rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-imm-times rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-imm-times diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-seg-too-big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-seg-too-big rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-seg-too-big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-seg-too-big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-segoff-too-big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-segoff-too-big rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-segoff-too-big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-segoff-too-big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-set-type-imm b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-set-type-imm rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-set-type-imm rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-set-type-imm diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-malformed-uleb128 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-malformed-uleb128 rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-malformed-uleb128 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-malformed-uleb128 diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-times rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-times diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times-skipping-uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-times-skipping-uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-rebase-uleb-times-skipping-uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-rebase-uleb-times-skipping-uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-stabs-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-stabs-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/macho-stabs-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-stabs-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-export-info-malformed-uleb128 rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-export-info-malformed-uleb128 diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-export-info-malformed-uleb128_too_big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-kind b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-kind rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-kind rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-kind diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-library-ordinal b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-library-ordinal rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-bad-library-ordinal rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-bad-library-ordinal diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-children-count-byte b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-children-count-byte rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-children-count-byte rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-children-count-byte diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-edge-string-end b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-edge-string-end rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-edge-string-end rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-edge-string-end diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-export-info-size-too-big b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-export-info-size-too-big rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-export-info-size-too-big rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-export-info-size-too-big diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-import-name-end b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-import-name-end rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-import-name-end rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-import-name-end diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-import-name-start b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-import-name-start rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-import-name-start rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-import-name-start diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-node-loop b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-node-loop rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-node-loop rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-node-loop diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-trie-not-export-node b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-not-export-node rename from llvm/test/tools/llvm-objdump/Inputs/macho-trie-not-export-node rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-trie-not-export-node diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-weak-bind-set-dylib-ordinal-imm b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-weak-bind-set-dylib-ordinal-imm rename from llvm/test/tools/llvm-objdump/Inputs/macho-weak-bind-set-dylib-ordinal-imm rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-weak-bind-set-dylib-ordinal-imm diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-weak-bind-set-dylib-ordinal-uleb b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-weak-bind-set-dylib-ordinal-uleb rename from llvm/test/tools/llvm-objdump/Inputs/macho-weak-bind-set-dylib-ordinal-uleb rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-weak-bind-set-dylib-ordinal-uleb diff --git a/llvm/test/tools/llvm-objdump/Inputs/macho-weak-bind-set-dylib-special-imm b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-weak-bind-set-dylib-special-imm rename from llvm/test/tools/llvm-objdump/Inputs/macho-weak-bind-set-dylib-special-imm rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-weak-bind-set-dylib-special-imm diff --git a/llvm/test/tools/llvm-objdump/Inputs/malformed-macho.bin b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-macho.bin rename from llvm/test/tools/llvm-objdump/Inputs/malformed-macho.bin rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-macho.bin diff --git a/llvm/test/tools/llvm-objdump/Inputs/malformed-unwind.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-unwind.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/malformed-unwind.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-unwind.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/rebase.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/rebase.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/rebase.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/rebase.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/section.macho-armv7 b/llvm/test/tools/llvm-objdump/MachO/Inputs/section.macho-armv7 rename from llvm/test/tools/llvm-objdump/Inputs/section.macho-armv7 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/section.macho-armv7 diff --git a/llvm/test/tools/llvm-objdump/Inputs/unwind-info-no-relocs.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info-no-relocs.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/unwind-info-no-relocs.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info-no-relocs.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/unwind-info.macho-arm64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info.macho-arm64 rename from llvm/test/tools/llvm-objdump/Inputs/unwind-info.macho-arm64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info.macho-arm64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/unwind-info.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/unwind-info.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/unwind-info.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/Inputs/weak-bind.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/weak-bind.macho-x86_64 rename from llvm/test/tools/llvm-objdump/Inputs/weak-bind.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/weak-bind.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/macho-LLVM-bundle.test b/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test rename from llvm/test/tools/llvm-objdump/macho-LLVM-bundle.test rename to llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test diff --git a/llvm/test/tools/llvm-objdump/macho-bad-bind.test b/llvm/test/tools/llvm-objdump/MachO/bad-bind.test rename from llvm/test/tools/llvm-objdump/macho-bad-bind.test rename to llvm/test/tools/llvm-objdump/MachO/bad-bind.test diff --git a/llvm/test/tools/llvm-objdump/macho-bad-dysymtab.test b/llvm/test/tools/llvm-objdump/MachO/bad-dysymtab.test rename from llvm/test/tools/llvm-objdump/macho-bad-dysymtab.test rename to llvm/test/tools/llvm-objdump/MachO/bad-dysymtab.test diff --git a/llvm/test/tools/llvm-objdump/macho-bad-ordinal.test b/llvm/test/tools/llvm-objdump/MachO/bad-ordinal.test rename from llvm/test/tools/llvm-objdump/macho-bad-ordinal.test rename to llvm/test/tools/llvm-objdump/MachO/bad-ordinal.test diff --git a/llvm/test/tools/llvm-objdump/macho-bad-trie.test b/llvm/test/tools/llvm-objdump/MachO/bad-trie.test rename from llvm/test/tools/llvm-objdump/macho-bad-trie.test rename to llvm/test/tools/llvm-objdump/MachO/bad-trie.test diff --git a/llvm/test/tools/llvm-objdump/macho-bind.test b/llvm/test/tools/llvm-objdump/MachO/bind.test rename from llvm/test/tools/llvm-objdump/macho-bind.test rename to llvm/test/tools/llvm-objdump/MachO/bind.test diff --git a/llvm/test/tools/llvm-objdump/macho-bind2.test b/llvm/test/tools/llvm-objdump/MachO/bind2.test rename from llvm/test/tools/llvm-objdump/macho-bind2.test rename to llvm/test/tools/llvm-objdump/MachO/bind2.test diff --git a/llvm/test/tools/llvm-objdump/macho-compact-unwind-i386.test b/llvm/test/tools/llvm-objdump/MachO/compact-unwind-i386.test rename from llvm/test/tools/llvm-objdump/macho-compact-unwind-i386.test rename to llvm/test/tools/llvm-objdump/MachO/compact-unwind-i386.test diff --git a/llvm/test/tools/llvm-objdump/macho-compact-unwind-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/compact-unwind-x86_64.test rename from llvm/test/tools/llvm-objdump/macho-compact-unwind-x86_64.test rename to llvm/test/tools/llvm-objdump/MachO/compact-unwind-x86_64.test diff --git a/llvm/test/tools/llvm-objdump/eh_frame-arm64.test b/llvm/test/tools/llvm-objdump/MachO/eh_frame-arm64.test rename from llvm/test/tools/llvm-objdump/eh_frame-arm64.test rename to llvm/test/tools/llvm-objdump/MachO/eh_frame-arm64.test diff --git a/llvm/test/tools/llvm-objdump/macho-exports-trie.test b/llvm/test/tools/llvm-objdump/MachO/exports-trie.test rename from llvm/test/tools/llvm-objdump/macho-exports-trie.test rename to llvm/test/tools/llvm-objdump/MachO/exports-trie.test diff --git a/llvm/test/tools/llvm-objdump/macho-lazy-bind.test b/llvm/test/tools/llvm-objdump/MachO/lazy-bind.test rename from llvm/test/tools/llvm-objdump/macho-lazy-bind.test rename to llvm/test/tools/llvm-objdump/MachO/lazy-bind.test diff --git a/llvm/test/tools/llvm-objdump/malformed-unwind-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/malformed-unwind-x86_64.test rename from llvm/test/tools/llvm-objdump/malformed-unwind-x86_64.test rename to llvm/test/tools/llvm-objdump/MachO/malformed-unwind-x86_64.test diff --git a/llvm/test/tools/llvm-objdump/malformed-macho.test b/llvm/test/tools/llvm-objdump/MachO/malformed.test rename from llvm/test/tools/llvm-objdump/malformed-macho.test rename to llvm/test/tools/llvm-objdump/MachO/malformed.test diff --git a/llvm/test/tools/llvm-objdump/macho-objc-meta-data.test b/llvm/test/tools/llvm-objdump/MachO/objc-meta-data.test rename from llvm/test/tools/llvm-objdump/macho-objc-meta-data.test rename to llvm/test/tools/llvm-objdump/MachO/objc-meta-data.test diff --git a/llvm/test/tools/llvm-objdump/macho-rebase.test b/llvm/test/tools/llvm-objdump/MachO/rebase.test rename from llvm/test/tools/llvm-objdump/macho-rebase.test rename to llvm/test/tools/llvm-objdump/MachO/rebase.test diff --git a/llvm/test/tools/llvm-objdump/macho-sections.test b/llvm/test/tools/llvm-objdump/MachO/sections.test rename from llvm/test/tools/llvm-objdump/macho-sections.test rename to llvm/test/tools/llvm-objdump/MachO/sections.test diff --git a/llvm/test/tools/llvm-objdump/macho-stabs.test b/llvm/test/tools/llvm-objdump/MachO/stabs.test rename from llvm/test/tools/llvm-objdump/macho-stabs.test rename to llvm/test/tools/llvm-objdump/MachO/stabs.test diff --git a/llvm/test/tools/llvm-objdump/macho-unwind-info-arm64.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info-arm64.test rename from llvm/test/tools/llvm-objdump/macho-unwind-info-arm64.test rename to llvm/test/tools/llvm-objdump/MachO/unwind-info-arm64.test diff --git a/llvm/test/tools/llvm-objdump/macho-unwind-info-no-relocs.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info-no-relocs.test rename from llvm/test/tools/llvm-objdump/macho-unwind-info-no-relocs.test rename to llvm/test/tools/llvm-objdump/MachO/unwind-info-no-relocs.test diff --git a/llvm/test/tools/llvm-objdump/macho-unwind-info-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info-x86_64.test rename from llvm/test/tools/llvm-objdump/macho-unwind-info-x86_64.test rename to llvm/test/tools/llvm-objdump/MachO/unwind-info-x86_64.test diff --git a/llvm/test/tools/llvm-objdump/macho-weak-bind.test b/llvm/test/tools/llvm-objdump/MachO/weak-bind.test rename from llvm/test/tools/llvm-objdump/macho-weak-bind.test rename to llvm/test/tools/llvm-objdump/MachO/weak-bind.test diff --git a/llvm/test/tools/llvm-objdump/Inputs/xcoff-long-sec-names.o b/llvm/test/tools/llvm-objdump/XCOFF/Inputs/xcoff-long-sec-names.o rename from llvm/test/tools/llvm-objdump/Inputs/xcoff-long-sec-names.o rename to llvm/test/tools/llvm-objdump/XCOFF/Inputs/xcoff-long-sec-names.o diff --git a/llvm/test/tools/llvm-objdump/Inputs/xcoff-section-headers-truncate.o b/llvm/test/tools/llvm-objdump/XCOFF/Inputs/xcoff-section-headers-truncate.o rename from llvm/test/tools/llvm-objdump/Inputs/xcoff-section-headers-truncate.o rename to llvm/test/tools/llvm-objdump/XCOFF/Inputs/xcoff-section-headers-truncate.o diff --git a/llvm/test/tools/llvm-objdump/Inputs/xcoff-section-headers.o b/llvm/test/tools/llvm-objdump/XCOFF/Inputs/xcoff-section-headers.o rename from llvm/test/tools/llvm-objdump/Inputs/xcoff-section-headers.o rename to llvm/test/tools/llvm-objdump/XCOFF/Inputs/xcoff-section-headers.o diff --git a/llvm/test/tools/llvm-objdump/xcoff-disassemble-all.test b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-all.test rename from llvm/test/tools/llvm-objdump/xcoff-disassemble-all.test rename to llvm/test/tools/llvm-objdump/XCOFF/disassemble-all.test diff --git a/llvm/test/tools/llvm-objdump/xcoff-raw-section-data.test b/llvm/test/tools/llvm-objdump/XCOFF/raw-section-data.test rename from llvm/test/tools/llvm-objdump/xcoff-raw-section-data.test rename to llvm/test/tools/llvm-objdump/XCOFF/raw-section-data.test diff --git a/llvm/test/tools/llvm-objdump/xcoff-section-headers.test b/llvm/test/tools/llvm-objdump/XCOFF/section-headers.test rename from llvm/test/tools/llvm-objdump/xcoff-section-headers.test rename to llvm/test/tools/llvm-objdump/XCOFF/section-headers.test diff --git a/llvm/test/tools/llvm-objdump/Inputs/corrupt-section.wasm b/llvm/test/tools/llvm-objdump/wasm/Inputs/corrupt-section.wasm rename from llvm/test/tools/llvm-objdump/Inputs/corrupt-section.wasm rename to llvm/test/tools/llvm-objdump/wasm/Inputs/corrupt-section.wasm diff --git a/llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm b/llvm/test/tools/llvm-objdump/wasm/Inputs/trivial.obj.wasm rename from llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm rename to llvm/test/tools/llvm-objdump/wasm/Inputs/trivial.obj.wasm diff --git a/llvm/test/tools/llvm-objdump/file-headers-unsupported.test b/llvm/test/tools/llvm-objdump/wasm/file-headers-unsupported.test rename from llvm/test/tools/llvm-objdump/file-headers-unsupported.test rename to llvm/test/tools/llvm-objdump/wasm/file-headers-unsupported.test diff --git a/llvm/test/tools/llvm-objdump/WebAssembly/lit.local.cfg b/llvm/test/tools/llvm-objdump/wasm/lit.local.cfg rename from llvm/test/tools/llvm-objdump/WebAssembly/lit.local.cfg rename to llvm/test/tools/llvm-objdump/wasm/lit.local.cfg diff --git a/llvm/test/tools/llvm-objdump/WebAssembly/relocations.test b/llvm/test/tools/llvm-objdump/wasm/relocations.test rename from llvm/test/tools/llvm-objdump/WebAssembly/relocations.test rename to llvm/test/tools/llvm-objdump/wasm/relocations.test diff --git a/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test b/llvm/test/tools/llvm-objdump/wasm/symbol-table.test rename from llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test rename to llvm/test/tools/llvm-objdump/wasm/symbol-table.test --- a/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test +++ b/llvm/test/tools/llvm-objdump/wasm/symbol-table.test @@ -1,4 +1,4 @@ -RUN: llvm-objdump -t %p/../Inputs/trivial.obj.wasm | FileCheck %s +RUN: llvm-objdump -t %p/Inputs/trivial.obj.wasm | FileCheck %s CHECK: SYMBOL TABLE: CHECK-NEXT: 00000001 g F CODE main diff --git a/llvm/test/tools/llvm-objdump/wasm-corrupt-section.test b/llvm/test/tools/llvm-objdump/wasm/wasm-corrupt-section.test rename from llvm/test/tools/llvm-objdump/wasm-corrupt-section.test rename to llvm/test/tools/llvm-objdump/wasm/wasm-corrupt-section.test diff --git a/llvm/test/tools/llvm-objdump/wasm.txt b/llvm/test/tools/llvm-objdump/wasm/wasm.txt rename from llvm/test/tools/llvm-objdump/wasm.txt rename to llvm/test/tools/llvm-objdump/wasm/wasm.txt