From bea29fd2ba520a6396e673293026edd123e6aff6 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 18 Sep 2023 22:01:56 -0700 Subject: [PATCH 1/2] FEX: Moves some Linux utils to CommonTools Was kind of in a weird place before. --- Source/CMakeLists.txt | 4 ---- Source/Linux/CMakeLists.txt | 10 ---------- Source/Tools/CommonTools/CMakeLists.txt | 10 +++++++++- .../CommonTools}/Linux/Utils/ELFContainer.cpp | 0 .../{ => Tools/CommonTools}/Linux/Utils/ELFContainer.h | 0 Source/{ => Tools/CommonTools}/Linux/Utils/ELFParser.h | 0 .../CommonTools}/Linux/Utils/ELFSymbolDatabase.cpp | 0 .../CommonTools}/Linux/Utils/ELFSymbolDatabase.h | 0 Source/Tools/FEXLoader/CMakeLists.txt | 1 + Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt | 2 +- 10 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 Source/Linux/CMakeLists.txt rename Source/{ => Tools/CommonTools}/Linux/Utils/ELFContainer.cpp (100%) rename Source/{ => Tools/CommonTools}/Linux/Utils/ELFContainer.h (100%) rename Source/{ => Tools/CommonTools}/Linux/Utils/ELFParser.h (100%) rename Source/{ => Tools/CommonTools}/Linux/Utils/ELFSymbolDatabase.cpp (100%) rename Source/{ => Tools/CommonTools}/Linux/Utils/ELFSymbolDatabase.h (100%) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 9f1a03ed8..23f435815 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1,6 +1,2 @@ add_subdirectory(Common/) add_subdirectory(Tools/) - -if (NOT MINGW_BUILD) - add_subdirectory(Linux/) -endif() diff --git a/Source/Linux/CMakeLists.txt b/Source/Linux/CMakeLists.txt deleted file mode 100644 index 7a86dc1ca..000000000 --- a/Source/Linux/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -set (SRCS - Utils/ELFContainer.cpp - Utils/ELFSymbolDatabase.cpp - ) - -add_library(FEX_Utils OBJECT ${SRCS}) -target_link_libraries(FEX_Utils FEXCore) - -target_include_directories(FEX_Utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Source/) -target_include_directories(FEX_Utils PRIVATE ${CMAKE_BINARY_DIR}/generated) diff --git a/Source/Tools/CommonTools/CMakeLists.txt b/Source/Tools/CommonTools/CMakeLists.txt index a06c85fe8..85abded1d 100644 --- a/Source/Tools/CommonTools/CMakeLists.txt +++ b/Source/Tools/CommonTools/CMakeLists.txt @@ -1,6 +1,14 @@ set(NAME CommonTools) set(SRCS - DummyHandlers.cpp) + DummyHandlers.cpp + ) + +if (NOT MINGW_BUILD) + list(APPEND SRCS + Linux/Utils/ELFContainer.cpp + Linux/Utils/ELFSymbolDatabase.cpp + ) +endif() add_library(${NAME} STATIC ${SRCS}) target_link_libraries(${NAME} FEXCore_Base FEXHeaderUtils) diff --git a/Source/Linux/Utils/ELFContainer.cpp b/Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp similarity index 100% rename from Source/Linux/Utils/ELFContainer.cpp rename to Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp diff --git a/Source/Linux/Utils/ELFContainer.h b/Source/Tools/CommonTools/Linux/Utils/ELFContainer.h similarity index 100% rename from Source/Linux/Utils/ELFContainer.h rename to Source/Tools/CommonTools/Linux/Utils/ELFContainer.h diff --git a/Source/Linux/Utils/ELFParser.h b/Source/Tools/CommonTools/Linux/Utils/ELFParser.h similarity index 100% rename from Source/Linux/Utils/ELFParser.h rename to Source/Tools/CommonTools/Linux/Utils/ELFParser.h diff --git a/Source/Linux/Utils/ELFSymbolDatabase.cpp b/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp similarity index 100% rename from Source/Linux/Utils/ELFSymbolDatabase.cpp rename to Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp diff --git a/Source/Linux/Utils/ELFSymbolDatabase.h b/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h similarity index 100% rename from Source/Linux/Utils/ELFSymbolDatabase.h rename to Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h diff --git a/Source/Tools/FEXLoader/CMakeLists.txt b/Source/Tools/FEXLoader/CMakeLists.txt index 504be93c0..6ad1763a7 100644 --- a/Source/Tools/FEXLoader/CMakeLists.txt +++ b/Source/Tools/FEXLoader/CMakeLists.txt @@ -26,6 +26,7 @@ if (NOT MINGW_BUILD) PRIVATE ${LIBS} LinuxEmulation + CommonTools ${PTHREAD_LIB} fmt::fmt ) diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt b/Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt index a57dcd2fb..194e680c7 100644 --- a/Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt +++ b/Source/Tools/FEXLoader/LinuxSyscalls/CMakeLists.txt @@ -87,7 +87,7 @@ target_link_libraries(LinuxEmulation PRIVATE Common FEXCore - FEX_Utils + CommonTools ) set(HEADERS_TO_VERIFY From 3026f7249c6101baceaf23ebd64a4d43c40cd7c5 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 18 Sep 2023 22:03:29 -0700 Subject: [PATCH 2/2] FEX/Tools/CommonTools/Linux: Adds SPDX identifier --- Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp | 1 + Source/Tools/CommonTools/Linux/Utils/ELFContainer.h | 1 + Source/Tools/CommonTools/Linux/Utils/ELFParser.h | 1 + Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp | 1 + Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h | 1 + 5 files changed, 5 insertions(+) diff --git a/Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp b/Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp index a1b467119..d6f4a8ff7 100644 --- a/Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp +++ b/Source/Tools/CommonTools/Linux/Utils/ELFContainer.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT /* $info$ tags: glue|elf-parsing diff --git a/Source/Tools/CommonTools/Linux/Utils/ELFContainer.h b/Source/Tools/CommonTools/Linux/Utils/ELFContainer.h index 31c8a64d2..3d0f259ea 100644 --- a/Source/Tools/CommonTools/Linux/Utils/ELFContainer.h +++ b/Source/Tools/CommonTools/Linux/Utils/ELFContainer.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #pragma once #include diff --git a/Source/Tools/CommonTools/Linux/Utils/ELFParser.h b/Source/Tools/CommonTools/Linux/Utils/ELFParser.h index d02a97b3f..0106c6523 100644 --- a/Source/Tools/CommonTools/Linux/Utils/ELFParser.h +++ b/Source/Tools/CommonTools/Linux/Utils/ELFParser.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #pragma once #include #include diff --git a/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp b/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp index 97ce786e6..48c19b0dc 100644 --- a/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp +++ b/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT /* $info$ tags: glue|elf-parsing diff --git a/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h b/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h index 14eff9d12..05823dd7b 100644 --- a/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h +++ b/Source/Tools/CommonTools/Linux/Utils/ELFSymbolDatabase.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #pragma once #include