[llvm] 8ad75c1 - [JITLink][X86] Rename X86 test directory to x86-64, update test names.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Sat Apr 15 11:39:19 PDT 2023
Author: Lang Hames
Date: 2023-04-15T18:39:12Z
New Revision: 8ad75c1037289b06bd1b95ff445797d380d93039
URL: https://github.com/llvm/llvm-project/commit/8ad75c1037289b06bd1b95ff445797d380d93039
DIFF: https://github.com/llvm/llvm-project/commit/8ad75c1037289b06bd1b95ff445797d380d93039.diff
LOG: [JITLink][X86] Rename X86 test directory to x86-64, update test names.
Tests in test/ExecutionEngine/JITLink/X86 were for x86-64 only (never i386) so
it makes sense to name the test directory x86-64, and drop x86-64 from the
individual test names.
Added:
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_abs.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_addr32nb_reloc.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_addr32nb_reloc_neg_addend.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_any.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative_dead_strip.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative_no_dead_strip.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_exact_match.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_intervene.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_largest.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_noduplicate.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_offset.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_same_size.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak_duplicate.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak_plus_strong.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_common_symbol.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_alternatename.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_alternatename_fail.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_include.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_duplicate_externals.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_external_var.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_file_debug.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_label.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_nolibrary_search.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_pdata_no_strip.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_pdata_strip.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_rel32_4_reloc.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_section_relocs.test
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_small_pic_relocations.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_static_var.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_strong_duplicate.s
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_weak_external.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_R_X86_64_32.yaml
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_absolute_relocations.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_comdat.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_common_var.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_debug_section_lifetime_is_NoAlloc.yaml
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_ehframe_basic.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_ehframe_large_static_personality_encodings.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_empty_section.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_external_to_absolute_conversion.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_got_plt_optimizations.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_large_pic_relocations.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_shndex.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_small_pic_relocations.s
llvm/test/ExecutionEngine/JITLink/x86-64/ELF_weak_definitions.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_comdat_weak_def.yaml
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_strong_def.yaml
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_weak_nolibrary_serach_def.yaml
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/ELF_weak_defs_extra.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_GOTAndStubsOptimizationHelper.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_ehframe.o
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_extra_def_strong.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_extra_def_weak.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_global_absolute_def.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_global_linker_private_def.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_internal_linker_private_def.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_local_absolute_def.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_self_relocation.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_test_harness_test.s
llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_was_private_extern.o
llvm/test/ExecutionEngine/JITLink/x86-64/LocalDependencyPropagation.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO-duplicate-local.test
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_GOTAndStubsOptimization.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_absolute_symbols.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_load_hidden_expect_failure.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_load_hidden_expect_success.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_support.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_compact_unwind.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_cstring_section_alignment.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_cstring_section_splitting.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe.test
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_bad_fde_cie-ptr_out-of-range.test
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_bad_fde_pc-begin_out-of-range.test
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_canonical_symbol_comparison.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_empty_section.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_gdb_jit_nonzero_alignment_offsets.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_initializers.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_linker_private_symbols.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_llvm_jitlink_alias_option.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_lookup_section_end_by_address.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_non_subsections_via_symbols.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_relocations.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_same_section_name_different_segment_names.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation.test
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation_exec.test
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_test_harness_harness.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_thread_bss.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_unnamed_external.yaml
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_was_private_extern.test
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_definitions.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_local.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_references.s
llvm/test/ExecutionEngine/JITLink/x86-64/MachO_zero_fill_alignment.s
llvm/test/ExecutionEngine/JITLink/x86-64/lit.local.cfg
Modified:
Removed:
llvm/test/ExecutionEngine/JITLink/X86/COFF_abs.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_addr32nb_reloc.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_addr32nb_reloc_neg_addend.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_any.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative_dead_strip.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative_no_dead_strip.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_exact_match.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_intervene.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_largest.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_noduplicate.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_offset.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_same_size.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak_duplicate.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak_plus_strong.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_common_symbol.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_alternatename.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_alternatename_fail.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_include.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_duplicate_externals.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_external_var.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_file_debug.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_label.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_nolibrary_search.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_pdata_no_strip.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_pdata_strip.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_rel32_4_reloc.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_section_relocs.test
llvm/test/ExecutionEngine/JITLink/X86/COFF_static_var.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_strong_duplicate.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_weak_external.s
llvm/test/ExecutionEngine/JITLink/X86/COFF_x86-64_small_pic_relocations.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_R_X86_64_32.yaml
llvm/test/ExecutionEngine/JITLink/X86/ELF_comdat.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_debug_section_lifetime_is_NoAlloc.yaml
llvm/test/ExecutionEngine/JITLink/X86/ELF_ehframe_basic.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_ehframe_large_static_personality_encodings.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_empty_section.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_external_to_absolute_conversion.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_shndex.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_weak_definitions.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_common.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_got_plt_optimizations.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_large_pic_relocations.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_small_pic_relocations.s
llvm/test/ExecutionEngine/JITLink/X86/ELF_x86_64_absolute_relocations.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_comdat_weak_def.yaml
llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_strong_def.yaml
llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_weak_nolibrary_serach_def.yaml
llvm/test/ExecutionEngine/JITLink/X86/Inputs/ELF_weak_defs_extra.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_GOTAndStubsOptimizationHelper.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_extra_def_strong.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_extra_def_weak.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_global_absolute_def.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_global_linker_private_def.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_internal_linker_private_def.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_local_absolute_def.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_test_harness_test.s
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_x86-64_ehframe.o
llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_x86-64_was_private_extern.o
llvm/test/ExecutionEngine/JITLink/X86/Inputs/x86-64_self_relocation.s
llvm/test/ExecutionEngine/JITLink/X86/LocalDependencyPropagation.s
llvm/test/ExecutionEngine/JITLink/X86/MachO-duplicate-local.test
llvm/test/ExecutionEngine/JITLink/X86/MachO_GOTAndStubsOptimization.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_absolute_symbols.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_load_hidden_expect_failure.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_load_hidden_expect_success.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_support.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_cstring_section_alignment.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_cstring_section_splitting.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_bad_fde_cie-ptr_out-of-range.test
llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_bad_fde_pc-begin_out-of-range.test
llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_canonical_symbol_comparison.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_empty_section.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_gdb_jit_nonzero_alignment_offsets.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_initializers.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_linker_private_symbols.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_llvm_jitlink_alias_option.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_lookup_section_end_by_address.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_non_subsections_via_symbols.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_same_section_name_different_segment_names.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_test_harness_harness.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_thread_bss.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_unnamed_external.yaml
llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_definitions.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_local.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_references.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_ehframe.test
llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_relocations.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation.test
llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation_exec.test
llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_was_private_extern.test
llvm/test/ExecutionEngine/JITLink/X86/MachO_x86_64_compact_unwind.s
llvm/test/ExecutionEngine/JITLink/X86/MachO_zero_fill_alignment.s
llvm/test/ExecutionEngine/JITLink/X86/lit.local.cfg
################################################################################
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_was_private_extern.test b/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_was_private_extern.test
deleted file mode 100644
index 75e3847ae8963..0000000000000
--- a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_was_private_extern.test
+++ /dev/null
@@ -1,9 +0,0 @@
-# RUN: llvm-jitlink -noexec %S/Inputs/MachO_x86-64_was_private_extern.o
-#
-# Perform a no-exec link of MachO_x86-64_was_private_extern.o and verify that
-# it does not generate any errors despite the presence of a 'was private
-# extern' symbol (N_PEXT set, N_EXT unset).
-#
-# The test case for this is a relocatable object file rather than assembly as
-# objects must be run through ld64's 'ld -r' mode to produce them and we can't
-# assume that that is available everywhere.
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_abs.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_abs.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_abs.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_abs.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_addr32nb_reloc.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_addr32nb_reloc.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_addr32nb_reloc.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_addr32nb_reloc.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_addr32nb_reloc_neg_addend.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_addr32nb_reloc_neg_addend.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_addr32nb_reloc_neg_addend.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_addr32nb_reloc_neg_addend.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_any.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_any.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_any.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_any.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative_dead_strip.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative_dead_strip.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative_dead_strip.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative_dead_strip.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative_no_dead_strip.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative_no_dead_strip.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_associative_no_dead_strip.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_associative_no_dead_strip.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_exact_match.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_exact_match.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_exact_match.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_exact_match.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_intervene.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_intervene.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_intervene.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_intervene.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_largest.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_largest.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_largest.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_largest.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_noduplicate.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_noduplicate.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_noduplicate.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_noduplicate.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_offset.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_offset.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_offset.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_offset.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_same_size.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_same_size.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_same_size.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_same_size.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak_duplicate.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak_duplicate.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak_duplicate.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak_duplicate.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak_plus_strong.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak_plus_strong.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_comdat_weak_plus_strong.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_comdat_weak_plus_strong.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_common_symbol.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_common_symbol.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_common_symbol.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_common_symbol.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_alternatename.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_alternatename.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_alternatename.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_alternatename.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_alternatename_fail.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_alternatename_fail.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_alternatename_fail.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_alternatename_fail.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_include.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_include.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_directive_include.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_directive_include.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_duplicate_externals.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_duplicate_externals.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_duplicate_externals.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_duplicate_externals.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_external_var.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_external_var.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_external_var.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_external_var.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_file_debug.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_file_debug.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_file_debug.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_file_debug.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_label.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_label.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_label.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_label.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_nolibrary_search.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_nolibrary_search.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_nolibrary_search.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_nolibrary_search.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_pdata_no_strip.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_pdata_no_strip.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_pdata_no_strip.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_pdata_no_strip.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_pdata_strip.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_pdata_strip.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_pdata_strip.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_pdata_strip.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_rel32_4_reloc.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_rel32_4_reloc.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_rel32_4_reloc.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_rel32_4_reloc.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_section_relocs.test b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_section_relocs.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_section_relocs.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_section_relocs.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_x86-64_small_pic_relocations.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_small_pic_relocations.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_x86-64_small_pic_relocations.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_small_pic_relocations.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_static_var.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_static_var.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_static_var.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_static_var.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_strong_duplicate.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_strong_duplicate.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_strong_duplicate.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_strong_duplicate.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/COFF_weak_external.s b/llvm/test/ExecutionEngine/JITLink/x86-64/COFF_weak_external.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/COFF_weak_external.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/COFF_weak_external.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_R_X86_64_32.yaml b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_R_X86_64_32.yaml
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_R_X86_64_32.yaml
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_R_X86_64_32.yaml
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86_64_absolute_relocations.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_absolute_relocations.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_x86_64_absolute_relocations.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_absolute_relocations.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_comdat.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_comdat.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_comdat.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_comdat.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_common.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_common_var.s
similarity index 88%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_common.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_common_var.s
index de464c7a07bfd..faa963f3b531b 100644
--- a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_common.s
+++ b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_common_var.s
@@ -1,16 +1,17 @@
# RUN: rm -rf %t && mkdir -p %t
# RUN: llvm-mc -triple=x86_64-unknown-linux -relax-relocations=false -position-independent -filetype=obj -o %t/elf_common.o %s
# RUN: llvm-jitlink -entry=load_common -noexec -check %s %t/elf_common.o
+#
+# Check that common variable GOT entry is synthesized correctly.
.text
- .file "elf_common.c"
.globl load_common
.p2align 4, 0x90
.type load_common, at function
load_common:
-# Check that common variable GOT entry is synthesized correctly. In order to
-# prevent the optimizer from relaxing the edge, we use a movl instruction.
+# In order to prevent the optimizer from relaxing the edge, we use a movl
+# instruction.
# jitlink-check: decode_operand(load_common, 4) = \
# jitlink-check: got_addr(elf_common.o, common_data) - next_pc(load_common)
# jitlink-check: *{8}(got_addr(elf_common.o, common_data)) = common_data
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_debug_section_lifetime_is_NoAlloc.yaml b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_debug_section_lifetime_is_NoAlloc.yaml
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_debug_section_lifetime_is_NoAlloc.yaml
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_debug_section_lifetime_is_NoAlloc.yaml
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_ehframe_basic.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_ehframe_basic.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_ehframe_basic.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_ehframe_basic.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_ehframe_large_static_personality_encodings.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_ehframe_large_static_personality_encodings.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_ehframe_large_static_personality_encodings.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_ehframe_large_static_personality_encodings.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_empty_section.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_empty_section.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_empty_section.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_empty_section.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_external_to_absolute_conversion.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_external_to_absolute_conversion.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_external_to_absolute_conversion.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_external_to_absolute_conversion.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_got_plt_optimizations.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_got_plt_optimizations.s
similarity index 95%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_got_plt_optimizations.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_got_plt_optimizations.s
index 7ec72cc1fb90a..27ffd580e9a5c 100644
--- a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_got_plt_optimizations.s
+++ b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_got_plt_optimizations.s
@@ -1,10 +1,10 @@
# RUN: rm -rf %t && mkdir -p %t
# RUN: llvm-mc -triple=x86_64-unknown-linux -position-independent \
-# RUN: -filetype=obj -o %t/elf_sm_pic_reloc.o %s
+# RUN: -filetype=obj -o %t/elf_got_plt_opt.o %s
# RUN: llvm-jitlink -noexec \
# RUN: -slab-allocate 100Kb -slab-address 0xfff00000 -slab-page-size 4096 \
# RUN: -abs extern_in_range32=0xffe00000 \
-# RUN: -check %s %t/elf_sm_pic_reloc.o
+# RUN: -check %s %t/elf_got_plt_opt.o
#
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_large_pic_relocations.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_large_pic_relocations.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_large_pic_relocations.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_large_pic_relocations.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_shndex.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_shndex.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_shndex.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_shndex.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_small_pic_relocations.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_small_pic_relocations.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_small_pic_relocations.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_small_pic_relocations.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_weak_definitions.s b/llvm/test/ExecutionEngine/JITLink/x86-64/ELF_weak_definitions.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/ELF_weak_definitions.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/ELF_weak_definitions.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_comdat_weak_def.yaml b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_comdat_weak_def.yaml
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_comdat_weak_def.yaml
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_comdat_weak_def.yaml
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_strong_def.yaml b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_strong_def.yaml
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_strong_def.yaml
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_strong_def.yaml
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_weak_nolibrary_serach_def.yaml b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_weak_nolibrary_serach_def.yaml
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/COFF_weak_nolibrary_serach_def.yaml
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/COFF_weak_nolibrary_serach_def.yaml
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/ELF_weak_defs_extra.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/ELF_weak_defs_extra.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/ELF_weak_defs_extra.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/ELF_weak_defs_extra.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_GOTAndStubsOptimizationHelper.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_GOTAndStubsOptimizationHelper.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_GOTAndStubsOptimizationHelper.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_GOTAndStubsOptimizationHelper.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_x86-64_ehframe.o b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_ehframe.o
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_x86-64_ehframe.o
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_ehframe.o
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_extra_def_strong.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_extra_def_strong.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_extra_def_strong.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_extra_def_strong.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_extra_def_weak.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_extra_def_weak.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_extra_def_weak.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_extra_def_weak.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_global_absolute_def.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_global_absolute_def.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_global_absolute_def.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_global_absolute_def.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_global_linker_private_def.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_global_linker_private_def.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_global_linker_private_def.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_global_linker_private_def.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_internal_linker_private_def.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_internal_linker_private_def.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_internal_linker_private_def.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_internal_linker_private_def.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_local_absolute_def.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_local_absolute_def.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_local_absolute_def.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_local_absolute_def.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/x86-64_self_relocation.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_self_relocation.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/x86-64_self_relocation.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_self_relocation.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_test_harness_test.s b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_test_harness_test.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_test_harness_test.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_test_harness_test.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_x86-64_was_private_extern.o b/llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_was_private_extern.o
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/Inputs/MachO_x86-64_was_private_extern.o
rename to llvm/test/ExecutionEngine/JITLink/x86-64/Inputs/MachO_was_private_extern.o
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/LocalDependencyPropagation.s b/llvm/test/ExecutionEngine/JITLink/x86-64/LocalDependencyPropagation.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/LocalDependencyPropagation.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/LocalDependencyPropagation.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO-duplicate-local.test b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO-duplicate-local.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO-duplicate-local.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO-duplicate-local.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_GOTAndStubsOptimization.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_GOTAndStubsOptimization.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_GOTAndStubsOptimization.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_GOTAndStubsOptimization.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_absolute_symbols.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_absolute_symbols.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_absolute_symbols.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_absolute_symbols.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_load_hidden_expect_failure.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_load_hidden_expect_failure.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_load_hidden_expect_failure.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_load_hidden_expect_failure.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_load_hidden_expect_success.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_load_hidden_expect_success.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_load_hidden_expect_success.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_load_hidden_expect_success.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_support.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_support.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_archive_support.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_archive_support.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86_64_compact_unwind.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_compact_unwind.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_x86_64_compact_unwind.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_compact_unwind.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_cstring_section_alignment.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_cstring_section_alignment.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_cstring_section_alignment.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_cstring_section_alignment.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_cstring_section_splitting.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_cstring_section_splitting.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_cstring_section_splitting.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_cstring_section_splitting.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_ehframe.test b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe.test
similarity index 58%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_ehframe.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe.test
index b6ebddbacf4c9..7565ab73bf2c8 100644
--- a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_ehframe.test
+++ b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe.test
@@ -1,5 +1,6 @@
-# RUN: llvm-jitlink -noexec -abs __ZTIi=0x1 -abs ___gxx_personality_v0=0x2 %S/Inputs/MachO_x86-64_ehframe.o
+# RUN: llvm-jitlink -noexec -abs __ZTIi=0x1 -abs ___gxx_personality_v0=0x2 \
+# RUN: %S/Inputs/MachO_ehframe.o
#
-# Perform a no-exec link of MachO_x86-64_ehframe and verify that it does not
+# Perform a no-exec link of MachO_ehframe.o and verify that it does not
# generate any errors despite the last FDE referring to the first CIE (rather
# than the most recent).
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_bad_fde_cie-ptr_out-of-range.test b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_bad_fde_cie-ptr_out-of-range.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_bad_fde_cie-ptr_out-of-range.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_bad_fde_cie-ptr_out-of-range.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_bad_fde_pc-begin_out-of-range.test b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_bad_fde_pc-begin_out-of-range.test
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_bad_fde_pc-begin_out-of-range.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_bad_fde_pc-begin_out-of-range.test
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_canonical_symbol_comparison.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_canonical_symbol_comparison.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_ehframe_canonical_symbol_comparison.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_ehframe_canonical_symbol_comparison.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_empty_section.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_empty_section.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_empty_section.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_empty_section.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_gdb_jit_nonzero_alignment_offsets.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_gdb_jit_nonzero_alignment_offsets.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_gdb_jit_nonzero_alignment_offsets.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_gdb_jit_nonzero_alignment_offsets.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_initializers.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_initializers.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_initializers.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_initializers.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_linker_private_symbols.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_linker_private_symbols.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_linker_private_symbols.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_linker_private_symbols.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_llvm_jitlink_alias_option.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_llvm_jitlink_alias_option.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_llvm_jitlink_alias_option.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_llvm_jitlink_alias_option.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_lookup_section_end_by_address.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_lookup_section_end_by_address.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_lookup_section_end_by_address.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_lookup_section_end_by_address.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_non_subsections_via_symbols.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_non_subsections_via_symbols.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_non_subsections_via_symbols.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_non_subsections_via_symbols.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_relocations.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_relocations.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_relocations.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_relocations.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_same_section_name_
diff erent_segment_names.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_same_section_name_
diff erent_segment_names.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_same_section_name_
diff erent_segment_names.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_same_section_name_
diff erent_segment_names.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation.test b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation.test
similarity index 97%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation.test
index dfeeba1e39b60..45e3eae0720c5 100644
--- a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation.test
+++ b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-apple-macosx10.9 -filetype=obj -o %t %S/Inputs/x86-64_self_relocation.s
+# RUN: llvm-mc -triple=x86_64-apple-macosx10.9 -filetype=obj -o %t %S/Inputs/MachO_self_relocation.s
# RUN: llvm-jitlink -noexec -show-graphs='.*' %t 2>&1 | \
# RUN: FileCheck -check-prefix=WITHOUT %s
# RUN: llvm-jitlink -noexec -show-graphs='.*' -add-self-relocations %t 2>&1 | \
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation_exec.test b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation_exec.test
similarity index 89%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation_exec.test
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation_exec.test
index b12e87b74cde9..0153d23396813 100644
--- a/llvm/test/ExecutionEngine/JITLink/X86/MachO_x86-64_self_relocation_exec.test
+++ b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_self_relocation_exec.test
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -triple=x86_64-apple-macosx10.9 -filetype=obj -o %t %S/Inputs/x86-64_self_relocation.s
+# RUN: llvm-mc -triple=x86_64-apple-macosx10.9 -filetype=obj -o %t %S/Inputs/MachO_self_relocation.s
# RUN: llvm-jitlink -show-graphs='.*' %t
# RUN: llvm-jitlink -show-graphs='.*' -add-self-relocations %t
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_test_harness_harness.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_test_harness_harness.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_test_harness_harness.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_test_harness_harness.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_thread_bss.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_thread_bss.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_thread_bss.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_thread_bss.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_unnamed_external.yaml b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_unnamed_external.yaml
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_unnamed_external.yaml
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_unnamed_external.yaml
diff --git a/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_was_private_extern.test b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_was_private_extern.test
new file mode 100644
index 0000000000000..5142a84d1db79
--- /dev/null
+++ b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_was_private_extern.test
@@ -0,0 +1,9 @@
+# RUN: llvm-jitlink -noexec %S/Inputs/MachO_was_private_extern.o
+#
+# Perform a no-exec link of MachO_was_private_extern.o and verify that it does
+# not generate any errors despite the presence of a 'was private extern' symbol
+# (N_PEXT set, N_EXT unset).
+#
+# The test case for this is a relocatable object file rather than assembly as
+# objects must be run through ld64's 'ld -r' mode to produce them and we can't
+# assume that that is available everywhere.
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_definitions.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_definitions.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_definitions.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_definitions.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_local.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_local.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_local.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_local.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_references.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_references.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_weak_references.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_weak_references.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/MachO_zero_fill_alignment.s b/llvm/test/ExecutionEngine/JITLink/x86-64/MachO_zero_fill_alignment.s
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/MachO_zero_fill_alignment.s
rename to llvm/test/ExecutionEngine/JITLink/x86-64/MachO_zero_fill_alignment.s
diff --git a/llvm/test/ExecutionEngine/JITLink/X86/lit.local.cfg b/llvm/test/ExecutionEngine/JITLink/x86-64/lit.local.cfg
similarity index 100%
rename from llvm/test/ExecutionEngine/JITLink/X86/lit.local.cfg
rename to llvm/test/ExecutionEngine/JITLink/x86-64/lit.local.cfg
More information about the llvm-commits
mailing list