Skip to content

Commit 3f85170

Browse files
committed
Move new lld's code to Common subdirectory.
New lld's files are spread under lib subdirectory, and it isn't easy to find which files are actually maintained. This patch moves maintained files to Common subdirectory. Differential Revision: https://reviews.llvm.org/D37645 llvm-svn: 314719
1 parent e2ff2ba commit 3f85170

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+94
-91
lines changed

lld/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ endif ()
160160

161161
# Configure the Version.inc file.
162162
configure_file(
163-
${CMAKE_CURRENT_SOURCE_DIR}/include/lld/Config/Version.inc.in
164-
${CMAKE_CURRENT_BINARY_DIR}/include/lld/Config/Version.inc)
163+
${CMAKE_CURRENT_SOURCE_DIR}/include/lld/Common/Version.inc.in
164+
${CMAKE_CURRENT_BINARY_DIR}/include/lld/Common/Version.inc)
165165

166166

167167
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
@@ -210,6 +210,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
210210
)
211211
endif()
212212

213+
add_subdirectory(Common)
213214
add_subdirectory(lib)
214215
add_subdirectory(tools/lld)
215216

lld/COFF/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ add_lld_library(lldCOFF
4242
WindowsManifest
4343

4444
LINK_LIBS
45+
lldCommon
4546
lldCore
4647
${LLVM_PTHREAD_LIB}
4748

lld/COFF/Chunks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "Config.h"
1414
#include "InputFiles.h"
15-
#include "lld/Core/LLVM.h"
15+
#include "lld/Common/LLVM.h"
1616
#include "llvm/ADT/ArrayRef.h"
1717
#include "llvm/ADT/iterator.h"
1818
#include "llvm/ADT/iterator_range.h"

lld/COFF/Driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "SymbolTable.h"
1616
#include "Symbols.h"
1717
#include "Writer.h"
18-
#include "lld/Driver/Driver.h"
18+
#include "lld/Common/Driver.h"
1919
#include "llvm/ADT/Optional.h"
2020
#include "llvm/ADT/StringSwitch.h"
2121
#include "llvm/BinaryFormat/Magic.h"

lld/COFF/Driver.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include "Config.h"
1414
#include "SymbolTable.h"
15-
#include "lld/Core/LLVM.h"
16-
#include "lld/Core/Reproduce.h"
15+
#include "lld/Common/LLVM.h"
16+
#include "lld/Common/Reproduce.h"
1717
#include "llvm/ADT/Optional.h"
1818
#include "llvm/ADT/StringRef.h"
1919
#include "llvm/Object/Archive.h"

lld/COFF/Error.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifndef LLD_COFF_ERROR_H
1111
#define LLD_COFF_ERROR_H
1212

13-
#include "lld/Core/LLVM.h"
13+
#include "lld/Common/LLVM.h"
1414
#include "llvm/Support/Error.h"
1515

1616
namespace lld {

lld/COFF/InputFiles.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define LLD_COFF_INPUT_FILES_H
1212

1313
#include "Config.h"
14-
#include "lld/Core/LLVM.h"
14+
#include "lld/Common/LLVM.h"
1515
#include "llvm/ADT/ArrayRef.h"
1616
#include "llvm/ADT/DenseSet.h"
1717
#include "llvm/LTO/LTO.h"

lld/COFF/LTO.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "Error.h"
1313
#include "InputFiles.h"
1414
#include "Symbols.h"
15-
#include "lld/Core/TargetOptionsCommandFlags.h"
15+
#include "lld/Common/TargetOptionsCommandFlags.h"
1616
#include "llvm/ADT/STLExtras.h"
1717
#include "llvm/ADT/SmallString.h"
1818
#include "llvm/ADT/StringRef.h"

lld/COFF/LTO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#ifndef LLD_COFF_LTO_H
2222
#define LLD_COFF_LTO_H
2323

24-
#include "lld/Core/LLVM.h"
24+
#include "lld/Common/LLVM.h"
2525
#include "llvm/ADT/SmallString.h"
2626
#include <memory>
2727
#include <vector>

lld/COFF/Symbols.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "Chunks.h"
1414
#include "Config.h"
1515
#include "Memory.h"
16-
#include "lld/Core/LLVM.h"
16+
#include "lld/Common/LLVM.h"
1717
#include "llvm/ADT/ArrayRef.h"
1818
#include "llvm/Object/Archive.h"
1919
#include "llvm/Object/COFF.h"

0 commit comments

Comments
 (0)