diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-09 21:23:48 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-09 21:23:48 +0000 |
commit | b047fead11133644be3dbae34b85be39ce2819e9 (patch) | |
tree | 3e7f6a4c9e5ffd7af6044225e9be2962e4d8eabf /lib | |
parent | c09ce7fd2d62d85dcdf370f4bef732380fca4f1b (diff) | |
download | src-b047fead11133644be3dbae34b85be39ce2819e9.tar.gz src-b047fead11133644be3dbae34b85be39ce2819e9.zip |
Vendor import of lld trunk r291476:vendor/lld/lld-trunk-r291476
Notes
Notes:
svn path=/vendor/lld/dist/; revision=311826
svn path=/vendor/lld/lld-trunk-r291476/; revision=311827; tag=vendor/lld/lld-trunk-r291476
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Config/CMakeLists.txt | 4 | ||||
-rw-r--r-- | lib/Core/CMakeLists.txt | 4 | ||||
-rw-r--r-- | lib/Core/Reproduce.cpp | 12 | ||||
-rw-r--r-- | lib/Driver/CMakeLists.txt | 8 | ||||
-rw-r--r-- | lib/ReaderWriter/CMakeLists.txt | 6 | ||||
-rw-r--r-- | lib/ReaderWriter/MachO/CMakeLists.txt | 11 | ||||
-rw-r--r-- | lib/ReaderWriter/YAML/CMakeLists.txt | 5 |
7 files changed, 25 insertions, 25 deletions
diff --git a/lib/Config/CMakeLists.txt b/lib/Config/CMakeLists.txt index e971b0b7aa62..3e142b66f578 100644 --- a/lib/Config/CMakeLists.txt +++ b/lib/Config/CMakeLists.txt @@ -4,6 +4,6 @@ add_lld_library(lldConfig ADDITIONAL_HEADER_DIRS ${LLD_INCLUDE_DIR}/lld/Config - LINK_LIBS - LLVMSupport + LINK_COMPONENTS + Support ) diff --git a/lib/Core/CMakeLists.txt b/lib/Core/CMakeLists.txt index d89ca4a63d72..7f4c47f14b90 100644 --- a/lib/Core/CMakeLists.txt +++ b/lib/Core/CMakeLists.txt @@ -12,6 +12,6 @@ add_lld_library(lldCore ADDITIONAL_HEADER_DIRS ${LLD_INCLUDE_DIR}/lld/Core - LINK_LIBS - LLVMSupport + LINK_COMPONENTS + Support ) diff --git a/lib/Core/Reproduce.cpp b/lib/Core/Reproduce.cpp index ab7261fa0e75..e3629a93cbe3 100644 --- a/lib/Core/Reproduce.cpp +++ b/lib/Core/Reproduce.cpp @@ -39,7 +39,7 @@ std::string lld::relativeToRoot(StringRef Path) { Res = Root.substr(2); path::append(Res, path::relative_path(Abs)); - return convertToUnixPathSeparator(Res); + return path::convert_to_slash(Res); } // Quote a given string if it contains a space character. @@ -64,13 +64,3 @@ std::string lld::toString(opt::Arg *Arg) { return K + V; return K + " " + V; } - -std::string lld::convertToUnixPathSeparator(StringRef S) { -#ifdef LLVM_ON_WIN32 - std::string Ret = S.str(); - std::replace(Ret.begin(), Ret.end(), '\\', '/'); - return Ret; -#else - return S; -#endif -} diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt index 1bd1f2125816..be75872869e6 100644 --- a/lib/Driver/CMakeLists.txt +++ b/lib/Driver/CMakeLists.txt @@ -8,15 +8,17 @@ add_lld_library(lldDriver ADDITIONAL_HEADER_DIRS ${LLD_INCLUDE_DIR}/lld/Driver + LINK_COMPONENTS + Object + Option + Support + LINK_LIBS lldConfig lldMachO lldCore lldReaderWriter lldYAML - LLVMObject - LLVMOption - LLVMSupport ) add_dependencies(lldDriver DriverOptionsTableGen) diff --git a/lib/ReaderWriter/CMakeLists.txt b/lib/ReaderWriter/CMakeLists.txt index 4408d9c18b8b..8751d569b754 100644 --- a/lib/ReaderWriter/CMakeLists.txt +++ b/lib/ReaderWriter/CMakeLists.txt @@ -11,9 +11,11 @@ add_lld_library(lldReaderWriter ADDITIONAL_HEADER_DIRS ${LLD_INCLUDE_DIR}/lld/ReaderWriter + LINK_COMPONENTS + Object + Support + LINK_LIBS lldCore lldYAML - LLVMObject - LLVMSupport ) diff --git a/lib/ReaderWriter/MachO/CMakeLists.txt b/lib/ReaderWriter/MachO/CMakeLists.txt index 6a1064d6dfb5..3b0698525aa5 100644 --- a/lib/ReaderWriter/MachO/CMakeLists.txt +++ b/lib/ReaderWriter/MachO/CMakeLists.txt @@ -18,13 +18,16 @@ add_lld_library(lldMachO StubsPass.cpp TLVPass.cpp WriterMachO.cpp + + LINK_COMPONENTS + DebugInfoDWARF + Object + Support + Demangle + LINK_LIBS lldCore lldYAML - LLVMDebugInfoDWARF - LLVMObject - LLVMSupport - LLVMDemangle ${PTHREAD_LIB} ) diff --git a/lib/ReaderWriter/YAML/CMakeLists.txt b/lib/ReaderWriter/YAML/CMakeLists.txt index 5c25444e5dbc..0e63574a63d2 100644 --- a/lib/ReaderWriter/YAML/CMakeLists.txt +++ b/lib/ReaderWriter/YAML/CMakeLists.txt @@ -1,6 +1,9 @@ add_lld_library(lldYAML ReaderWriterYAML.cpp + + LINK_COMPONENTS + Support + LINK_LIBS lldCore - LLVMSupport ) |