diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/ObjC.exe.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/ObjC.exe.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/ObjC.exe.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/ObjC.exe.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/ObjC.obj.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/ObjC.obj.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/ObjC.obj.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/ObjC.obj.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/arm64e.macho.yaml similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/arm64e.macho.yaml diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/fat.macho-armv7s-arm64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/fat.macho-armv7s-arm64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/fat.macho-armv7s-arm64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/fat.macho-armv7s-arm64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/hello.exe.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/hello.exe.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/hello.exe.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/hello.exe.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/hello.obj.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/hello.obj.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/hello.obj.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/hello.obj.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/kextbundle.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/kextbundle.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/kextbundle.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/kextbundle.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/link-opt-hints.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/link-opt-hints.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/link-opt-hints.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/link-opt-hints.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/print-mrs.obj.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/print-mrs.obj.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/print-mrs.obj.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/print-mrs.obj.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/reloc-addend.obj.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/reloc-addend.obj.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/reloc-addend.obj.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/reloc-addend.obj.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/thread.macho-aarch64 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/thread.macho-aarch64 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/thread.macho-aarch64 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/thread.macho-aarch64 diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/thread.macho-arm64_32 b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/thread.macho-arm64_32 similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/Inputs/thread.macho-arm64_32 rename to llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/thread.macho-arm64_32 diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/lit.local.cfg b/llvm/test/tools/llvm-objdump/MachO/AArch64/lit.local.cfg new file mode 100644 index 000000000000..7184443994b6 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'AArch64' in config.root.targets: + config.unsupported = True diff --git a/llvm/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/mach-print-armv8crypto.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/mach-print-armv8crypto.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-arm64e.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64e.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-arm64e.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64e.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-fat-arm-disasm.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-fat-arm-disasm.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-fat-arm-disasm.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-fat-arm-disasm.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-kextbundle.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-kextbundle.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-kextbundle.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-kextbundle.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-link-opt-hints.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-link-opt-hints.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-link-opt-hints.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-print-mrs.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-mrs.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-print-mrs.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-mrs.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-print-thread-arm64_32.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread-arm64_32.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-print-thread-arm64_32.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread-arm64_32.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-print-thread.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-print-thread.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-print-thread.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-private-headers.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-private-headers.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-private-headers.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-private-headers.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-reloc-addend.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-reloc-addend.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-reloc-addend.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-reloc-addend.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-symbolized-disassembly.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-symbolized-disassembly.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-symbolized-disassembly.test diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-zerofill.s b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-zerofill.s similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/macho-zerofill.s rename to llvm/test/tools/llvm-objdump/MachO/AArch64/macho-zerofill.s diff --git a/llvm/test/tools/llvm-objdump/AArch64/pc-rel-targets.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/pc-rel-targets.test similarity index 100% rename from llvm/test/tools/llvm-objdump/AArch64/pc-rel-targets.test rename to llvm/test/tools/llvm-objdump/MachO/AArch64/pc-rel-targets.test diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/ObjC.exe.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/ObjC.exe.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/ObjC.exe.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/ObjC.exe.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/ObjC.obj.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/ObjC.obj.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/ObjC.obj.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/ObjC.obj.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/Objc1.32bit.exe.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/Objc1.32bit.exe.macho-i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/Objc1.32bit.exe.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/Objc1.32bit.exe.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/Objc1.32bit.obj.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/Objc1.32bit.obj.macho-i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/Objc1.32bit.obj.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/Objc1.32bit.obj.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.32bit.exe.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.32bit.exe.macho-i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.32bit.exe.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.32bit.exe.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.32bit.obj.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.32bit.obj.macho-i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.32bit.obj.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.32bit.obj.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.64bit.exe.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.64bit.exe.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.64bit.exe.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.64bit.exe.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.64bit.obj.dylib-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.64bit.obj.dylib-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.64bit.obj.dylib-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.64bit.obj.dylib-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.64bit.obj.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.64bit.obj.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/Objc2.64bit.obj.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/Objc2.64bit.obj.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/codesig.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/codesig.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/codesig.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/codesig.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/dylibLoadKinds.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/dylibLoadKinds.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/dylibLoadKinds.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/dylibLoadKinds.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/dylibModInit.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/dylibModInit.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/dylibModInit.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/dylibModInit.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/dylibRoutines.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/dylibRoutines.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/dylibRoutines.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/dylibRoutines.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubClient.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubClient.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubClient.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubClient.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubFramework.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubFramework.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubFramework.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubFramework.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubLibrary.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubLibrary.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubLibrary.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubLibrary.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubUmbrella.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubUmbrella.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/dylibSubUmbrella.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/dylibSubUmbrella.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/exeThread.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/exeThread.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/exeThread.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/exeThread.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-fat similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-fat diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat.dwarf b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-fat.dwarf similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat.dwarf rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-fat.dwarf diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-thin similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-thin diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin.dwarf b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-thin.dwarf similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin.dwarf rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello-macho-thin.dwarf diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello.exe.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello.exe.macho-i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello.exe.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello.exe.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello.exe.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello.exe.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello.exe.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello.exe.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello.exe.stripped.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello.exe.stripped.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello.exe.stripped.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello.exe.stripped.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello.obj.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello.obj.macho-i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello.obj.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello.obj.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello.obj.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello.obj.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello.obj.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello.obj.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello_cpp.exe.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/hello_cpp.exe.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/hello_cpp.exe.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/hello_cpp.exe.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/kextbundle.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/kextbundle.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/kextbundle.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/kextbundle.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/linkerOption.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/linkerOption.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/linkerOption.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/linkerOption.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-disassemble-stab-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-disassemble-stab-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-disassemble-stab-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-disassemble-stab-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-bind-entry b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-bind-entry similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-bind-entry rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-bind-entry diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-linker-command b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-linker-command similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-linker-command rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-linker-command diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-reloc-section-index b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-reloc-section-index similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-reloc-section-index rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-reloc-section-index diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-indr b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-indr similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-indr rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-indr diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-indr-archive-universal b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-indr-archive-universal similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-indr-archive-universal rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-indr-archive-universal diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-lib_ordinal b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-lib_ordinal similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-lib_ordinal rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-lib_ordinal diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-nsect b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-nsect similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-nsect rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-nsect diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-nsect-archive b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-nsect-archive similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-nsect-archive rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-nsect-archive diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-strx b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-strx similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-strx rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-strx diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-strx-universal b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-strx-universal similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-invalid-symbol-strx-universal rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-invalid-symbol-strx-universal diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-multiple-text b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-multiple-text similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-multiple-text rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-multiple-text diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-preload-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-preload-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-preload-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-preload-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-universal-archive.x86_64.i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-universal-archive.x86_64.i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-universal-archive.x86_64.i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-universal-archive.x86_64.i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-universal.x86_64.i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-universal.x86_64.i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-universal.x86_64.i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-universal.x86_64.i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/macho-universal64.x86_64.i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-universal64.x86_64.i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/macho-universal64.x86_64.i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/macho-universal64.x86_64.i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/00000031.a b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/00000031.a similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/00000031.a rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/00000031.a diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0001.macho b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0001.macho similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0001.macho rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0001.macho diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0006.macho b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0006.macho similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0006.macho rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0006.macho diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0010.macho b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0010.macho similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0010.macho rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0010.macho diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0040.macho b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0040.macho similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0040.macho rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0040.macho diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0080.macho b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0080.macho similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0080.macho rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0080.macho diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0261.macho b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0261.macho similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0261.macho rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0261.macho diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0337.macho b/llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0337.macho similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/malformed-machos/mem-crup-0337.macho rename to llvm/test/tools/llvm-objdump/MachO/Inputs/malformed-machos/mem-crup-0337.macho diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/nofirst-symbol.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/nofirst-symbol.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/nofirst-symbol.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/nofirst-symbol.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/note.macho-x86 b/llvm/test/tools/llvm-objdump/MachO/Inputs/note.macho-x86 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/note.macho-x86 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/note.macho-x86 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/objModInit.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/objModInit.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/objModInit.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/objModInit.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/stub-nosyms.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/stub-nosyms.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/stub-nosyms.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/stub-nosyms.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/stubbed.dylib.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/stubbed.dylib.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/stubbed.dylib.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/stubbed.dylib.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/thread.macho-i386 b/llvm/test/tools/llvm-objdump/MachO/Inputs/thread.macho-i386 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/thread.macho-i386 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/thread.macho-i386 diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/truncated-section.dylib.macho-x86_64 b/llvm/test/tools/llvm-objdump/MachO/Inputs/truncated-section.dylib.macho-x86_64 similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/Inputs/truncated-section.dylib.macho-x86_64 rename to llvm/test/tools/llvm-objdump/MachO/Inputs/truncated-section.dylib.macho-x86_64 diff --git a/llvm/test/tools/llvm-objdump/X86/macho-archive-headers.test b/llvm/test/tools/llvm-objdump/MachO/archive-headers.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-archive-headers.test rename to llvm/test/tools/llvm-objdump/MachO/archive-headers.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-build-version.yaml b/llvm/test/tools/llvm-objdump/MachO/build-version.yaml similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-build-version.yaml rename to llvm/test/tools/llvm-objdump/MachO/build-version.yaml diff --git a/llvm/test/tools/llvm-objdump/X86/macho-cstring-dump.test b/llvm/test/tools/llvm-objdump/MachO/cstring-dump.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-cstring-dump.test rename to llvm/test/tools/llvm-objdump/MachO/cstring-dump.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-data-in-code.ll b/llvm/test/tools/llvm-objdump/MachO/data-in-code.ll similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-data-in-code.ll rename to llvm/test/tools/llvm-objdump/MachO/data-in-code.ll diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test b/llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-dis-no-leading-addr.test rename to llvm/test/tools/llvm-objdump/MachO/dis-no-leading-addr.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test b/llvm/test/tools/llvm-objdump/MachO/dis-symname.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-dis-symname.test rename to llvm/test/tools/llvm-objdump/MachO/dis-symname.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-disassemble-all.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-all.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-disassemble-all.test rename to llvm/test/tools/llvm-objdump/MachO/disassemble-all.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-disassemble-g-dsym.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-g-dsym.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-disassemble-g-dsym.test rename to llvm/test/tools/llvm-objdump/MachO/disassemble-g-dsym.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-disassemble-kextbundle.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-kextbundle.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-disassemble-kextbundle.test rename to llvm/test/tools/llvm-objdump/MachO/disassemble-kextbundle.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-disassemble-stab.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-stab.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-disassemble-stab.test rename to llvm/test/tools/llvm-objdump/MachO/disassemble-stab.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-disassemble-stripped.test b/llvm/test/tools/llvm-objdump/MachO/disassemble-stripped.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-disassemble-stripped.test rename to llvm/test/tools/llvm-objdump/MachO/disassemble-stripped.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-dylib.test b/llvm/test/tools/llvm-objdump/MachO/dylib.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-dylib.test rename to llvm/test/tools/llvm-objdump/MachO/dylib.test diff --git a/llvm/test/tools/llvm-objdump/X86/hex-displacement.test b/llvm/test/tools/llvm-objdump/MachO/hex-displacement.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/hex-displacement.test rename to llvm/test/tools/llvm-objdump/MachO/hex-displacement.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-image-info.test b/llvm/test/tools/llvm-objdump/MachO/image-info.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-image-info.test rename to llvm/test/tools/llvm-objdump/MachO/image-info.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-indirect-symbols.test b/llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-indirect-symbols.test rename to llvm/test/tools/llvm-objdump/MachO/indirect-symbols.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-info-plist-nofollow.test b/llvm/test/tools/llvm-objdump/MachO/info-plist-nofollow.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-info-plist-nofollow.test rename to llvm/test/tools/llvm-objdump/MachO/info-plist-nofollow.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-info-plist.test b/llvm/test/tools/llvm-objdump/MachO/info-plist.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-info-plist.test rename to llvm/test/tools/llvm-objdump/MachO/info-plist.test diff --git a/llvm/test/tools/llvm-objdump/MachO/lit.local.cfg b/llvm/test/tools/llvm-objdump/MachO/lit.local.cfg new file mode 100644 index 000000000000..c8625f4d9d24 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/MachO/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'X86' in config.root.targets: + config.unsupported = True diff --git a/llvm/test/tools/llvm-objdump/X86/macho-literal-pointers-i386.test b/llvm/test/tools/llvm-objdump/MachO/literal-pointers-i386.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-literal-pointers-i386.test rename to llvm/test/tools/llvm-objdump/MachO/literal-pointers-i386.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-literal-pointers-x86_64.test b/llvm/test/tools/llvm-objdump/MachO/literal-pointers-x86_64.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-literal-pointers-x86_64.test rename to llvm/test/tools/llvm-objdump/MachO/literal-pointers-x86_64.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-literals.test b/llvm/test/tools/llvm-objdump/MachO/literals.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-literals.test rename to llvm/test/tools/llvm-objdump/MachO/literals.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-maccatalyst-build-version.yaml b/llvm/test/tools/llvm-objdump/MachO/maccatalyst-build-version.yaml similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-maccatalyst-build-version.yaml rename to llvm/test/tools/llvm-objdump/MachO/maccatalyst-build-version.yaml diff --git a/llvm/test/tools/llvm-objdump/X86/macho-objc-meta-data.test b/llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-objc-meta-data.test rename to llvm/test/tools/llvm-objdump/MachO/macho-objc-meta-data.test diff --git a/llvm/test/tools/llvm-objdump/X86/malformed-machos.test b/llvm/test/tools/llvm-objdump/MachO/malformed-machos.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/malformed-machos.test rename to llvm/test/tools/llvm-objdump/MachO/malformed-machos.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-nofirst-symbol-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/nofirst-symbol-disassembly.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-nofirst-symbol-disassembly.test rename to llvm/test/tools/llvm-objdump/MachO/nofirst-symbol-disassembly.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test b/llvm/test/tools/llvm-objdump/MachO/nontext-disasm.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-nontext-disasm.test rename to llvm/test/tools/llvm-objdump/MachO/nontext-disasm.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-preload-relocations.test b/llvm/test/tools/llvm-objdump/MachO/preload-relocations.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-preload-relocations.test rename to llvm/test/tools/llvm-objdump/MachO/preload-relocations.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-print-thread.test b/llvm/test/tools/llvm-objdump/MachO/print-thread.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-print-thread.test rename to llvm/test/tools/llvm-objdump/MachO/print-thread.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-private-header.test b/llvm/test/tools/llvm-objdump/MachO/private-header.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-private-header.test rename to llvm/test/tools/llvm-objdump/MachO/private-header.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-private-headers.test b/llvm/test/tools/llvm-objdump/MachO/private-headers.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-private-headers.test rename to llvm/test/tools/llvm-objdump/MachO/private-headers.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-relocations.test b/llvm/test/tools/llvm-objdump/MachO/relocations.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-relocations.test rename to llvm/test/tools/llvm-objdump/MachO/relocations.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-section-contents.test b/llvm/test/tools/llvm-objdump/MachO/section-contents.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-section-contents.test rename to llvm/test/tools/llvm-objdump/MachO/section-contents.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-section-headers.test b/llvm/test/tools/llvm-objdump/MachO/section-headers.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-section-headers.test rename to llvm/test/tools/llvm-objdump/MachO/section-headers.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-section.test b/llvm/test/tools/llvm-objdump/MachO/section.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-section.test rename to llvm/test/tools/llvm-objdump/MachO/section.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-stub-nosyms-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/stub-nosyms-disassembly.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-stub-nosyms-disassembly.test rename to llvm/test/tools/llvm-objdump/MachO/stub-nosyms-disassembly.test diff --git a/llvm/test/tools/llvm-objdump/X86/stubbed-dylib.test b/llvm/test/tools/llvm-objdump/MachO/stubbed-dylib.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/stubbed-dylib.test rename to llvm/test/tools/llvm-objdump/MachO/stubbed-dylib.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test b/llvm/test/tools/llvm-objdump/MachO/symbol-table.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test rename to llvm/test/tools/llvm-objdump/MachO/symbol-table.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test b/llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-symbolized-disassembly.test rename to llvm/test/tools/llvm-objdump/MachO/symbolized-disassembly.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-subtractor-i386.test b/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor-i386.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-symbolized-subtractor-i386.test rename to llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor-i386.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-symbolized-subtractor.test b/llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-symbolized-subtractor.test rename to llvm/test/tools/llvm-objdump/MachO/symbolized-subtractor.test diff --git a/llvm/test/tools/llvm-objdump/X86/truncated-section.test b/llvm/test/tools/llvm-objdump/MachO/truncated-section.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/truncated-section.test rename to llvm/test/tools/llvm-objdump/MachO/truncated-section.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test b/llvm/test/tools/llvm-objdump/MachO/universal-x86_64.i386.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-universal-x86_64.i386.test rename to llvm/test/tools/llvm-objdump/MachO/universal-x86_64.i386.test diff --git a/llvm/test/tools/llvm-objdump/X86/macho-unwind-info.test b/llvm/test/tools/llvm-objdump/MachO/unwind-info.test similarity index 100% rename from llvm/test/tools/llvm-objdump/X86/macho-unwind-info.test rename to llvm/test/tools/llvm-objdump/MachO/unwind-info.test