From 8a289207735f6c23a01dc289d3964dae05913a24 Mon Sep 17 00:00:00 2001
From: Alessandro Di Federico <ale@rev.ng>
Date: Wed, 6 May 2026 10:18:12 +0200
Subject: [PATCH] Move *LDDTree* to Model/Importer/Binary

---
 lib/Model/Importer/Binary/CMakeLists.txt                       | 2 ++
 lib/{Support => Model/Importer/Binary}/ELFLDDTree.cpp          | 0
 .../Importer/Binary}/LDDTreeObjectFileTraits.h                 | 0
 lib/{Support => Model/Importer/Binary}/PECOFFLDDTree.cpp       | 0
 lib/Support/CMakeLists.txt                                     | 2 --
 lib/Support/Configuration.cpp                                  | 3 +--
 tools/lddtree/CMakeLists.txt                                   | 3 ++-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/{Support => Model/Importer/Binary}/ELFLDDTree.cpp (100%)
 rename lib/{Support => Model/Importer/Binary}/LDDTreeObjectFileTraits.h (100%)
 rename lib/{Support => Model/Importer/Binary}/PECOFFLDDTree.cpp (100%)

diff --git a/lib/Model/Importer/Binary/CMakeLists.txt b/lib/Model/Importer/Binary/CMakeLists.txt
index 119b02723..0f3a972ff 100644
--- a/lib/Model/Importer/Binary/CMakeLists.txt
+++ b/lib/Model/Importer/Binary/CMakeLists.txt
@@ -7,9 +7,11 @@ revng_add_analyses_library_internal(
   BinaryImporter.cpp
   BinaryImporterHelper.cpp
   ELFImporter.cpp
+  ELFLDDTree.cpp
   MachOImporter.cpp
   Options.cpp
   PECOFFImporter.cpp
+  PECOFFLDDTree.cpp
   ImportBinaryAnalysis.cpp)
 
 llvm_map_components_to_libnames(LLVM_LIBRARIES Object)
diff --git a/lib/Support/ELFLDDTree.cpp b/lib/Model/Importer/Binary/ELFLDDTree.cpp
similarity index 100%
rename from lib/Support/ELFLDDTree.cpp
rename to lib/Model/Importer/Binary/ELFLDDTree.cpp
diff --git a/lib/Support/LDDTreeObjectFileTraits.h b/lib/Model/Importer/Binary/LDDTreeObjectFileTraits.h
similarity index 100%
rename from lib/Support/LDDTreeObjectFileTraits.h
rename to lib/Model/Importer/Binary/LDDTreeObjectFileTraits.h
diff --git a/lib/Support/PECOFFLDDTree.cpp b/lib/Model/Importer/Binary/PECOFFLDDTree.cpp
similarity index 100%
rename from lib/Support/PECOFFLDDTree.cpp
rename to lib/Model/Importer/Binary/PECOFFLDDTree.cpp
diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
index dd86e5fe6..1126c7277 100644
--- a/lib/Support/CMakeLists.txt
+++ b/lib/Support/CMakeLists.txt
@@ -14,7 +14,6 @@ revng_add_library_internal(
   CommonOptions.cpp
   CustomizedLLVMPasses.cpp
   Debug.cpp
-  ELFLDDTree.cpp
   ExplicitSpecializations.cpp
   FileSystem.cpp
   InitRevng.cpp
@@ -23,7 +22,6 @@ revng_add_library_internal(
   ModuleStatistics.cpp
   OnQuit.cpp
   PathList.cpp
-  PECOFFLDDTree.cpp
   Progress.cpp
   ResourceFinder.cpp
   Statistics.cpp
diff --git a/lib/Support/Configuration.cpp b/lib/Support/Configuration.cpp
index 61a9f7f23..424861188 100644
--- a/lib/Support/Configuration.cpp
+++ b/lib/Support/Configuration.cpp
@@ -17,13 +17,12 @@ extern "C" {
 #include "revng/ADT/STLExtras.h"
 #include "revng/Model/OperatingSystem.h"
 #include "revng/Support/Configuration.h"
+#include "revng/Support/FileSystem.h"
 #include "revng/Support/Generator.h"
 #include "revng/Support/PathList.h"
 #include "revng/Support/WindowsApiSetSchemaParser.h"
 #include "revng/Support/YAMLTraits.h"
 
-#include "LDDTreeObjectFileTraits.h"
-
 using namespace llvm;
 using yaml::IO;
 using yaml::MappingTraits;
diff --git a/tools/lddtree/CMakeLists.txt b/tools/lddtree/CMakeLists.txt
index 9faf83d3c..3c76f948a 100644
--- a/tools/lddtree/CMakeLists.txt
+++ b/tools/lddtree/CMakeLists.txt
@@ -4,4 +4,5 @@
 
 revng_add_executable(lddtree Main.cpp)
 
-target_link_libraries(lddtree revngSupport ${LLVM_LIBRARIES})
+target_link_libraries(lddtree revngModelImporterBinary revngSupport
+                      ${LLVM_LIBRARIES})