From d19a8c1ee541891173a288a61ebc71ba91c142e0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 5 Mar 2018 13:54:52 +0100 Subject: [PATCH 1/4] Fix a typo --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 226189a6..fcb33be2 100644 --- a/debian/control +++ b/debian/control @@ -71,7 +71,7 @@ Description: Tool to format C/C++/Obj-C code Package: clang-tidy-6.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - libllvm6.0 (= ${binary:Version}), libclang-common-6.0-dev + libllvm6.0 (= ${binary:Version}), libclang-common-6.0-dev, clang-tools-6.0 Replaces: clang-modernize-6.0, clang-6.0 (<< 1:6.0~svn250696-1) Breaks: clang-modernize-6.0, clang-6.0 (<< 1:6.0~svn250696-1) From 62113065116f625ac676ae1db62c6dd12389615c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 17 Mar 2018 17:07:31 +0100 Subject: [PATCH 2/4] Remove a bunch of old unused patches --- debian/changelog | 6 + ...ifyCFG-Hoisting-invalidates-metadata.patch | 84 --- debian/patches/0021-shared-lib-debian.patch | 26 - debian/patches/0023-link-libopagent.patch | 33 -- debian/patches/31-powerpcspe.diff | 15 - debian/patches/34-powerpc-no-altivec.diff | 24 - debian/patches/clang-apply-replacements.diff | 35 -- ...default-to-i686-on-32bit-x86-targets.patch | 15 - debian/patches/compiler-rt-i586.diff | 34 -- debian/patches/disable-execinfo-usage.diff | 13 - debian/patches/follow-parallel-var.diff | 16 - debian/patches/force-link-pass.o.diff | 28 - debian/patches/gcc-7.1-workaround.diff | 0 debian/patches/lld-arg-cmake-issue.diff | 141 ----- debian/patches/pthread-link.diff | 18 - debian/patches/scan-build-py-default.diff | 518 ------------------ .../patches/silent-amdgpu-test-failing.diff | 46 -- 17 files changed, 6 insertions(+), 1046 deletions(-) delete mode 100644 debian/patches/0011-SimplifyCFG-Hoisting-invalidates-metadata.patch delete mode 100644 debian/patches/0021-shared-lib-debian.patch delete mode 100644 debian/patches/0023-link-libopagent.patch delete mode 100644 debian/patches/31-powerpcspe.diff delete mode 100644 debian/patches/34-powerpc-no-altivec.diff delete mode 100644 debian/patches/clang-apply-replacements.diff delete mode 100644 debian/patches/clang-default-to-i686-on-32bit-x86-targets.patch delete mode 100644 debian/patches/compiler-rt-i586.diff delete mode 100644 debian/patches/disable-execinfo-usage.diff delete mode 100644 debian/patches/follow-parallel-var.diff delete mode 100644 debian/patches/force-link-pass.o.diff delete mode 100644 debian/patches/gcc-7.1-workaround.diff delete mode 100644 debian/patches/lld-arg-cmake-issue.diff delete mode 100644 debian/patches/pthread-link.diff delete mode 100644 debian/patches/scan-build-py-default.diff delete mode 100644 debian/patches/silent-amdgpu-test-failing.diff diff --git a/debian/changelog b/debian/changelog index 9060f6bc..654fbd77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-6.0 (1:6.0-3) unstable; urgency=medium + + * Remove a bunch of old unused patches + + -- Sylvestre Ledru Sat, 17 Mar 2018 17:07:19 +0100 + llvm-toolchain-6.0 (1:6.0-2) unstable; urgency=medium * clang-tidy-6.0: depends on libclang-common-6.0-dev diff --git a/debian/patches/0011-SimplifyCFG-Hoisting-invalidates-metadata.patch b/debian/patches/0011-SimplifyCFG-Hoisting-invalidates-metadata.patch deleted file mode 100644 index b184a402..00000000 --- a/debian/patches/0011-SimplifyCFG-Hoisting-invalidates-metadata.patch +++ /dev/null @@ -1,84 +0,0 @@ -From eee68eafa7e8e4ce996b49f5551636639a6c331a Mon Sep 17 00:00:00 2001 -From: David Majnemer -Date: Mon, 29 Aug 2016 17:14:08 +0000 -Subject: [PATCH 11/17] [SimplifyCFG] Hoisting invalidates metadata - -We forgot to remove optimization metadata when performing hosting during -FoldTwoEntryPHINode. - -This fixes PR29163. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@279980 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Transforms/Utils/SimplifyCFG.cpp | 10 ++++++++-- - test/Transforms/SimplifyCFG/PR29163.ll | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 39 insertions(+), 2 deletions(-) - create mode 100644 test/Transforms/SimplifyCFG/PR29163.ll - -diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp -index 0504646..c197317 100644 ---- a/lib/Transforms/Utils/SimplifyCFG.cpp -+++ b/lib/Transforms/Utils/SimplifyCFG.cpp -@@ -2024,14 +2024,20 @@ static bool FoldTwoEntryPHINode(PHINode *PN, const TargetTransformInfo &TTI, - - // Move all 'aggressive' instructions, which are defined in the - // conditional parts of the if's up to the dominating block. -- if (IfBlock1) -+ if (IfBlock1) { -+ for (auto &I : *IfBlock1) -+ I.dropUnknownNonDebugMetadata(); - DomBlock->getInstList().splice(InsertPt->getIterator(), - IfBlock1->getInstList(), IfBlock1->begin(), - IfBlock1->getTerminator()->getIterator()); -- if (IfBlock2) -+ } -+ if (IfBlock2) { -+ for (auto &I : *IfBlock2) -+ I.dropUnknownNonDebugMetadata(); - DomBlock->getInstList().splice(InsertPt->getIterator(), - IfBlock2->getInstList(), IfBlock2->begin(), - IfBlock2->getTerminator()->getIterator()); -+ } - - while (PHINode *PN = dyn_cast(BB->begin())) { - // Change the PHI node into a select instruction. -diff --git a/test/Transforms/SimplifyCFG/PR29163.ll b/test/Transforms/SimplifyCFG/PR29163.ll -new file mode 100644 -index 0000000..65f9090 ---- /dev/null -+++ b/test/Transforms/SimplifyCFG/PR29163.ll -@@ -0,0 +1,31 @@ -+; RUN: opt -S -simplifycfg < %s | FileCheck %s -+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -+target triple = "x86_64-unknown-linux-gnu" -+ -+@GV = external constant i64* -+ -+define i64* @test1(i1 %cond, i8* %P) { -+entry: -+ br i1 %cond, label %if, label %then -+ -+then: -+ %bc = bitcast i8* %P to i64* -+ br label %join -+ -+if: -+ %load = load i64*, i64** @GV, align 8, !dereferenceable !0 -+ br label %join -+ -+join: -+ %phi = phi i64* [ %bc, %then ], [ %load, %if ] -+ ret i64* %phi -+} -+ -+; CHECK-LABEL: define i64* @test1( -+; CHECK: %[[bc:.*]] = bitcast i8* %P to i64* -+; CHECK: %[[load:.*]] = load i64*, i64** @GV, align 8{{$}} -+; CHECK: %[[phi:.*]] = select i1 %cond, i64* %[[load]], i64* %[[bc]] -+; CHECK: ret i64* %[[phi]] -+ -+ -+!0 = !{i64 8} --- -2.10.1 - diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch deleted file mode 100644 index b6291fb7..00000000 --- a/debian/patches/0021-shared-lib-debian.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile -=================================================================== ---- llvm-toolchain-snapshot_3.7~svn241915.orig/tools/llvm-shlib/Makefile -+++ llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile -@@ -41,6 +41,12 @@ LLVMLibsOptions := $(IncludeInLibLlvm:$( - LLVMLibsPaths := $(IncludeInLibLlvm) - - $(LibName.SO): $(LLVMLibsPaths) -+ $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \ -+ $(LIBRARYNAME)$(SHLIBEXT) -+ $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \ -+ $(ProjLibsOptions) $(LLVMLibsOptions) $(LIBS) -+ mv $(LibName.SO) $(LibName.SO).1 -+ ln -s $(notdir $(LibName.SO)).1 $(LibName.SO) - - ifeq ($(HOST_OS),Darwin) - # set dylib internal version number to llvmCore submission number -@@ -61,7 +67,7 @@ endif - - ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) - # Add soname to the library. -- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions - endif - - ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch deleted file mode 100644 index 7a4ac528..00000000 --- a/debian/patches/0023-link-libopagent.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: llvm-toolchain-snapshot_3.7~svn241915/configure -=================================================================== ---- llvm-toolchain-snapshot_3.7~svn241915.orig/configure -+++ llvm-toolchain-snapshot_3.7~svn241915/configure -@@ -10115,7 +10115,7 @@ if test "${with_oprofile+set}" = set; th - case $llvm_cv_os_type in - Linux) - if test -n "$llvm_cv_oppath" ; then -- LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}" -+ #LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}" - { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5 - echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; } - if test "${ac_cv_search_bfd_init+set}" = set; then -@@ -10211,7 +10211,7 @@ fi - echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; } - ac_res=$ac_cv_search_bfd_init - if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ test "$ac_res" = "none required" || true - - fi - -@@ -10247,8 +10247,8 @@ for ac_lib in '' opagent; do - if test -z "$ac_lib"; then - ac_res="none required" - else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ ac_res="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed" -+ LIBS="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" diff --git a/debian/patches/31-powerpcspe.diff b/debian/patches/31-powerpcspe.diff deleted file mode 100644 index 8eacce75..00000000 --- a/debian/patches/31-powerpcspe.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Lex/Makefile -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/lib/Lex/Makefile 2013-08-22 09:07:43.368608381 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Lex/Makefile 2013-08-22 09:07:43.368608381 +0200 -@@ -17,8 +17,10 @@ - LIBRARYNAME := clangLex - - ifeq ($(ARCH),PowerPC) -+ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),powerpcspe) - CXX.Flags += -maltivec - endif -+endif - - include $(CLANG_LEVEL)/Makefile - diff --git a/debian/patches/34-powerpc-no-altivec.diff b/debian/patches/34-powerpc-no-altivec.diff deleted file mode 100644 index 5f058280..00000000 --- a/debian/patches/34-powerpc-no-altivec.diff +++ /dev/null @@ -1,24 +0,0 @@ -Description: Make sure PowerPC doesn't default to altivec on -Author: Adam Conrad -Author: Peter Michael Green -Forwarded: no -Reviewed-By: Colin Watson - -Last-Update: 2013-04-01 - -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Lex/Makefile -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/lib/Lex/Makefile 2013-08-22 09:11:26.616602695 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Lex/Makefile 2013-08-22 09:11:26.616602695 +0200 -@@ -16,11 +16,5 @@ - - LIBRARYNAME := clangLex - --ifeq ($(ARCH),PowerPC) --ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),powerpcspe) --CXX.Flags += -maltivec --endif --endif -- - include $(CLANG_LEVEL)/Makefile - diff --git a/debian/patches/clang-apply-replacements.diff b/debian/patches/clang-apply-replacements.diff deleted file mode 100644 index 0f5e685f..00000000 --- a/debian/patches/clang-apply-replacements.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: llvm-toolchain-3.7-3.7/clang-tools-extra/clang-modernize/Core/ReplacementHandling.cpp -=================================================================== ---- llvm-toolchain-3.7-3.7.orig/clang-tools-extra/clang-modernize/Core/ReplacementHandling.cpp -+++ llvm-toolchain-3.7-3.7/clang-tools-extra/clang-modernize/Core/ReplacementHandling.cpp -@@ -26,7 +26,7 @@ using namespace clang::tooling; - - bool ReplacementHandling::findClangApplyReplacements(const char *Argv0) { - ErrorOr CARPathOrErr = -- findProgramByName("clang-apply-replacements"); -+ findProgramByName("clang-apply-replacements-6.0"); - if (!CARPathOrErr) - return true; - -@@ -34,7 +34,7 @@ bool ReplacementHandling::findClangApply - static int StaticSymbol; - std::string ClangModernizePath = fs::getMainExecutable(Argv0, &StaticSymbol); - SmallString<128> TestPath = path::parent_path(ClangModernizePath); -- path::append(TestPath, "clang-apply-replacements"); -+ path::append(TestPath, "clang-apply-replacements-6.0"); - if (fs::can_execute(Twine(TestPath))) - CARPath = TestPath.str(); - -Index: llvm-toolchain-3.7-3.7/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -=================================================================== ---- llvm-toolchain-3.7-3.7.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-3.7-3.7/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -@@ -111,7 +111,7 @@ def main(): - default='clang-tidy', - help='path to clang-tidy binary') - parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', -- default='clang-apply-replacements', -+ default='clang-apply-replacements-6.0', - help='path to clang-apply-replacements binary') - parser.add_argument('-checks', default=None, - help='checks filter, when not specified, use clang-tidy ' diff --git a/debian/patches/clang-default-to-i686-on-32bit-x86-targets.patch b/debian/patches/clang-default-to-i686-on-32bit-x86-targets.patch deleted file mode 100644 index 5df42968..00000000 --- a/debian/patches/clang-default-to-i686-on-32bit-x86-targets.patch +++ /dev/null @@ -1,15 +0,0 @@ -Set i386 default target CPU to be i686 (same as gcc) - -Closes: #812803 -Index: llvm-toolchain-3.9-3.9/clang/lib/Driver/Tools.cpp -=================================================================== ---- llvm-toolchain-3.9-3.9.orig/clang/lib/Driver/Tools.cpp -+++ llvm-toolchain-3.9-3.9/clang/lib/Driver/Tools.cpp -@@ -1898,6 +1898,7 @@ static const char *getX86TargetCPU(const - case llvm::Triple::Haiku: - return "i586"; - case llvm::Triple::Bitrig: -+ case llvm::Triple::Linux: - return "i686"; - default: - // Fallback to p4. diff --git a/debian/patches/compiler-rt-i586.diff b/debian/patches/compiler-rt-i586.diff deleted file mode 100644 index d2c754a3..00000000 --- a/debian/patches/compiler-rt-i586.diff +++ /dev/null @@ -1,34 +0,0 @@ -Index: llvm-toolchain-snapshot-3.8~svn249990/compiler-rt/make/platform/clang_linux.mk -=================================================================== ---- llvm-toolchain-snapshot-3.8~svn249990.orig/compiler-rt/make/platform/clang_linux.mk -+++ llvm-toolchain-snapshot-3.8~svn249990/compiler-rt/make/platform/clang_linux.mk -@@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa - - # Define configs only if arch in triple is i386 or x86_64 - CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple))) --ifeq ($(call contains,i386 x86_64,$(CompilerTargetArch)),true) -+ifeq ($(call contains,i386 x86_64 i586 i686,$(CompilerTargetArch)),true) - - # TryCompile compiler source flags - # Returns exit code of running a compiler invocation. -@@ -35,7 +35,7 @@ TryCompile = \ - echo $$?) - - test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c --ifeq ($(CompilerTargetArch),i386) -+ifneq (,$(filter $(CompilerTargetArch),i386 i586 i686)) - SupportedArches := i386 - ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0) - SupportedArches += x86_64 -Index: llvm-toolchain-snapshot-3.8~svn249990/clang/runtime/compiler-rt/Makefile -=================================================================== ---- llvm-toolchain-snapshot-3.8~svn249990.orig/clang/runtime/compiler-rt/Makefile -+++ llvm-toolchain-snapshot-3.8~svn249990/clang/runtime/compiler-rt/Makefile -@@ -161,6 +161,7 @@ BuildRuntimeLibraries: - ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \ - ProjObjRoot=$(PROJ_OBJ_DIR) \ - CC="$(ToolDir)/clang" \ -+ LD_LIBRARY_PATH=../build-llvm/Release/lib \ - VERBOSE=$(VERBOSE) \ - $(RuntimeDirs:%=clang_%) - .PHONY: BuildRuntimeLibraries diff --git a/debian/patches/disable-execinfo-usage.diff b/debian/patches/disable-execinfo-usage.diff deleted file mode 100644 index e9d5bec1..00000000 --- a/debian/patches/disable-execinfo-usage.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile -=================================================================== ---- llvm-toolchain-snapshot_3.8~svn253186.orig/lldb/lib/Makefile -+++ llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile -@@ -201,7 +201,7 @@ ifeq ($(HOST_OS),FreeBSD) - # Allow unresolved symbols. - LLVMLibsOptions += -Wl,--allow-shlib-undefined - # Link in python -- LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo \ -+ LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt \ - -ledit -lncurses -lpanel -lpthread - endif - diff --git a/debian/patches/follow-parallel-var.diff b/debian/patches/follow-parallel-var.diff deleted file mode 100644 index 45af781d..00000000 --- a/debian/patches/follow-parallel-var.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: llvm-toolchain-3.4-3.4.2/test/Makefile -=================================================================== ---- llvm-toolchain-3.4-3.4.2.orig/test/Makefile -+++ llvm-toolchain-3.4-3.4.2/test/Makefile -@@ -29,6 +29,11 @@ else - LIT_ARGS := -s -v - endif - -+# NJOBS allows an override of the number of threads -+ifneq ($(NJOBS),) -+LIT_ARGS += $(NJOBS) -+endif -+ - ifdef TESTSUITE - LIT_TESTSUITE := $(TESTSUITE) - else diff --git a/debian/patches/force-link-pass.o.diff b/debian/patches/force-link-pass.o.diff deleted file mode 100644 index f9134916..00000000 --- a/debian/patches/force-link-pass.o.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: llvm-toolchain-snapshot_3.7~svn231588/tools/bugpoint/Makefile -=================================================================== ---- llvm-toolchain-snapshot_3.7~svn231588.orig/tools/bugpoint/Makefile -+++ llvm-toolchain-snapshot_3.7~svn231588/tools/bugpoint/Makefile -@@ -12,6 +12,9 @@ TOOLNAME := bugpoint - LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \ - bitwriter irreader vectorize objcarcopts codegen - -+# Crappy workaround to make sure it links correctly. -+LLVMLibsOptions := ../../lib/IR/Release*/Pass.o -+ - # Support plugins. - NO_DEAD_STRIP := 1 - -Index: llvm-toolchain-snapshot_3.7~svn231588/tools/opt/Makefile -=================================================================== ---- llvm-toolchain-snapshot_3.7~svn231588.orig/tools/opt/Makefile -+++ llvm-toolchain-snapshot_3.7~svn231588/tools/opt/Makefile -@@ -11,6 +11,9 @@ LEVEL := ../.. - TOOLNAME := opt - LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen passes - -+# Crappy workaround to make sure it links correctly. -+LLVMLibsOptions := ../../lib/IR/Release*/Pass.o -+ - # Support plugins. - NO_DEAD_STRIP := 1 - diff --git a/debian/patches/gcc-7.1-workaround.diff b/debian/patches/gcc-7.1-workaround.diff deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/patches/lld-arg-cmake-issue.diff b/debian/patches/lld-arg-cmake-issue.diff deleted file mode 100644 index 40ff8ab1..00000000 --- a/debian/patches/lld-arg-cmake-issue.diff +++ /dev/null @@ -1,141 +0,0 @@ -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/cmake/modules/AddLLD.cmake -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/cmake/modules/AddLLD.cmake -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/cmake/modules/AddLLD.cmake -@@ -1,5 +1,5 @@ - macro(add_lld_library name) -- add_llvm_library(${name} ${ARGN}) -+ llvm_add_library(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "lld libraries") - endmacro(add_lld_library) - -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/lib/Config/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/lib/Config/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/lib/Config/CMakeLists.txt -@@ -4,6 +4,6 @@ - ADDITIONAL_HEADER_DIRS - ${LLD_INCLUDE_DIR}/lld/Config - -- LINK_LIBS -- LLVMSupport -+ LINK_COMPONENTS -+ Support - ) -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/lib/Core/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/lib/Core/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/lib/Core/CMakeLists.txt -@@ -12,6 +12,6 @@ - ADDITIONAL_HEADER_DIRS - ${LLD_INCLUDE_DIR}/lld/Core - -- LINK_LIBS -- LLVMSupport -+ LINK_COMPONENTS -+ Support - ) -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/lib/Driver/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/lib/Driver/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/lib/Driver/CMakeLists.txt -@@ -8,15 +8,17 @@ - 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) -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/lib/ReaderWriter/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/lib/ReaderWriter/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/lib/ReaderWriter/CMakeLists.txt -@@ -11,9 +11,11 @@ - ADDITIONAL_HEADER_DIRS - ${LLD_INCLUDE_DIR}/lld/ReaderWriter - -+ LINK_COMPONENTS -+ Object -+ Support -+ - LINK_LIBS - lldCore - lldYAML -- LLVMObject -- LLVMSupport - ) -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/lib/ReaderWriter/MachO/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/lib/ReaderWriter/MachO/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/lib/ReaderWriter/MachO/CMakeLists.txt -@@ -18,13 +18,16 @@ - StubsPass.cpp - TLVPass.cpp - WriterMachO.cpp -+ -+ LINK_COMPONENTS -+ DebugInfoDWARF -+ Object -+ Support -+ Demangle -+ - LINK_LIBS - lldCore - lldYAML -- LLVMDebugInfoDWARF -- LLVMObject -- LLVMSupport -- LLVMDemangle - ${PTHREAD_LIB} - ) - -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/lib/ReaderWriter/YAML/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/lib/ReaderWriter/YAML/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/lib/ReaderWriter/YAML/CMakeLists.txt -@@ -1,6 +1,9 @@ - add_lld_library(lldYAML - ReaderWriterYAML.cpp -+ -+ LINK_COMPONENTS -+ Support -+ - LINK_LIBS - lldCore -- LLVMSupport - ) -Index: llvm-toolchain-snapshot_4.0~svn290969/lld/tools/lld/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/lld/tools/lld/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn290969/lld/tools/lld/CMakeLists.txt -@@ -1,12 +1,15 @@ -+set(LLVM_LINK_COMPONENTS -+ Support -+ ) -+ - add_lld_tool(lld - lld.cpp - ) - - target_link_libraries(lld - lldDriver - lldCOFF - lldELF -- LLVMSupport - ) - - install(TARGETS lld diff --git a/debian/patches/pthread-link.diff b/debian/patches/pthread-link.diff deleted file mode 100644 index d4d890b6..00000000 --- a/debian/patches/pthread-link.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: llvm-toolchain-4.0-4.0~svn292009/clang/tools/libclang/CMakeLists.txt -1;4601;0c=================================================================== ---- llvm-toolchain-4.0-4.0~svn292009.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-4.0-4.0~svn292009/clang/tools/libclang/CMakeLists.txt -@@ -56,6 +56,13 @@ endif () - find_library(DL_LIBRARY_PATH dl) - if (DL_LIBRARY_PATH) - list(APPEND LIBS dl) -+ -+endif() -+if (PTHREAD_LIB) -+ # libpthreads overrides some standard library symbols, so main -+ # executable must be linked with it in order to provide consistent -+ # API for all shared libaries loaded by this executable. -+ list(APPEND LIBS ${PTHREAD_LIB}) - endif() - - option(LIBCLANG_BUILD_STATIC diff --git a/debian/patches/scan-build-py-default.diff b/debian/patches/scan-build-py-default.diff deleted file mode 100644 index 431bffbd..00000000 --- a/debian/patches/scan-build-py-default.diff +++ /dev/null @@ -1,518 +0,0 @@ -Index: llvm-toolchain-snapshot_3.9-svn269220/home/sylvestre/dev/debian/pkg-llvm/llvm-toolchain-branches/llvm-toolchain-snapshot_3.9-svn269220/clang/tools/scan-build-py/libscanbuild/analyze.py -=================================================================== ---- llvm-toolchain-snapshot_3.9-svn269220.orig/home/sylvestre/dev/debian/pkg-llvm/llvm-toolchain-branches/llvm-toolchain-snapshot_3.9-svn269220/clang/tools/scan-build-py/libscanbuild/analyze.py -+++ /dev/null -@@ -1,513 +0,0 @@ --# -*- coding: utf-8 -*- --# The LLVM Compiler Infrastructure --# --# This file is distributed under the University of Illinois Open Source --# License. See LICENSE.TXT for details. --""" This module implements the 'scan-build' command API. -- --To run the static analyzer against a build is done in multiple steps: -- -- -- Intercept: capture the compilation command during the build, -- -- Analyze: run the analyzer against the captured commands, -- -- Report: create a cover report from the analyzer outputs. """ -- --import sys --import re --import os --import os.path --import json --import argparse --import logging --import subprocess --import multiprocessing --from libscanbuild import initialize_logging, tempdir, command_entry_point --from libscanbuild.runner import run --from libscanbuild.intercept import capture --from libscanbuild.report import report_directory, document --from libscanbuild.clang import get_checkers --from libscanbuild.compilation import split_command -- --__all__ = ['analyze_build_main', 'analyze_build_wrapper'] -- --COMPILER_WRAPPER_CC = 'analyze-cc' --COMPILER_WRAPPER_CXX = 'analyze-c++' -- -- --@command_entry_point --def analyze_build_main(bin_dir, from_build_command): -- """ Entry point for 'analyze-build' and 'scan-build'. """ -- -- parser = create_parser(from_build_command) -- args = parser.parse_args() -- validate(parser, args, from_build_command) -- -- # setup logging -- initialize_logging(args.verbose) -- logging.debug('Parsed arguments: %s', args) -- -- with report_directory(args.output, args.keep_empty) as target_dir: -- if not from_build_command: -- # run analyzer only and generate cover report -- run_analyzer(args, target_dir) -- number_of_bugs = document(args, target_dir, True) -- return number_of_bugs if args.status_bugs else 0 -- elif args.intercept_first: -- # run build command and capture compiler executions -- exit_code = capture(args, bin_dir) -- # next step to run the analyzer against the captured commands -- if need_analyzer(args.build): -- run_analyzer(args, target_dir) -- # cover report generation and bug counting -- number_of_bugs = document(args, target_dir, True) -- # remove the compilation database when it was not requested -- if os.path.exists(args.cdb): -- os.unlink(args.cdb) -- # set exit status as it was requested -- return number_of_bugs if args.status_bugs else exit_code -- else: -- return exit_code -- else: -- # run the build command with compiler wrappers which -- # execute the analyzer too. (interposition) -- environment = setup_environment(args, target_dir, bin_dir) -- logging.debug('run build in environment: %s', environment) -- exit_code = subprocess.call(args.build, env=environment) -- logging.debug('build finished with exit code: %d', exit_code) -- # cover report generation and bug counting -- number_of_bugs = document(args, target_dir, False) -- # set exit status as it was requested -- return number_of_bugs if args.status_bugs else exit_code -- -- --def need_analyzer(args): -- """ Check the intent of the build command. -- -- When static analyzer run against project configure step, it should be -- silent and no need to run the analyzer or generate report. -- -- To run `scan-build` against the configure step might be neccessary, -- when compiler wrappers are used. That's the moment when build setup -- check the compiler and capture the location for the build process. """ -- -- return len(args) and not re.search('configure|autogen', args[0]) -- -- --def run_analyzer(args, output_dir): -- """ Runs the analyzer against the given compilation database. """ -- -- def exclude(filename): -- """ Return true when any excluded directory prefix the filename. """ -- return any(re.match(r'^' + directory, filename) -- for directory in args.excludes) -- -- consts = { -- 'clang': args.clang, -- 'output_dir': output_dir, -- 'output_format': args.output_format, -- 'output_failures': args.output_failures, -- 'direct_args': analyzer_params(args), -- 'force_debug': args.force_debug -- } -- -- logging.debug('run analyzer against compilation database') -- with open(args.cdb, 'r') as handle: -- generator = (dict(cmd, **consts) -- for cmd in json.load(handle) if not exclude(cmd['file'])) -- # when verbose output requested execute sequentially -- pool = multiprocessing.Pool(1 if args.verbose > 2 else None) -- for current in pool.imap_unordered(run, generator): -- if current is not None: -- # display error message from the static analyzer -- for line in current['error_output']: -- logging.info(line.rstrip()) -- pool.close() -- pool.join() -- -- --def setup_environment(args, destination, bin_dir): -- """ Set up environment for build command to interpose compiler wrapper. """ -- -- environment = dict(os.environ) -- environment.update({ -- 'CC': os.path.join(bin_dir, COMPILER_WRAPPER_CC), -- 'CXX': os.path.join(bin_dir, COMPILER_WRAPPER_CXX), -- 'ANALYZE_BUILD_CC': args.cc, -- 'ANALYZE_BUILD_CXX': args.cxx, -- 'ANALYZE_BUILD_CLANG': args.clang if need_analyzer(args.build) else '', -- 'ANALYZE_BUILD_VERBOSE': 'DEBUG', -- 'ANALYZE_BUILD_REPORT_DIR': destination, -- 'ANALYZE_BUILD_REPORT_FORMAT': args.output_format, -- 'ANALYZE_BUILD_REPORT_FAILURES': 'yes' if args.output_failures else '', -- 'ANALYZE_BUILD_PARAMETERS': ' '.join(analyzer_params(args)), -- 'ANALYZE_BUILD_FORCE_DEBUG': 'yes' if args.force_debug else '' -- }) -- return environment -- -- --def analyze_build_wrapper(cplusplus): -- """ Entry point for `analyze-cc` and `analyze-c++` compiler wrappers. """ -- -- # initialize wrapper logging -- logging.basicConfig(format='analyze: %(levelname)s: %(message)s', -- level=os.getenv('ANALYZE_BUILD_VERBOSE', 'INFO')) -- # execute with real compiler -- compiler = os.getenv('ANALYZE_BUILD_CXX', 'c++') if cplusplus \ -- else os.getenv('ANALYZE_BUILD_CC', 'cc') -- compilation = [compiler] + sys.argv[1:] -- logging.info('execute compiler: %s', compilation) -- result = subprocess.call(compilation) -- # exit when it fails, ... -- if result or not os.getenv('ANALYZE_BUILD_CLANG'): -- return result -- # ... and run the analyzer if all went well. -- try: -- # check is it a compilation -- compilation = split_command(sys.argv) -- if compilation is None: -- return result -- # collect the needed parameters from environment, crash when missing -- parameters = { -- 'clang': os.getenv('ANALYZE_BUILD_CLANG'), -- 'output_dir': os.getenv('ANALYZE_BUILD_REPORT_DIR'), -- 'output_format': os.getenv('ANALYZE_BUILD_REPORT_FORMAT'), -- 'output_failures': os.getenv('ANALYZE_BUILD_REPORT_FAILURES'), -- 'direct_args': os.getenv('ANALYZE_BUILD_PARAMETERS', -- '').split(' '), -- 'force_debug': os.getenv('ANALYZE_BUILD_FORCE_DEBUG'), -- 'directory': os.getcwd(), -- 'command': [sys.argv[0], '-c'] + compilation.flags -- } -- # call static analyzer against the compilation -- for source in compilation.files: -- parameters.update({'file': source}) -- logging.debug('analyzer parameters %s', parameters) -- current = run(parameters) -- # display error message from the static analyzer -- if current is not None: -- for line in current['error_output']: -- logging.info(line.rstrip()) -- except Exception: -- logging.exception("run analyzer inside compiler wrapper failed.") -- return result -- -- --def analyzer_params(args): -- """ A group of command line arguments can mapped to command -- line arguments of the analyzer. This method generates those. """ -- -- def prefix_with(constant, pieces): -- """ From a sequence create another sequence where every second element -- is from the original sequence and the odd elements are the prefix. -- -- eg.: prefix_with(0, [1,2,3]) creates [0, 1, 0, 2, 0, 3] """ -- -- return [elem for piece in pieces for elem in [constant, piece]] -- -- result = [] -- -- if args.store_model: -- result.append('-analyzer-store={0}'.format(args.store_model)) -- if args.constraints_model: -- result.append('-analyzer-constraints={0}'.format( -- args.constraints_model)) -- if args.internal_stats: -- result.append('-analyzer-stats') -- if args.analyze_headers: -- result.append('-analyzer-opt-analyze-headers') -- if args.stats: -- result.append('-analyzer-checker=debug.Stats') -- if args.maxloop: -- result.extend(['-analyzer-max-loop', str(args.maxloop)]) -- if args.output_format: -- result.append('-analyzer-output={0}'.format(args.output_format)) -- if args.analyzer_config: -- result.append(args.analyzer_config) -- if args.verbose >= 4: -- result.append('-analyzer-display-progress') -- if args.plugins: -- result.extend(prefix_with('-load', args.plugins)) -- if args.enable_checker: -- checkers = ','.join(args.enable_checker) -- result.extend(['-analyzer-checker', checkers]) -- if args.disable_checker: -- checkers = ','.join(args.disable_checker) -- result.extend(['-analyzer-disable-checker', checkers]) -- if os.getenv('UBIVIZ'): -- result.append('-analyzer-viz-egraph-ubigraph') -- -- return prefix_with('-Xclang', result) -- -- --def print_active_checkers(checkers): -- """ Print active checkers to stdout. """ -- -- for name in sorted(name for name, (_, active) in checkers.items() -- if active): -- print(name) -- -- --def print_checkers(checkers): -- """ Print verbose checker help to stdout. """ -- -- print('') -- print('available checkers:') -- print('') -- for name in sorted(checkers.keys()): -- description, active = checkers[name] -- prefix = '+' if active else ' ' -- if len(name) > 30: -- print(' {0} {1}'.format(prefix, name)) -- print(' ' * 35 + description) -- else: -- print(' {0} {1: <30} {2}'.format(prefix, name, description)) -- print('') -- print('NOTE: "+" indicates that an analysis is enabled by default.') -- print('') -- -- --def validate(parser, args, from_build_command): -- """ Validation done by the parser itself, but semantic check still -- needs to be done. This method is doing that. """ -- -- if args.help_checkers_verbose: -- print_checkers(get_checkers(args.clang, args.plugins)) -- parser.exit() -- elif args.help_checkers: -- print_active_checkers(get_checkers(args.clang, args.plugins)) -- parser.exit() -- -- if from_build_command and not args.build: -- parser.error('missing build command') -- -- --def create_parser(from_build_command): -- """ Command line argument parser factory method. """ -- -- parser = argparse.ArgumentParser( -- formatter_class=argparse.ArgumentDefaultsHelpFormatter) -- -- parser.add_argument( -- '--verbose', '-v', -- action='count', -- default=0, -- help="""Enable verbose output from '%(prog)s'. A second and third -- flag increases verbosity.""") -- parser.add_argument( -- '--override-compiler', -- action='store_true', -- help="""Always resort to the compiler wrapper even when better -- interposition methods are available.""") -- parser.add_argument( -- '--intercept-first', -- action='store_true', -- help="""Run the build commands only, build a compilation database, -- then run the static analyzer afterwards. -- Generally speaking it has better coverage on build commands. -- With '--override-compiler' it use compiler wrapper, but does -- not run the analyzer till the build is finished. """) -- parser.add_argument( -- '--cdb', -- metavar='', -- default="compile_commands.json", -- help="""The JSON compilation database.""") -- -- parser.add_argument( -- '--output', '-o', -- metavar='', -- default=tempdir(), -- help="""Specifies the output directory for analyzer reports. -- Subdirectory will be created if default directory is targeted. -- """) -- parser.add_argument( -- '--status-bugs', -- action='store_true', -- help="""By default, the exit status of '%(prog)s' is the same as the -- executed build command. Specifying this option causes the exit -- status of '%(prog)s' to be non zero if it found potential bugs -- and zero otherwise.""") -- parser.add_argument( -- '--html-title', -- metavar='', -- help="""Specify the title used on generated HTML pages. -- If not specified, a default title will be used.""") -- parser.add_argument( -- '--analyze-headers', -- action='store_true', -- help="""Also analyze functions in #included files. By default, such -- functions are skipped unless they are called by functions -- within the main source file.""") -- format_group = parser.add_mutually_exclusive_group() -- format_group.add_argument( -- '--plist', '-plist', -- dest='output_format', -- const='plist', -- default='html', -- action='store_const', -- help="""This option outputs the results as a set of .plist files.""") -- format_group.add_argument( -- '--plist-html', '-plist-html', -- dest='output_format', -- const='plist-html', -- default='html', -- action='store_const', -- help="""This option outputs the results as a set of .html and .plist -- files.""") -- # TODO: implement '-view ' -- -- advanced = parser.add_argument_group('advanced options') -- advanced.add_argument( -- '--keep-empty', -- action='store_true', -- help="""Don't remove the build results directory even if no issues -- were reported.""") -- advanced.add_argument( -- '--no-failure-reports', '-no-failure-reports', -- dest='output_failures', -- action='store_false', -- help="""Do not create a 'failures' subdirectory that includes analyzer -- crash reports and preprocessed source files.""") -- advanced.add_argument( -- '--stats', '-stats', -- action='store_true', -- help="""Generates visitation statistics for the project being analyzed. -- """) -- advanced.add_argument( -- '--internal-stats', -- action='store_true', -- help="""Generate internal analyzer statistics.""") -- advanced.add_argument( -- '--maxloop', '-maxloop', -- metavar='<loop count>', -- type=int, -- help="""Specifiy the number of times a block can be visited before -- giving up. Increase for more comprehensive coverage at a cost -- of speed.""") -- advanced.add_argument( -- '--store', '-store', -- metavar='<model>', -- dest='store_model', -- choices=['region', 'basic'], -- help="""Specify the store model used by the analyzer. -- 'region' specifies a field- sensitive store model. -- 'basic' which is far less precise but can more quickly -- analyze code. 'basic' was the default store model for -- checker-0.221 and earlier.""") -- advanced.add_argument( -- '--constraints', '-constraints', -- metavar='<model>', -- dest='constraints_model', -- choices=['range', 'basic'], -- help="""Specify the contraint engine used by the analyzer. Specifying -- 'basic' uses a simpler, less powerful constraint model used by -- checker-0.160 and earlier.""") -- advanced.add_argument( -- '--use-analyzer', -- metavar='<path>', -- dest='clang', -- default='clang', -- help="""'%(prog)s' uses the 'clang' executable relative to itself for -- static analysis. One can override this behavior with this -- option by using the 'clang' packaged with Xcode (on OS X) or -- from the PATH.""") -- advanced.add_argument( -- '--use-cc', -- metavar='<path>', -- dest='cc', -- default='cc', -- help="""When '%(prog)s' analyzes a project by interposing a "fake -- compiler", which executes a real compiler for compilation and -- do other tasks (to run the static analyzer or just record the -- compiler invocation). Because of this interposing, '%(prog)s' -- does not know what compiler your project normally uses. -- Instead, it simply overrides the CC environment variable, and -- guesses your default compiler. -- -- If you need '%(prog)s' to use a specific compiler for -- *compilation* then you can use this option to specify a path -- to that compiler.""") -- advanced.add_argument( -- '--use-c++', -- metavar='<path>', -- dest='cxx', -- default='c++', -- help="""This is the same as "--use-cc" but for C++ code.""") -- advanced.add_argument( -- '--analyzer-config', '-analyzer-config', -- metavar='<options>', -- help="""Provide options to pass through to the analyzer's -- -analyzer-config flag. Several options are separated with -- comma: 'key1=val1,key2=val2' -- -- Available options: -- stable-report-filename=true or false (default) -- -- Switch the page naming to: -- report-<filename>-<function/method name>-<id>.html -- instead of report-XXXXXX.html""") -- advanced.add_argument( -- '--exclude', -- metavar='<directory>', -- dest='excludes', -- action='append', -- default=[], -- help="""Do not run static analyzer against files found in this -- directory. (You can specify this option multiple times.) -- Could be usefull when project contains 3rd party libraries. -- The directory path shall be absolute path as file names in -- the compilation database.""") -- advanced.add_argument( -- '--force-analyze-debug-code', -- dest='force_debug', -- action='store_true', -- help="""Tells analyzer to enable assertions in code even if they were -- disabled during compilation, enabling more precise results.""") -- -- plugins = parser.add_argument_group('checker options') -- plugins.add_argument( -- '--load-plugin', '-load-plugin', -- metavar='<plugin library>', -- dest='plugins', -- action='append', -- help="""Loading external checkers using the clang plugin interface.""") -- plugins.add_argument( -- '--enable-checker', '-enable-checker', -- metavar='<checker name>', -- action=AppendCommaSeparated, -- help="""Enable specific checker.""") -- plugins.add_argument( -- '--disable-checker', '-disable-checker', -- metavar='<checker name>', -- action=AppendCommaSeparated, -- help="""Disable specific checker.""") -- plugins.add_argument( -- '--help-checkers', -- action='store_true', -- help="""A default group of checkers is run unless explicitly disabled. -- Exactly which checkers constitute the default group is a -- function of the operating system in use. These can be printed -- with this flag.""") -- plugins.add_argument( -- '--help-checkers-verbose', -- action='store_true', -- help="""Print all available checkers and mark the enabled ones.""") -- -- if from_build_command: -- parser.add_argument( -- dest='build', -- nargs=argparse.REMAINDER, -- help="""Command to run.""") -- -- return parser -- -- --class AppendCommaSeparated(argparse.Action): -- """ argparse Action class to support multiple comma separated lists. """ -- -- def __call__(self, __parser, namespace, values, __option_string): -- # getattr(obj, attr, default) does not really returns default but none -- if getattr(namespace, self.dest, None) is None: -- setattr(namespace, self.dest, []) -- # once it's fixed we can use as expected -- actual = getattr(namespace, self.dest) -- actual.extend(values.split(',')) -- setattr(namespace, self.dest, actual) diff --git a/debian/patches/silent-amdgpu-test-failing.diff b/debian/patches/silent-amdgpu-test-failing.diff deleted file mode 100644 index 1e138cb0..00000000 --- a/debian/patches/silent-amdgpu-test-failing.diff +++ /dev/null @@ -1,46 +0,0 @@ -Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll -=================================================================== ---- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll -+++ llvm-toolchain-snapshot_5.0~svn292012/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 ] } -+; XFAIL: * - - !opencl.ocl.version = !{} -Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll -=================================================================== ---- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll -+++ llvm-toolchain-snapshot_5.0~svn292012/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 ] } -+; XFAIL: * - - !opencl.ocl.version = !{!0} - !0 = !{} -Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll -=================================================================== ---- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll -+++ llvm-toolchain-snapshot_5.0~svn292012/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 ] } -+; XFAIL: * - - !opencl.ocl.version = !{!0} - !0 = !{i32 1} -Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/runtime-metadata.ll -=================================================================== ---- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/runtime-metadata.ll -+++ llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/runtime-metadata.ll -@@ -1,5 +1,6 @@ - ; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -o - < %s | llvm-readobj -amdgpu-runtime-metadata | FileCheck %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: * - - %struct.A = type { i8, float } - %opencl.image1d_t = type opaque From d2dae2fd8884ce8eff5efdc7f626ce2eb2208dd2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru <sylvestre@mozilla.com> Date: Sat, 17 Mar 2018 17:18:39 +0100 Subject: [PATCH 3/4] Fix debian-watch-uses-insecure-uri as upstream has now https --- debian/changelog | 1 + debian/copyright | 10 +++++----- debian/watch | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 654fbd77..ca09545d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-6.0 (1:6.0-3) unstable; urgency=medium * Remove a bunch of old unused patches + * Fix debian-watch-uses-insecure-uri as upstream has now https -- Sylvestre Ledru <sylvestre@debian.org> Sat, 17 Mar 2018 17:07:19 +0100 diff --git a/debian/copyright b/debian/copyright index f5b3185d..ae2def30 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: LLVM/Clang -Source: http://llvm.org/releases/download.html +Source: https://llvm.org/releases/download.html Files: * Copyright: 2003-2017 University of Illinois at Urbana-Champaign. @@ -17,7 +17,7 @@ License: LLVM Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting + copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the @@ -227,8 +227,8 @@ License: NCSA this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution. . - * Neither the names of the LLDB Team, copyright holders, nor the names of - its contributors may be used to endorse or promote products derived from + * Neither the names of the LLDB Team, copyright holders, nor the names of + its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR diff --git a/debian/watch b/debian/watch index eb3378a6..fcd015de 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$//i,dversionmangle=s/[-.+~]?(cvs|svn|git|snapshot|pre|hg)(.*)$//i,pasv \ -http://llvm.org/releases/download.html (?:.*/)?clang-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian debian/orig-tar.sh +https://llvm.org/releases/download.html (?:.*/)?clang-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian debian/orig-tar.sh From 9a90a9544dee78a237c99e150da96dd855ccdd30 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru <sylvestre@mozilla.com> Date: Sat, 17 Mar 2018 17:19:39 +0100 Subject: [PATCH 4/4] Standards-Version updated to 4.1.3 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ca09545d..7a859d8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-6.0 (1:6.0-3) unstable; urgency=medium * Remove a bunch of old unused patches * Fix debian-watch-uses-insecure-uri as upstream has now https + * Standards-Version updated to 4.1.3 -- Sylvestre Ledru <sylvestre@debian.org> Sat, 17 Mar 2018 17:07:19 +0100 diff --git a/debian/control b/debian/control index fcb33be2..e66b8704 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, # libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x], # dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x], Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev -Standards-Version: 4.1.1 +Standards-Version: 4.1.3 Homepage: http://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 6.0 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/6.0