From bf501e76b9472af01acff77d8caf6d0b9c347f38 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 Feb 2017 13:33:54 +0000 Subject: [PATCH] refresh of the patches --- debian/patches/lldb-link-atomic-cmake.patch | 16 +++++---- debian/patches/lldb-missing-install.diff | 16 ++++----- debian/patches/lldb-soname.diff | 16 +++++---- .../patches/silent-amdgpu-test-failing.diff | 35 ++++++++++--------- .../silent-test-failing-codeverage.diff | 8 ++--- 5 files changed, 48 insertions(+), 43 deletions(-) diff --git a/debian/patches/lldb-link-atomic-cmake.patch b/debian/patches/lldb-link-atomic-cmake.patch index 4950df32..eee0edaf 100644 --- a/debian/patches/lldb-link-atomic-cmake.patch +++ b/debian/patches/lldb-link-atomic-cmake.patch @@ -6,10 +6,12 @@ Last-Update: 2016-07-27 lldb/cmake/LLDBDependencies.cmake | 6 ++++++ 1 file changed, 6 insertions(+) ---- a/lldb/cmake/LLDBDependencies.cmake -+++ b/lldb/cmake/LLDBDependencies.cmake -@@ -185,6 +185,12 @@ if (LLVM_BUILD_STATIC) - endif() +Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/cmake/LLDBDependencies.cmake +=================================================================== +--- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/cmake/LLDBDependencies.cmake ++++ 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() +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR @@ -18,6 +20,6 @@ Last-Update: 2016-07-27 + list(APPEND LLDB_SYSTEM_LIBS atomic) +endif() + - set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - interpreter + list(APPEND LLDB_SYSTEM_LIBS ${system_libs}) + + if (LLVM_BUILD_STATIC) diff --git a/debian/patches/lldb-missing-install.diff b/debian/patches/lldb-missing-install.diff index 96f38ee9..d8a7b9ae 100644 --- a/debian/patches/lldb-missing-install.diff +++ b/debian/patches/lldb-missing-install.diff @@ -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~svn293876/lldb/tools/argdumper/CMakeLists.txt +--- llvm-toolchain-snapshot_5.0~svn294583.orig/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_ lldbUtility ) +install(TARGETS lldb-argdumper + 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~svn293876/lldb/tools/lldb-server/CMakeLists.txt -@@ -192,3 +192,7 @@ if(NOT LLVM_LINK_LLVM_DYLIB) - endif() +--- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/tools/lldb-server/CMakeLists.txt ++++ llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/lldb-server/CMakeLists.txt +@@ -79,3 +79,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_FRA + ) target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS}) + diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb-soname.diff index c19d7313..e2267c1d 100644 --- a/debian/patches/lldb-soname.diff +++ b/debian/patches/lldb-soname.diff @@ -2,11 +2,13 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---- a/lldb/source/API/CMakeLists.txt -+++ b/lldb/source/API/CMakeLists.txt -@@ -12,7 +12,12 @@ if (LLDB_BUILD_FRAMEWORK AND NOT APPLE) - message(FATAL_ERROR "LLDB.framework cannot be generated unless targeting Apple platforms.") - endif() +Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_5.0~svn294583/lldb/source/API/CMakeLists.txt +@@ -18,7 +18,12 @@ endif() + + get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS) -add_lldb_library(liblldb SHARED +set(output_name lldb) @@ -18,7 +20,7 @@ SBAddress.cpp SBAttachInfo.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 PROPERTIES @@ -27,7 +29,7 @@ ) 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) target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY}) endif() diff --git a/debian/patches/silent-amdgpu-test-failing.diff b/debian/patches/silent-amdgpu-test-failing.diff index 4e15f93c..0b0feb34 100644 --- a/debian/patches/silent-amdgpu-test-failing.diff +++ b/debian/patches/silent-amdgpu-test-failing.diff @@ -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~svn293997/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~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll @@ -2,5 +2,6 @@ ; 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: * !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~svn293997/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~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll @@ -2,6 +2,7 @@ ; 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: * !opencl.ocl.version = !{!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~svn293997/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~svn294583/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll @@ -2,6 +2,7 @@ ; 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: * !opencl.ocl.version = !{!0} !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~svn293997/test/CodeGen/AMDGPU/runtime-metadata.ll -@@ -1,5 +1,6 @@ - ; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -o - < %s | llvm-readobj -amdgpu-runtime-metadata -elf-output-style=GNU -notes | FileCheck %s --check-prefix=NOTES +--- llvm-toolchain-snapshot_5.0~svn294583.orig/test/CodeGen/AMDGPU/runtime-metadata.ll ++++ llvm-toolchain-snapshot_5.0~svn294583/test/CodeGen/AMDGPU/runtime-metadata.ll +@@ -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 --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 +; XFAIL: * diff --git a/debian/patches/silent-test-failing-codeverage.diff b/debian/patches/silent-test-failing-codeverage.diff index ccc98018..a26e0404 100644 --- a/debian/patches/silent-test-failing-codeverage.diff +++ b/debian/patches/silent-test-failing-codeverage.diff @@ -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-4.0~svn290518/test/ThinLTO/X86/autoupgrade.ll -@@ -11,6 +11,8 @@ +--- llvm-toolchain-snapshot_5.0~svn294583.orig/test/ThinLTO/X86/autoupgrade.ll ++++ llvm-toolchain-snapshot_5.0~svn294583/test/ThinLTO/X86/autoupgrade.ll +@@ -14,6 +14,8 @@ ; CHECK: record string = 'llvm.invariant.start.p0i8' ; CHECK-NOT: 'llvm.invariant.start'