Author: Pavel Labath Date: 2020-02-07T09:51:38-08:00 New Revision: e21b39a86dd6e8d1a5a5fe7e0286f8570732834d
URL: https://github.com/llvm/llvm-project/commit/e21b39a86dd6e8d1a5a5fe7e0286f8570732834d DIFF: https://github.com/llvm/llvm-project/commit/e21b39a86dd6e8d1a5a5fe7e0286f8570732834d.diff LOG: [lldb] Group ABI plugins Summary: There's a fair amount of code duplication between the different ABI plugins for the same architecture (e.g. ABIMacOSX_arm & ABISysV_arm). Deduplicating this code is not very easy at the moment because there is no good place where to put the common code. Instead of creating more plugins, this patch reduces their number by grouping similar plugins into a single folder/plugin. This makes it easy to extract common code to a (e.g.) base class, which can then live in the same folder. The grouping is done based on the underlying llvm target for that architecture, because the plugins already require this for their operation. Reviewers: JDevlieghere, jasonmolenda, jfb Subscribers: sdardis, nemanjai, mgorny, kristof.beyls, fedor.sergeev, kbarton, jrtc27, atanasyan, jsji, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D74138 Added: lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h lldb/source/Plugins/ABI/AArch64/CMakeLists.txt lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp lldb/source/Plugins/ABI/ARC/ABISysV_arc.h lldb/source/Plugins/ABI/ARC/CMakeLists.txt lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp lldb/source/Plugins/ABI/ARM/ABISysV_arm.h lldb/source/Plugins/ABI/ARM/CMakeLists.txt lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp lldb/source/Plugins/ABI/Mips/ABISysV_mips.h lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h lldb/source/Plugins/ABI/Mips/CMakeLists.txt lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp lldb/source/Plugins/ABI/X86/ABISysV_i386.h lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h lldb/source/Plugins/ABI/X86/CMakeLists.txt Modified: lldb/source/API/SystemInitializerFull.cpp lldb/source/Plugins/ABI/CMakeLists.txt lldb/tools/lldb-test/SystemInitializerTest.cpp Removed: lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.cpp lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.h lldb/source/Plugins/ABI/SysV-arc/CMakeLists.txt lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.h lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.h lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.h lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.cpp lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.h lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.cpp lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h lldb/source/Plugins/ABI/Windows-x86_64/CMakeLists.txt ################################################################################ diff --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp index d518c577c7d1..c2cac6659f76 100644 --- a/lldb/source/API/SystemInitializerFull.cpp +++ b/lldb/source/API/SystemInitializerFull.cpp @@ -24,21 +24,21 @@ #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Utility/Timer.h" -#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h" -#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h" -#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h" -#include "Plugins/ABI/SysV-arc/ABISysV_arc.h" -#include "Plugins/ABI/SysV-arm/ABISysV_arm.h" -#include "Plugins/ABI/SysV-arm64/ABISysV_arm64.h" -#include "Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h" -#include "Plugins/ABI/SysV-i386/ABISysV_i386.h" -#include "Plugins/ABI/SysV-mips/ABISysV_mips.h" -#include "Plugins/ABI/SysV-mips64/ABISysV_mips64.h" -#include "Plugins/ABI/SysV-ppc/ABISysV_ppc.h" -#include "Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h" -#include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h" -#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h" -#include "Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h" +#include "Plugins/ABI/AArch64/ABIMacOSX_arm64.h" +#include "Plugins/ABI/AArch64/ABISysV_arm64.h" +#include "Plugins/ABI/ARC/ABISysV_arc.h" +#include "Plugins/ABI/ARM/ABIMacOSX_arm.h" +#include "Plugins/ABI/ARM/ABISysV_arm.h" +#include "Plugins/ABI/Hexagon/ABISysV_hexagon.h" +#include "Plugins/ABI/Mips/ABISysV_mips.h" +#include "Plugins/ABI/Mips/ABISysV_mips64.h" +#include "Plugins/ABI/PowerPC/ABISysV_ppc.h" +#include "Plugins/ABI/PowerPC/ABISysV_ppc64.h" +#include "Plugins/ABI/SystemZ/ABISysV_s390x.h" +#include "Plugins/ABI/X86/ABIMacOSX_i386.h" +#include "Plugins/ABI/X86/ABISysV_i386.h" +#include "Plugins/ABI/X86/ABISysV_x86_64.h" +#include "Plugins/ABI/X86/ABIWindows_x86_64.h" #include "Plugins/Architecture/Arm/ArchitectureArm.h" #include "Plugins/Architecture/Mips/ArchitectureMips.h" #include "Plugins/Architecture/PPC64/ArchitecturePPC64.h" diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp similarity index 100% rename from lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp rename to lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h similarity index 100% rename from lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h rename to lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h diff --git a/lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp rename to lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp diff --git a/lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h rename to lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt similarity index 62% rename from lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt rename to lldb/source/Plugins/ABI/AArch64/CMakeLists.txt index f769d63bcdac..b58a487ee3c2 100644 --- a/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt @@ -1,6 +1,7 @@ -add_lldb_library(lldbPluginABIMacOSX_arm64 PLUGIN +add_lldb_library(lldbPluginABIAArch64 PLUGIN ABIMacOSX_arm64.cpp - + ABISysV_arm64.cpp + LINK_LIBS lldbCore lldbSymbol diff --git a/lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.cpp rename to lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp diff --git a/lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.h b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.h rename to lldb/source/Plugins/ABI/ARC/ABISysV_arc.h diff --git a/lldb/source/Plugins/ABI/SysV-arc/CMakeLists.txt b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt similarity index 74% rename from lldb/source/Plugins/ABI/SysV-arc/CMakeLists.txt rename to lldb/source/Plugins/ABI/ARC/CMakeLists.txt index 3dc0d1c65b46..19421427d4d3 100644 --- a/lldb/source/Plugins/ABI/SysV-arc/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt @@ -1,4 +1,4 @@ -add_lldb_library(lldbPluginABISysV_arc PLUGIN +add_lldb_library(lldbPluginABIARC PLUGIN ABISysV_arc.cpp LINK_LIBS diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp similarity index 100% rename from lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp rename to lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h similarity index 100% rename from lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h rename to lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h diff --git a/lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp rename to lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp diff --git a/lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.h b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.h rename to lldb/source/Plugins/ABI/ARM/ABISysV_arm.h diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt similarity index 70% rename from lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt rename to lldb/source/Plugins/ABI/ARM/CMakeLists.txt index b41814f3237b..87c74b6b217a 100644 --- a/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt @@ -1,5 +1,6 @@ -add_lldb_library(lldbPluginABIMacOSX_arm PLUGIN +add_lldb_library(lldbPluginABIARM PLUGIN ABIMacOSX_arm.cpp + ABISysV_arm.cpp LINK_LIBS lldbCore diff --git a/lldb/source/Plugins/ABI/CMakeLists.txt b/lldb/source/Plugins/ABI/CMakeLists.txt index 37a54479873c..d7cc39be514a 100644 --- a/lldb/source/Plugins/ABI/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/CMakeLists.txt @@ -1,31 +1,5 @@ -if ("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(MacOSX-arm64) - add_subdirectory(SysV-arm64) -endif() -if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(MacOSX-arm) - add_subdirectory(SysV-arm) -endif() -if ("ARC" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(SysV-arc) -endif() -if ("Hexagon" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(SysV-hexagon) -endif() -if ("Mips" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(SysV-mips) - add_subdirectory(SysV-mips64) -endif() -if ("PowerPC" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(SysV-ppc) - add_subdirectory(SysV-ppc64) -endif() -if ("SystemZ" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(SysV-s390x) -endif() -if ("X86" IN_LIST LLVM_TARGETS_TO_BUILD) - add_subdirectory(SysV-i386) - add_subdirectory(SysV-x86_64) - add_subdirectory(MacOSX-i386) - add_subdirectory(Windows-x86_64) -endif() +foreach(target AArch64 ARM ARC Hexagon Mips PowerPC SystemZ X86) + if (${target} IN_LIST LLVM_TARGETS_TO_BUILD) + add_subdirectory(${target}) + endif() +endforeach() diff --git a/lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp rename to lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp diff --git a/lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h rename to lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h diff --git a/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt similarity index 69% rename from lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt rename to lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt index a857fff12399..c985922a7b28 100644 --- a/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt @@ -1,4 +1,4 @@ -add_lldb_library(lldbPluginABISysV_hexagon PLUGIN +add_lldb_library(lldbPluginABIHexagon PLUGIN ABISysV_hexagon.cpp LINK_LIBS diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt b/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt deleted file mode 100644 index 21f153d36e08..000000000000 --- a/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_lldb_library(lldbPluginABIMacOSX_i386 PLUGIN - ABIMacOSX_i386.cpp - - LINK_LIBS - lldbCore - lldbSymbol - lldbTarget - LINK_COMPONENTS - Support - ) diff --git a/lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp diff --git a/lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.h rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips.h diff --git a/lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp diff --git a/lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h diff --git a/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt similarity index 64% rename from lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt rename to lldb/source/Plugins/ABI/Mips/CMakeLists.txt index 5eddfb539f05..7636cee6e19d 100644 --- a/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt @@ -1,4 +1,5 @@ -add_lldb_library(lldbPluginABISysV_mips64 PLUGIN +add_lldb_library(lldbPluginABIMips PLUGIN + ABISysV_mips.cpp ABISysV_mips64.cpp LINK_LIBS diff --git a/lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp diff --git a/lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h diff --git a/lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp diff --git a/lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h diff --git a/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt similarity index 68% rename from lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt rename to lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt index 0a0bb7b8623d..53c663ff48ae 100644 --- a/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt @@ -1,4 +1,5 @@ -add_lldb_library(lldbPluginABISysV_ppc64 PLUGIN +add_lldb_library(lldbPluginABIPowerPC PLUGIN + ABISysV_ppc.cpp ABISysV_ppc64.cpp LINK_LIBS diff --git a/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt deleted file mode 100644 index c5979046d36c..000000000000 --- a/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_lldb_library(lldbPluginABISysV_arm PLUGIN - ABISysV_arm.cpp - - LINK_LIBS - lldbCore - lldbSymbol - lldbTarget - lldbPluginProcessUtility - LINK_COMPONENTS - Support - ) diff --git a/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt deleted file mode 100644 index 077b394823c6..000000000000 --- a/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_lldb_library(lldbPluginABISysV_arm64 PLUGIN - ABISysV_arm64.cpp - - LINK_LIBS - lldbCore - lldbSymbol - lldbTarget - LINK_COMPONENTS - Support - ) diff --git a/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt deleted file mode 100644 index 598b3d03c0f3..000000000000 --- a/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_lldb_library(lldbPluginABISysV_i386 PLUGIN - ABISysV_i386.cpp - - LINK_LIBS - lldbCore - lldbSymbol - lldbTarget - LINK_COMPONENTS - Support - ) diff --git a/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt deleted file mode 100644 index a3266a75ae73..000000000000 --- a/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_lldb_library(lldbPluginABISysV_mips PLUGIN - ABISysV_mips.cpp - - LINK_LIBS - lldbCore - lldbSymbol - lldbTarget - LINK_COMPONENTS - Support - ) diff --git a/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt deleted file mode 100644 index 63bfc4a96cdf..000000000000 --- a/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_lldb_library(lldbPluginABISysV_ppc PLUGIN - ABISysV_ppc.cpp - - LINK_LIBS - lldbCore - lldbSymbol - lldbTarget - LINK_COMPONENTS - Support - ) diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt deleted file mode 100644 index 17644d74ac2f..000000000000 --- a/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_lldb_library(lldbPluginABISysV_x86_64 PLUGIN - ABISysV_x86_64.cpp - - LINK_LIBS - lldbCore - lldbSymbol - lldbTarget - LINK_COMPONENTS - Support - ) diff --git a/lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.cpp rename to lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp diff --git a/lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.h b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.h rename to lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h diff --git a/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt similarity index 69% rename from lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt rename to lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt index f670f0157a6b..8f23da07a69e 100644 --- a/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt @@ -1,4 +1,4 @@ -add_lldb_library(lldbPluginABISysV_s390x PLUGIN +add_lldb_library(lldbPluginABISystemZ PLUGIN ABISysV_s390x.cpp LINK_LIBS diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp similarity index 100% rename from lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp rename to lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h similarity index 100% rename from lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h rename to lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h diff --git a/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp rename to lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp diff --git a/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.h b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.h rename to lldb/source/Plugins/ABI/X86/ABISysV_i386.h diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp similarity index 100% rename from lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp rename to lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h similarity index 100% rename from lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h rename to lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h diff --git a/lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp similarity index 100% rename from lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.cpp rename to lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp diff --git a/lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h similarity index 100% rename from lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h rename to lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h diff --git a/lldb/source/Plugins/ABI/Windows-x86_64/CMakeLists.txt b/lldb/source/Plugins/ABI/X86/CMakeLists.txt similarity index 52% rename from lldb/source/Plugins/ABI/Windows-x86_64/CMakeLists.txt rename to lldb/source/Plugins/ABI/X86/CMakeLists.txt index dab873674115..757abbbd173c 100644 --- a/lldb/source/Plugins/ABI/Windows-x86_64/CMakeLists.txt +++ b/lldb/source/Plugins/ABI/X86/CMakeLists.txt @@ -1,4 +1,7 @@ -add_lldb_library(lldbPluginABIWindows_x86_64 PLUGIN +add_lldb_library(lldbPluginABIX86 PLUGIN + ABIMacOSX_i386.cpp + ABISysV_i386.cpp + ABISysV_x86_64.cpp ABIWindows_x86_64.cpp LINK_LIBS diff --git a/lldb/tools/lldb-test/SystemInitializerTest.cpp b/lldb/tools/lldb-test/SystemInitializerTest.cpp index 5cc998f6031b..08b99274c765 100644 --- a/lldb/tools/lldb-test/SystemInitializerTest.cpp +++ b/lldb/tools/lldb-test/SystemInitializerTest.cpp @@ -14,21 +14,21 @@ #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Utility/Timer.h" -#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h" -#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h" -#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h" -#include "Plugins/ABI/SysV-arc/ABISysV_arc.h" -#include "Plugins/ABI/SysV-arm/ABISysV_arm.h" -#include "Plugins/ABI/SysV-arm64/ABISysV_arm64.h" -#include "Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h" -#include "Plugins/ABI/SysV-i386/ABISysV_i386.h" -#include "Plugins/ABI/SysV-mips/ABISysV_mips.h" -#include "Plugins/ABI/SysV-mips64/ABISysV_mips64.h" -#include "Plugins/ABI/SysV-ppc/ABISysV_ppc.h" -#include "Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h" -#include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h" -#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h" -#include "Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h" +#include "Plugins/ABI/AArch64/ABIMacOSX_arm64.h" +#include "Plugins/ABI/AArch64/ABISysV_arm64.h" +#include "Plugins/ABI/ARC/ABISysV_arc.h" +#include "Plugins/ABI/ARM/ABIMacOSX_arm.h" +#include "Plugins/ABI/ARM/ABISysV_arm.h" +#include "Plugins/ABI/Hexagon/ABISysV_hexagon.h" +#include "Plugins/ABI/Mips/ABISysV_mips.h" +#include "Plugins/ABI/Mips/ABISysV_mips64.h" +#include "Plugins/ABI/PowerPC/ABISysV_ppc.h" +#include "Plugins/ABI/PowerPC/ABISysV_ppc64.h" +#include "Plugins/ABI/SystemZ/ABISysV_s390x.h" +#include "Plugins/ABI/X86/ABIMacOSX_i386.h" +#include "Plugins/ABI/X86/ABISysV_i386.h" +#include "Plugins/ABI/X86/ABISysV_x86_64.h" +#include "Plugins/ABI/X86/ABIWindows_x86_64.h" #include "Plugins/Architecture/Arm/ArchitectureArm.h" #include "Plugins/Architecture/Mips/ArchitectureMips.h" #include "Plugins/Architecture/PPC64/ArchitecturePPC64.h" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
