From 9e6011fd96a469f9f7ecba3309bf4e2db5163d60 Mon Sep 17 00:00:00 2001 From: Eric Sullivan Date: Tue, 26 Oct 2021 11:03:43 -0700 Subject: [PATCH] loader: Update assembly file names to specify their target architecture --- loader/CMakeLists.txt | 4 ++-- loader/{asm_test.S => asm_test_x86.S} | 0 .../{unknown_ext_chain_gas.S => unknown_ext_chain_gas_x86.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename loader/{asm_test.S => asm_test_x86.S} (100%) rename loader/{unknown_ext_chain_gas.S => unknown_ext_chain_gas_x86.S} (100%) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index f55ee0c6..3935cb65 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -224,9 +224,9 @@ else(UNIX AND NOT APPLE) # i.e.: Linux set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS HAVE_CET_H) endif() set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) - try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/asm_test.S) + try_compile(ASSEMBLER_WORKS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/asm_test_x86.S) if(ASSEMBLER_WORKS) - set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas.S) + set(OPT_LOADER_SRCS ${OPT_LOADER_SRCS} unknown_ext_chain_gas_x86.S) add_executable(asm_offset asm_offset.c) target_link_libraries(asm_offset Vulkan::Headers) add_custom_command(OUTPUT gen_defines.asm DEPENDS asm_offset COMMAND asm_offset GAS) diff --git a/loader/asm_test.S b/loader/asm_test_x86.S similarity index 100% rename from loader/asm_test.S rename to loader/asm_test_x86.S diff --git a/loader/unknown_ext_chain_gas.S b/loader/unknown_ext_chain_gas_x86.S similarity index 100% rename from loader/unknown_ext_chain_gas.S rename to loader/unknown_ext_chain_gas_x86.S