rebase of the patch

This commit is contained in:
Sylvestre Ledru 2019-06-08 09:49:01 +02:00
parent 1c403b70c0
commit e0a803917a
2 changed files with 12 additions and 12 deletions

View File

@ -3,12 +3,12 @@
tools/llvm-shlib/CMakeLists.txt | 1 + tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_9~svn355786/clang/tools/libclang/CMakeLists.txt Index: llvm-toolchain-snapshot_9~svn362869/clang/tools/libclang/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_9~svn355786.orig/clang/tools/libclang/CMakeLists.txt --- llvm-toolchain-snapshot_9~svn362869.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn355786/clang/tools/libclang/CMakeLists.txt +++ llvm-toolchain-snapshot_9~svn362869/clang/tools/libclang/CMakeLists.txt
@@ -89,7 +89,7 @@ else() @@ -94,7 +94,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE
set(output_name "clang") remove_definitions("-D_XOPEN_SOURCE=700")
endif() endif()
-add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} -add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC}
@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_9~svn355786/clang/tools/libclang/CMakeLists.txt
OUTPUT_NAME ${output_name} OUTPUT_NAME ${output_name}
${SOURCES} ${SOURCES}
DEPENDS clang-resource-headers DEPENDS clang-resource-headers
Index: llvm-toolchain-snapshot_9~svn355786/tools/llvm-shlib/CMakeLists.txt Index: llvm-toolchain-snapshot_9~svn362869/tools/llvm-shlib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_9~svn355786.orig/tools/llvm-shlib/CMakeLists.txt --- llvm-toolchain-snapshot_9~svn362869.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn355786/tools/llvm-shlib/CMakeLists.txt +++ llvm-toolchain-snapshot_9~svn362869/tools/llvm-shlib/CMakeLists.txt
@@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB) @@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-8-8.0.1~+rc1/lib/Support/Triple.cpp Index: llvm-toolchain-snapshot_9~svn362869/lib/Support/Triple.cpp
=================================================================== ===================================================================
--- llvm-toolchain-8-8.0.1~+rc1.orig/lib/Support/Triple.cpp --- llvm-toolchain-snapshot_9~svn362869.orig/lib/Support/Triple.cpp
+++ llvm-toolchain-8-8.0.1~+rc1/lib/Support/Triple.cpp +++ llvm-toolchain-snapshot_9~svn362869/lib/Support/Triple.cpp
@@ -1620,7 +1620,7 @@ StringRef Triple::getARMCPUForArch(Strin @@ -1644,7 +1644,7 @@ StringRef Triple::getARMCPUForArch(Strin
case llvm::Triple::EABIHF: case llvm::Triple::EABIHF:
case llvm::Triple::GNUEABIHF: case llvm::Triple::GNUEABIHF:
case llvm::Triple::MuslEABIHF: case llvm::Triple::MuslEABIHF: