refresh of the patches

This commit is contained in:
Sylvestre Ledru 2017-02-09 13:33:54 +00:00
parent 443de7ae2c
commit bf501e76b9
5 changed files with 48 additions and 43 deletions

View File

@ -6,10 +6,12 @@ Last-Update: 2016-07-27
lldb/cmake/LLDBDependencies.cmake | 6 ++++++ lldb/cmake/LLDBDependencies.cmake | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
--- a/lldb/cmake/LLDBDependencies.cmake Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/cmake/LLDBDependencies.cmake
+++ b/lldb/cmake/LLDBDependencies.cmake ===================================================================
@@ -185,6 +185,12 @@ if (LLVM_BUILD_STATIC) --- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/cmake/LLDBDependencies.cmake
endif() +++ llvm-toolchain-snapshot_5.0~svn294583/lldb/cmake/LLDBDependencies.cmake
@@ -28,6 +28,12 @@ if (NOT LLDB_DISABLE_PYTHON AND NOT LLVM
list(APPEND LLDB_SYSTEM_LIBS ${PYTHON_LIBRARIES})
endif() endif()
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR
@ -18,6 +20,6 @@ Last-Update: 2016-07-27
+ list(APPEND LLDB_SYSTEM_LIBS atomic) + list(APPEND LLDB_SYSTEM_LIBS atomic)
+endif() +endif()
+ +
set(LLVM_LINK_COMPONENTS list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
${LLVM_TARGETS_TO_BUILD}
interpreter if (LLVM_BUILD_STATIC)

View File

@ -1,19 +1,19 @@
Index: llvm-toolchain-snapshot_5.0~svn293876/lldb/tools/argdumper/CMakeLists.txt Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/argdumper/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293876.orig/lldb/tools/argdumper/CMakeLists.txt --- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn293876/lldb/tools/argdumper/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/argdumper/CMakeLists.txt
@@ -8,3 +8,5 @@ add_lldb_tool(lldb-argdumper INCLUDE_IN_ @@ -8,3 +8,5 @@ add_lldb_tool(lldb-argdumper INCLUDE_IN_
lldbUtility lldbUtility
) )
+install(TARGETS lldb-argdumper +install(TARGETS lldb-argdumper
+ RUNTIME DESTINATION bin) + RUNTIME DESTINATION bin)
Index: llvm-toolchain-snapshot_5.0~svn293876/lldb/tools/lldb-server/CMakeLists.txt Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/lldb-server/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293876.orig/lldb/tools/lldb-server/CMakeLists.txt --- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn293876/lldb/tools/lldb-server/CMakeLists.txt +++ llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/lldb-server/CMakeLists.txt
@@ -192,3 +192,7 @@ if(NOT LLVM_LINK_LLVM_DYLIB) @@ -79,3 +79,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_FRA
endif() )
target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS}) target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})
+ +

View File

@ -2,11 +2,13 @@
lldb/source/API/CMakeLists.txt | 14 +++++++------- lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-) 1 file changed, 7 insertions(+), 7 deletions(-)
--- a/lldb/source/API/CMakeLists.txt Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt
+++ b/lldb/source/API/CMakeLists.txt ===================================================================
@@ -12,7 +12,12 @@ if (LLDB_BUILD_FRAMEWORK AND NOT APPLE) --- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/source/API/CMakeLists.txt
message(FATAL_ERROR "LLDB.framework cannot be generated unless targeting Apple platforms.") +++ llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt
endif() @@ -18,7 +18,12 @@ endif()
get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS)
-add_lldb_library(liblldb SHARED -add_lldb_library(liblldb SHARED
+set(output_name lldb) +set(output_name lldb)
@ -18,7 +20,7 @@
SBAddress.cpp SBAddress.cpp
SBAttachInfo.cpp SBAttachInfo.cpp
SBBlock.cpp SBBlock.cpp
@@ -95,7 +100,7 @@ target_link_libraries(liblldb PRIVATE @@ -116,7 +121,7 @@ target_link_libraries(liblldb PRIVATE
set_target_properties(liblldb set_target_properties(liblldb
PROPERTIES PROPERTIES
@ -27,7 +29,7 @@
) )
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -119,11 +124,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" @@ -140,11 +145,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
if (MSVC AND NOT LLDB_DISABLE_PYTHON) if (MSVC AND NOT LLDB_DISABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY}) target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
endif() endif()

View File

@ -1,44 +1,45 @@
Index: llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll Index: llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293997.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll --- llvm-toolchain-snapshot_5.0~svn294583.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
+++ llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll +++ llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
@@ -2,5 +2,6 @@ @@ -2,5 +2,6 @@
; check llc does not crash for invalid opencl version metadata ; check llc does not crash for invalid opencl version metadata
; CHECK: { amd.MDVersion: [ 2, 0 ] } ; CHECK: { amd.MDVersion: [ 2, 1 ], amd.IsaInfo: { amd.IsaInfoWavefrontSize: 64, amd.IsaInfoLocalMemorySize: 65536, amd.IsaInfoEUsPerCU: 4, amd.IsaInfoMaxWavesPerEU: 10, amd.IsaInfoMaxFlatWorkGroupSize: 2048, amd.IsaInfoSGPRAllocGranule: 8, amd.IsaInfoTotalNumSGPRs: 512, amd.IsaInfoAddressableNumSGPRs: 104, amd.IsaInfoVGPRAllocGranule: 4, amd.IsaInfoTotalNumVGPRs: 256, amd.IsaInfoAddressableNumVGPRs: 256 } }
+; XFAIL: * +; XFAIL: *
!opencl.ocl.version = !{} !opencl.ocl.version = !{}
Index: llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll Index: llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293997.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll --- llvm-toolchain-snapshot_5.0~svn294583.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
+++ llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll +++ llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
; check llc does not crash for invalid opencl version metadata ; check llc does not crash for invalid opencl version metadata
; CHECK: { amd.MDVersion: [ 2, 0 ] } ; CHECK: { amd.MDVersion: [ 2, 1 ], amd.IsaInfo: { amd.IsaInfoWavefrontSize: 64, amd.IsaInfoLocalMemorySize: 65536, amd.IsaInfoEUsPerCU: 4, amd.IsaInfoMaxWavesPerEU: 10, amd.IsaInfoMaxFlatWorkGroupSize: 2048, amd.IsaInfoSGPRAllocGranule: 8, amd.IsaInfoTotalNumSGPRs: 512, amd.IsaInfoAddressableNumSGPRs: 104, amd.IsaInfoVGPRAllocGranule: 4, amd.IsaInfoTotalNumVGPRs: 256, amd.IsaInfoAddressableNumVGPRs: 256 } }
+; XFAIL: * +; XFAIL: *
!opencl.ocl.version = !{!0} !opencl.ocl.version = !{!0}
!0 = !{} !0 = !{}
Index: llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll Index: llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293997.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll --- llvm-toolchain-snapshot_5.0~svn294583.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
+++ llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll +++ llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
; check llc does not crash for invalid opencl version metadata ; check llc does not crash for invalid opencl version metadata
; CHECK: { amd.MDVersion: [ 2, 0 ] } ; CHECK: { amd.MDVersion: [ 2, 1 ], amd.IsaInfo: { amd.IsaInfoWavefrontSize: 64, amd.IsaInfoLocalMemorySize: 65536, amd.IsaInfoEUsPerCU: 4, amd.IsaInfoMaxWavesPerEU: 10, amd.IsaInfoMaxFlatWorkGroupSize: 2048, amd.IsaInfoSGPRAllocGranule: 8, amd.IsaInfoTotalNumSGPRs: 512, amd.IsaInfoAddressableNumSGPRs: 104, amd.IsaInfoVGPRAllocGranule: 4, amd.IsaInfoTotalNumVGPRs: 256, amd.IsaInfoAddressableNumVGPRs: 256 } }
+; XFAIL: * +; XFAIL: *
!opencl.ocl.version = !{!0} !opencl.ocl.version = !{!0}
!0 = !{i32 1} !0 = !{i32 1}
Index: llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/runtime-metadata.ll Index: llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/runtime-metadata.ll
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn293997.orig/test/CodeGen/AMDGPU/runtime-metadata.ll --- llvm-toolchain-snapshot_5.0~svn294583.orig/test/CodeGen/AMDGPU/runtime-metadata.ll
+++ llvm-toolchain-snapshot_5.0~svn293997/test/CodeGen/AMDGPU/runtime-metadata.ll +++ llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/runtime-metadata.ll
@@ -1,5 +1,6 @@ @@ -1,6 +1,7 @@
; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -o - < %s | llvm-readobj -amdgpu-runtime-metadata -elf-output-style=GNU -notes | FileCheck %s --check-prefix=NOTES ; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -o - < %s | llvm-readobj -amdgpu-runtime-metadata -elf-output-style=GNU -notes | FileCheck %s --check-prefix=NOTES --check-prefix=SI
; RUN: llc -mtriple=amdgcn--amdhsa -mcpu=fiji -filetype=obj -o - < %s | llvm-readobj -amdgpu-runtime-metadata -elf-output-style=GNU -notes | FileCheck %s --check-prefix=NOTES --check-prefix=VI
; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -amdgpu-dump-rtmd -amdgpu-check-rtmd-parser %s -o - 2>&1 | FileCheck --check-prefix=CHECK --check-prefix=PARSER %s ; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -amdgpu-dump-rtmd -amdgpu-check-rtmd-parser %s -o - 2>&1 | FileCheck --check-prefix=CHECK --check-prefix=PARSER %s
+; XFAIL: * +; XFAIL: *

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot-4.0~svn290518/test/ThinLTO/X86/autoupgrade.ll Index: llvm-toolchain-snapshot_5.0~svn294583/test/ThinLTO/X86/autoupgrade.ll
=================================================================== ===================================================================
--- llvm-toolchain-snapshot-4.0~svn290518.orig/test/ThinLTO/X86/autoupgrade.ll --- llvm-toolchain-snapshot_5.0~svn294583.orig/test/ThinLTO/X86/autoupgrade.ll
+++ llvm-toolchain-snapshot-4.0~svn290518/test/ThinLTO/X86/autoupgrade.ll +++ llvm-toolchain-snapshot_5.0~svn294583/test/ThinLTO/X86/autoupgrade.ll
@@ -11,6 +11,8 @@ @@ -14,6 +14,8 @@
; CHECK: record string = 'llvm.invariant.start.p0i8' ; CHECK: record string = 'llvm.invariant.start.p0i8'
; CHECK-NOT: 'llvm.invariant.start' ; CHECK-NOT: 'llvm.invariant.start'