From 136c1e97ff2926d5bab52b905866bf2acdc5b37e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 3 Aug 2015 08:03:10 +0000 Subject: [PATCH 01/46] 3.7 branched --- debian/changelog | 4 +- debian/control | 110 ++++++------ debian/orig-tar.sh | 4 +- debian/patches/atomic_library_1.diff | 16 +- .../patches/removeduplicatedeclaration.diff | 10 +- debian/patches/series | 2 +- debian/patches/silent-MCJIIT-tests.diff | 160 +++++++++--------- debian/patches/silent-more-tests.diff | 28 +-- debian/patches/strip-svn.diff | 33 ++-- debian/patches/use-deb-json.diff | 18 +- debian/rules | 2 +- 11 files changed, 199 insertions(+), 188 deletions(-) diff --git a/debian/changelog b/debian/changelog index 60ad868a..2a9d87ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -llvm-toolchain-snapshot (1:3.8~svn242297-1~exp1) experimental; urgency=medium +llvm-toolchain-3.7 (1:3.7~+rc2-1) unstable; urgency=medium - * New snapshot release (3.7 => 3.8) + * New snapshot release -- Sylvestre Ledru Wed, 15 Jul 2015 17:51:08 +0200 diff --git a/debian/control b/debian/control index 1bbbfe1f..b3fe78fe 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-snapshot +Source: llvm-toolchain-3.7 Section: devel Priority: optional Maintainer: LLVM Packaging Team @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libjsoncpp-dev, lcov, procps, help2man, dh-ocaml, zlib1g-dev Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, - libllvm-3.8-ocaml-dev + libllvm-3.7-ocaml-dev Standards-Version: 3.9.6 Homepage: http://www.llvm.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ @@ -19,14 +19,14 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snap # ------------- clang ------------- -Package: clang-3.8 +Package: clang-3.7 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-common-3.8-dev (= ${binary:Version}), - libclang1-3.8 (= ${binary:Version}), libc6-dev, binutils + libclang-common-3.7-dev (= ${binary:Version}), + libclang1-3.7 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-3.8-dev, python -Suggests: gnustep, gnustep-devel, clang-3.8-doc +Recommends: llvm-3.7-dev, python +Suggests: gnustep, gnustep-devel, clang-3.7-doc Replaces: clang-3.1, clang-3.2, clang-3.3, clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt Breaks: clang-3.1, clang-3.2, clang-3.3, @@ -39,7 +39,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) Clang implements all of the ISO C++ 1998 and 2001 standards and also provides a partial support of C++1y. -Package: clang-format-3.8 +Package: clang-format-3.7 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python Replaces: clang-format-3.3 @@ -56,9 +56,9 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: cpp11-migrate-3.8 +Package: cpp11-migrate-3.7 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-modernize-3.7 Replaces: cpp11-migrate-3.3 Breaks: cpp11-migrate-3.3 Description: Tool to convert C++98 and C++03 code to C++11 @@ -71,9 +71,9 @@ Description: Tool to convert C++98 and C++03 code to C++11 . This is a transitional dummy package. It can safely be removed. -Package: clang-modernize-3.8 +Package: clang-modernize-3.7 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-3.7 Replaces: cpp11-migrate-3.3, cpp11-migrate-3.4 Breaks: cpp11-migrate-3.3, cpp11-migrate-3.4 Description: Tool to convert C++98 and C++03 code to C++11 @@ -85,7 +85,7 @@ Description: Tool to convert C++98 and C++03 code to C++11 the AST Matching library. -Package: clang-3.8-doc +Package: clang-3.7-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -99,7 +99,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation . This package contains the documentation. -Package: libclang1-3.8 +Package: libclang1-3.7 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs} Pre-Depends: ${misc:Pre-Depends} @@ -120,11 +120,11 @@ Description: C interface to the clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang1-3.8-dbg +Package: libclang1-3.7-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.7 Description: clang library Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -135,11 +135,11 @@ Description: clang library . This package contains the debugging symbols. -Package: libclang-3.8-dev +Package: libclang-3.7-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang1-3.8 (= ${binary:Version}), libclang-common-3.8-dev (= ${binary:Version}) + libclang1-3.7 (= ${binary:Version}), libclang-common-3.7-dev (= ${binary:Version}) Description: clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -149,12 +149,12 @@ Description: clang library - Development package a partial support of C++1y. . This package contains the clang headers to develop extensions over - libclang1-3.8. + libclang1-3.7. -Package: libclang-common-3.8-dev +Package: libclang-common-3.7-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}) Description: clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -167,7 +167,7 @@ Description: clang library - Common development package (profiling, etc). -Package: python-clang-3.8 +Package: python-clang-3.7 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python @@ -184,7 +184,7 @@ Description: Clang Python Bindings This binding package provides access to the Clang compiler and libraries. -Package: clang-3.8-examples +Package: clang-3.7-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -200,7 +200,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm3.8 +Package: libllvm3.7 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -213,11 +213,11 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: libllvm3.8-dbg +Package: libllvm3.7-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Modular compiler and toolchain technologies, debugging libraries @@ -227,11 +227,11 @@ Description: Modular compiler and toolchain technologies, debugging libraries . This package contains the LLVM runtime library debug symbols. -Package: llvm-3.8 +Package: llvm-3.7 Architecture: any -Suggests: llvm-3.8-doc -Depends: llvm-3.8-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-3.8-dev +Suggests: llvm-3.7-doc +Depends: llvm-3.7-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-3.7-dev Description: Modular compiler and toolchain technologies LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -258,7 +258,7 @@ Description: Modular compiler and toolchain technologies LLVM is the key component of the clang compiler and the gcc plugin called dragonegg. -Package: llvm-3.8-runtime +Package: llvm-3.7-runtime Architecture: any Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} Conflicts: llvm (<< 2.7-1) @@ -279,10 +279,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-3.8-dev +Package: llvm-3.7-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, - llvm-3.8 (= ${binary:Version}), libtinfo-dev + llvm-3.7 (= ${binary:Version}), libtinfo-dev Replaces: llvm (<< 2.2-3) Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build @@ -302,10 +302,10 @@ Description: Modular compiler and toolchain technologies, libraries and headers -Package: llvm-3.8-tools +Package: llvm-3.7-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - llvm-3.8-dev (= ${binary:Version}) + llvm-3.7-dev (= ${binary:Version}) Description: Modular compiler and toolchain technologies, tools LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -322,11 +322,11 @@ Description: Modular compiler and toolchain technologies, tools This package provides tools for testing. -Package: libllvm-3.8-ocaml-dev +Package: libllvm-3.7-ocaml-dev Section: ocaml Architecture: any -Suggests: llvm-3.8-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.8-dev (= ${binary:Version}) +Suggests: llvm-3.7-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.7-dev (= ${binary:Version}) Provides: ${ocaml:Provides} Description: Modular compiler and toolchain technologies, OCaml bindings LLVM is a collection of libraries and tools that make it easy to build @@ -343,7 +343,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-3.8-doc +Package: llvm-3.7-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -362,10 +362,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-3.8-examples +Package: llvm-3.7-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-3.8-dev (>= ${source:Version}), llvm-3.8-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-3.7-dev (>= ${source:Version}), llvm-3.7-dev (<< ${source:Version}+c~) Description: Modular compiler and toolchain technologies, examples LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -385,10 +385,10 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- -Package: lldb-3.8 +Package: lldb-3.7 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 mips mipsel hurd ppc64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), python, llvm-3.8-dev, python-lldb-3.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}), python, llvm-3.7-dev, python-lldb-3.7 Conflicts: lldb-3.4, lldb-3.5 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger @@ -396,14 +396,14 @@ Description: Next generation, high-performance debugger reusable components which highly leverage existing libraries in the larger LLVM Project, such as the Clang expression parser and LLVM disassembler. -Package: liblldb-3.8 +Package: liblldb-3.7 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 mips mipsel hurd ppc64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs -Replaces: lldb-3.8 (<= 1:3.8~svn215195-2) -Breaks: lldb-3.8 (<< 1:3.8~svn215195-2) +Replaces: lldb-3.7 (<= 1:3.7~svn215195-2) +Breaks: lldb-3.7 (<< 1:3.7~svn215195-2) Description: Next generation, high-performance debugger, library LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM @@ -412,7 +412,7 @@ Description: Next generation, high-performance debugger, library This package contains the LLDB runtime library. -Package: python-lldb-3.8 +Package: python-lldb-3.7 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python @@ -426,13 +426,13 @@ Description: Next generation, high-performance debugger, python lib This binding package provides access to lldb. -Package: liblldb-3.8-dev +Package: liblldb-3.7-dev Section: libdevel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel # ia64 mips mipsel hurd ppc64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version}) -Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2) -Breaks: lldb-3.8-dev (<< 1:3.8~svn215195-2) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.7 (= ${binary:Version}) +Replaces: lldb-3.7-dev (<= 1:3.7~svn215195-2) +Breaks: lldb-3.7-dev (<< 1:3.7~svn215195-2) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger - Header files LLDB is a next generation, high-performance debugger. It is built as a set of @@ -442,9 +442,9 @@ Description: Next generation, high-performance debugger - Header files This package provides the header files to build extension over lldb. -Package: lldb-3.8-dev -Depends: liblldb-3.8-dev, ${misc:Depends} +Package: lldb-3.7-dev +Depends: liblldb-3.7-dev, ${misc:Depends} Architecture: all Section: oldlibs -Description: transitional dummy package to liblldb-3.8-dev +Description: transitional dummy package to liblldb-3.7-dev This is a transitional dummy package. It can safely be removed. diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 1c03550f..49f66f2f 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -14,8 +14,8 @@ set -e # sh 3.4/debian/orig-tar.sh RELEASE_34 rc1 SVN_BASE_URL=http://llvm.org/svn/llvm-project/ -MAJOR_VERSION=3.8 -CURRENT_VERSION=3.8 # Should be changed to 3.5.1 later +MAJOR_VERSION=3.7 +CURRENT_VERSION=3.7 # Should be changed to 3.5.1 later if test -n "$1"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/ diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff index ae899064..256cf709 100644 --- a/debian/patches/atomic_library_1.diff +++ b/debian/patches/atomic_library_1.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/lib/Basic/Targets.cpp -+++ llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp -@@ -4325,6 +4325,20 @@ class ARMTargetInfo : public TargetInfo - } +--- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/lib/Basic/Targets.cpp 2014-03-29 12:14:58.543982773 +0100 ++++ llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp 2014-03-29 12:14:58.543982773 +0100 +@@ -3843,6 +3843,20 @@ + // FIXME: Override "preferred align" for double and long long. } + static bool shouldUseInlineAtomic(const llvm::Triple &T) { @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp public: ARMTargetInfo(const llvm::Triple &Triple, bool IsBigEndian) : TargetInfo(Triple), CPU("arm1136j-s"), FPMath(FP_Default), -Index: llvm-toolchain-snapshot_3.8~svn242701/clang/test/CodeGen/linux-arm-atomic.c +Index: llvm-toolchain-snapshot_3.5~svn205090/clang/test/CodeGen/linux-arm-atomic.c =================================================================== ---- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/test/CodeGen/linux-arm-atomic.c -+++ llvm-toolchain-snapshot_3.8~svn242701/clang/test/CodeGen/linux-arm-atomic.c +--- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-03-29 12:14:58.543982773 +0100 ++++ llvm-toolchain-snapshot_3.5~svn205090/clang/test/CodeGen/linux-arm-atomic.c 2014-03-29 12:14:58.543982773 +0100 @@ -1,5 +1,15 @@ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s diff --git a/debian/patches/removeduplicatedeclaration.diff b/debian/patches/removeduplicatedeclaration.diff index 19c733ef..b66d3df7 100644 --- a/debian/patches/removeduplicatedeclaration.diff +++ b/debian/patches/removeduplicatedeclaration.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/lib/Basic/Targets.cpp -+++ llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp -@@ -4325,33 +4325,6 @@ class ARMTargetInfo : public TargetInfo - } +--- llvm-toolchain-snapshot_3.5~svn205090.orig/clang/lib/Basic/Targets.cpp 2014-03-29 12:15:16.884486206 +0100 ++++ llvm-toolchain-snapshot_3.5~svn205090/clang/lib/Basic/Targets.cpp 2014-03-29 12:15:16.884486206 +0100 +@@ -3843,33 +3843,6 @@ + // FIXME: Override "preferred align" for double and long long. } - static bool shouldUseInlineAtomic(const llvm::Triple &T) { diff --git a/debian/patches/series b/debian/patches/series index d7771d5e..6f9e37f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,7 +34,7 @@ follow-parallel-var.diff hurd-EIEIO-undef.diff silent-MCJIIT-tests.diff lldb-libname.diff -strip-svn.diff +#strip-svn.diff lit-lang.diff compiler-rt-i586.diff clang-analyzer-force-version.diff diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff index bd0e0bb1..1b0d3172 100644 --- a/debian/patches/silent-MCJIIT-tests.diff +++ b/debian/patches/silent-MCJIIT-tests.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386 @@ -9,10 +9,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/cross-mo declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-lg-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-lg-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-lg-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-lg-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -relocation-model=pic -code-model=large %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm, asan, msan @@ -20,10 +20,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-lg-pi declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/eh-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -relocation-model=pic -code-model=small %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm, asan, msan @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/eh-sm-pi declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386 @@ -42,10 +42,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/multi-mo declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm @@ -53,10 +53,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/stubs-sm define i32 @main() nounwind { entry: -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-glo @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -75,10 +75,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/test-ptr @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386, arm @@ -86,10 +86,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/c declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386, arm @@ -97,10 +97,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/m declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -108,10 +108,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/t @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -remote-mcjit -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -119,10 +119,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/MCJIT/remote/t @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/crash-narrowfunctiontest.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/crash-narrowfunctiontest.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/BugPoint/crash-narrowfunctiontest.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/crash-narrowfunctiontest.ll @@ -2,7 +2,6 @@ ; ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null @@ -131,10 +131,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiont define i32 @foo() { ret i32 1 } -Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/metadata.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/metadata.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/BugPoint/metadata.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/metadata.ll @@ -1,7 +1,6 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s @@ -143,22 +143,22 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll ; Bugpoint should keep the call's metadata attached to the call. -Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/remove_arguments_test.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/remove_arguments_test.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/BugPoint/remove_arguments_test.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/BugPoint/remove_arguments_test.ll @@ -1,7 +1,6 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s ; REQUIRES: loadable_module -; XFAIL: * - ; Test to make sure that arguments are removed from the function if they are - ; unnecessary. And clean up any types that frees up too. -Index: llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll + ; Test to make sure that arguments are removed from the function if they are + ; unnecessary. And clean up any types that that frees up too. +Index: llvm-toolchain-snapshot_3.7~svn238736/test/Feature/load_module.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/Feature/load_module.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/Feature/load_module.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/Feature/load_module.ll @@ -3,7 +3,6 @@ ; RUN: -disable-output 2>&1 | grep Hello ; REQUIRES: loadable_module @@ -167,10 +167,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll @junk = global i32 0 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386 @@ -178,10 +178,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/cross declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm, asan, msan @@ -189,10 +189,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-lg declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm, asan, msan @@ -200,10 +200,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/eh-sm declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386 @@ -211,10 +211,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/multi declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386, arm @@ -222,10 +222,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386, arm @@ -233,10 +233,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -244,10 +244,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -255,10 +255,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/remot @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm @@ -266,10 +266,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/stubs define i32 @main() nounwind { entry: -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -277,10 +277,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test- @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_3.7~svn238736.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_3.7~svn238736/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 diff --git a/debian/patches/silent-more-tests.diff b/debian/patches/silent-more-tests.diff index 8194ae7a..bc078e4e 100644 --- a/debian/patches/silent-more-tests.diff +++ b/debian/patches/silent-more-tests.diff @@ -1,10 +1,10 @@ # Comment the tests for the code coverage (fails otherwise) -Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll +Index: llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/crash-narrowfunctiontest.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/crash-narrowfunctiontest.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiontest.ll +--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/BugPoint/crash-narrowfunctiontest.ll 2013-08-05 01:55:24.000000000 +0200 ++++ llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/crash-narrowfunctiontest.ll 2013-12-12 23:06:31.454513279 +0100 @@ -2,6 +2,7 @@ ; ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null @@ -13,10 +13,10 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/crash-narrowfunctiont define i32 @foo() { ret i32 1 } -Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll +Index: llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/metadata.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/metadata.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll +--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/BugPoint/metadata.ll 2013-11-23 02:16:29.000000000 +0100 ++++ llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/metadata.ll 2013-12-12 23:07:09.050514482 +0100 @@ -1,6 +1,7 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s @@ -25,22 +25,22 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/metadata.ll ; Bugpoint should keep the call's metadata attached to the call. -Index: llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll +Index: llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/remove_arguments_test.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/BugPoint/remove_arguments_test.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/BugPoint/remove_arguments_test.ll +--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/BugPoint/remove_arguments_test.ll 2013-08-05 01:55:24.000000000 +0200 ++++ llvm-toolchain-snapshot_3.5~svn197156/test/BugPoint/remove_arguments_test.ll 2013-12-12 23:07:24.362514972 +0100 @@ -1,6 +1,7 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s ; REQUIRES: loadable_module +; XFAIL: * - ; Test to make sure that arguments are removed from the function if they are - ; unnecessary. And clean up any types that frees up too. -Index: llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll + ; Test to make sure that arguments are removed from the function if they are + ; unnecessary. And clean up any types that that frees up too. +Index: llvm-toolchain-snapshot_3.5~svn197156/test/Feature/load_module.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/test/Feature/load_module.ll -+++ llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll +--- llvm-toolchain-snapshot_3.5~svn197156.orig/test/Feature/load_module.ll 2013-08-05 01:55:24.000000000 +0200 ++++ llvm-toolchain-snapshot_3.5~svn197156/test/Feature/load_module.ll 2013-12-12 23:07:44.114515604 +0100 @@ -3,6 +3,7 @@ ; RUN: -disable-output 2>&1 | grep Hello ; REQUIRES: loadable_module diff --git a/debian/patches/strip-svn.diff b/debian/patches/strip-svn.diff index 614f63aa..972e7056 100644 --- a/debian/patches/strip-svn.diff +++ b/debian/patches/strip-svn.diff @@ -1,29 +1,40 @@ -Index: llvm-toolchain-snapshot_3.7~svn242297/autoconf/configure.ac +Index: llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac =================================================================== ---- llvm-toolchain-snapshot_3.7~svn242297.orig/autoconf/configure.ac -+++ llvm-toolchain-snapshot_3.7~svn242297/autoconf/configure.ac +--- llvm-toolchain-snapshot_3.7~svn226019.orig/autoconf/configure.ac ++++ llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac @@ -32,12 +32,12 @@ dnl===---------------------------------- dnl Initialize autoconf and define the package name, version number and dnl address for reporting bugs. --AC_INIT([LLVM],[3.8.0svn],[http://llvm.org/bugs/]) -+AC_INIT([LLVM],[3.8.0],[http://llvm.org/bugs/]) +-AC_INIT([LLVM],[3.7.0svn],[http://llvm.org/bugs/]) ++AC_INIT([LLVM],[3.7.0],[http://llvm.org/bugs/]) LLVM_VERSION_MAJOR=3 - LLVM_VERSION_MINOR=8 + LLVM_VERSION_MINOR=7 LLVM_VERSION_PATCH=0 -LLVM_VERSION_SUFFIX=svn +LLVM_VERSION_SUFFIX= AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API]) AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API]) -Index: llvm-toolchain-snapshot_3.7~svn242297/configure +Index: llvm-toolchain-snapshot_3.7~svn226019/configure =================================================================== ---- llvm-toolchain-snapshot_3.7~svn242297.orig/configure -+++ llvm-toolchain-snapshot_3.7~svn242297/configure -@@ -1956,7 +1956,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +--- llvm-toolchain-snapshot_3.7~svn226019.orig/configure ++++ llvm-toolchain-snapshot_3.7~svn226019/configure +@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} + # Identity of this package. + PACKAGE_NAME='LLVM' + PACKAGE_TARNAME='llvm' +-PACKAGE_VERSION='3.7.0svn' +-PACKAGE_STRING='LLVM 3.7.0svn' ++PACKAGE_VERSION='3.7.0' ++PACKAGE_STRING='LLVM 3.7.0' + PACKAGE_BUGREPORT='http://llvm.org/bugs/' + + ac_unique_file="lib/IR/Module.cpp" +@@ -1923,7 +1923,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu LLVM_VERSION_MAJOR=3 - LLVM_VERSION_MINOR=8 + LLVM_VERSION_MINOR=7 LLVM_VERSION_PATCH=0 -LLVM_VERSION_SUFFIX=svn +LLVM_VERSION_SUFFIX= diff --git a/debian/patches/use-deb-json.diff b/debian/patches/use-deb-json.diff index 8c30935e..a065058a 100644 --- a/debian/patches/use-deb-json.diff +++ b/debian/patches/use-deb-json.diff @@ -1,21 +1,21 @@ -Index: llvm-toolchain-snapshot_3.8~svn243372/polly/lib/Makefile +Index: llvm-toolchain-snapshot_3.7~svn237539/polly/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.8~svn243372.orig/polly/lib/Makefile -+++ llvm-toolchain-snapshot_3.8~svn243372/polly/lib/Makefile +--- llvm-toolchain-snapshot_3.7~svn237539.orig/polly/lib/Makefile ++++ llvm-toolchain-snapshot_3.7~svn237539/polly/lib/Makefile @@ -26,9 +26,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \ CodeGen/IslNodeBuilder.cpp \ CodeGen/CodeGeneration.cpp -POLLY_JSON_FILES= JSON/json_reader.cpp \ -- JSON/json_value.cpp \ -- JSON/json_writer.cpp -+#POLLY_JSON_FILES= JSON/json_reader.cpp \ -+# JSON/json_value.cpp \ -+# JSON/json_writer.cpp +- JSON/json_value.cpp \ +- JSON/json_writer.cpp ++# POLLY_JSON_FILES= JSON/json_reader.cpp \ ++# JSON/json_value.cpp \ ++# JSON/json_writer.cpp ISL_FILES= External/isl/basis_reduction_tab.c \ External/isl/isl_aff.c \ -@@ -142,4 +142,5 @@ SOURCES= Polly.cpp \ +@@ -144,4 +144,5 @@ SOURCES= Polly.cpp \ # include $(LEVEL)/Makefile.common diff --git a/debian/rules b/debian/rules index b9bb46e9..6d270935 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ TARGET_BUILD := build-llvm DEB_INST := $(CURDIR)/debian/tmp/ #GCC_VERSION := 4.8 GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') -LLVM_VERSION := 3.8 +LLVM_VERSION := 3.7 LLVM_VERSION_FULL := $(LLVM_VERSION).0 SONAME_EXT := 1 # Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1 From 1f3894fc86933a01f10b7b555486ad79f3fc8f0c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Aug 2015 16:33:23 +0000 Subject: [PATCH 02/46] * Workaround: The 5| in the debian/rules regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only g++-5) accomodate that by hardcoding the 5 detection * Remove Dummy.html from clang-3.7-doc to avoid install (Closes: #794539) --- debian/changelog | 10 ++++++++++ debian/clang-X.Y-doc.install.in | 1 - debian/rules | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 debian/clang-X.Y-doc.install.in diff --git a/debian/changelog b/debian/changelog index 2a9d87ec..e7fa5c03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-3.7 (1:3.7~+rc2-2) unstable; urgency=medium + + * Workaround: + The 5| in the debian/rules regexp is a crappy workaround. + g++ 5.2 in Debian is not providing a g++-5.2 binary (only + g++-5) accomodate that by hardcoding the 5 detection + * Remove Dummy.html from clang-3.7-doc to avoid install (Closes: #794539) + + -- Sylvestre Ledru Tue, 04 Aug 2015 09:27:22 +0200 + llvm-toolchain-3.7 (1:3.7~+rc2-1) unstable; urgency=medium * New snapshot release diff --git a/debian/clang-X.Y-doc.install.in b/debian/clang-X.Y-doc.install.in deleted file mode 100644 index 54efd13e..00000000 --- a/debian/clang-X.Y-doc.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/ diff --git a/debian/rules b/debian/rules index 6d270935..c1403cc1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,9 @@ TARGET_BUILD := build-llvm DEB_INST := $(CURDIR)/debian/tmp/ #GCC_VERSION := 4.8 -GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') +# The 5| in the regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only g++-5) +# accomodate that by hardcoding the 5 detection +GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?(5|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') LLVM_VERSION := 3.7 LLVM_VERSION_FULL := $(LLVM_VERSION).0 SONAME_EXT := 1 From 3851ddd334c0988c15fe3c38284b6e0c71f973fd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 5 Aug 2015 09:52:07 +0000 Subject: [PATCH 03/46] fix a typo --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e7fa5c03..b5130dfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ llvm-toolchain-3.7 (1:3.7~+rc2-2) unstable; urgency=medium * Workaround: The 5| in the debian/rules regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only - g++-5) accomodate that by hardcoding the 5 detection + g++-5) accommodate that by hardcoding the 5 detection + (Closes: #794572) * Remove Dummy.html from clang-3.7-doc to avoid install (Closes: #794539) -- Sylvestre Ledru Tue, 04 Aug 2015 09:27:22 +0200 From 3eeea7a8b3c0723fd55151c32112f74328a17c34 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 13 Aug 2015 07:06:08 +0000 Subject: [PATCH 04/46] Fix VCS field, and cosmetic fixes, to make control file similar to the others (easier comparison) --- debian/changelog | 6 ++++++ debian/control | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5130dfe..7eb143bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium + + * Fix VCS fields. + + -- Gianfranco Costamagna Thu, 13 Aug 2015 09:02:30 +0200 + llvm-toolchain-3.7 (1:3.7~+rc2-2) unstable; urgency=medium * Workaround: diff --git a/debian/control b/debian/control index b3fe78fe..50e8d745 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, libllvm-3.7-ocaml-dev Standards-Version: 3.9.6 Homepage: http://www.llvm.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.7/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/3.7/ # ------------- clang ------------- @@ -300,8 +300,6 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. - - Package: llvm-3.7-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, From 60e65dbf6b852a4e826913ba1bcddba5dd01759d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 13 Aug 2015 14:05:30 +0000 Subject: [PATCH 05/46] rebase bug783205.patch to 3.7 branch --- debian/changelog | 1 + debian/patches/bug783205.patch | 47 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 49 insertions(+) create mode 100644 debian/patches/bug783205.patch diff --git a/debian/changelog b/debian/changelog index 7eb143bb..37790bbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium * Fix VCS fields. + * d/p/bug783205.patch rebase s390x patch to apply to 3.7 -- Gianfranco Costamagna Thu, 13 Aug 2015 09:02:30 +0200 diff --git a/debian/patches/bug783205.patch b/debian/patches/bug783205.patch new file mode 100644 index 00000000..18725ea5 --- /dev/null +++ b/debian/patches/bug783205.patch @@ -0,0 +1,47 @@ +From: Steven Chamberlain +Date: Sun, 10 May 2015 19:46:59 +0100 +Subject: support Debian s390x multiarch paths + +--- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/ToolChains.cpp ++++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/ToolChains.cpp +@@ -3081,6 +3081,10 @@ static std::string getMultiarchTriple(co + if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu")) + return "sparc64-linux-gnu"; + break; ++ case llvm::Triple::systemz: ++ if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu")) ++ return "s390x-linux-gnu"; ++ break; + } + return TargetTriple.str(); + } +@@ -3424,6 +3428,8 @@ void Linux::AddClangSystemIncludeArgs(co + "/usr/include/sparc-linux-gnu"}; + const StringRef Sparc64MultiarchIncludeDirs[] = { + "/usr/include/sparc64-linux-gnu"}; ++ const StringRef SYSTEMZMultiarchIncludeDirs[] = { ++ "/usr/include/s390x-linux-gnu"}; + ArrayRef MultiarchIncludeDirs; + switch (getTriple().getArch()) { + case llvm::Triple::x86_64: +@@ -3469,6 +3475,9 @@ void Linux::AddClangSystemIncludeArgs(co + case llvm::Triple::sparcv9: + MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs; + break; ++ case llvm::Triple::systemz: ++ MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs; ++ break; + default: + break; + } +--- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/Tools.cpp ++++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/Tools.cpp +@@ -8008,7 +8008,7 @@ static std::string getLinuxDynamicLinker + return "/lib64/ld64.so.1"; + return "/lib64/ld64.so.2"; + } else if (Arch == llvm::Triple::systemz) +- return "/lib64/ld64.so.1"; ++ return "/lib/ld64.so.1"; + else if (Arch == llvm::Triple::sparcv9) + return "/lib64/ld-linux.so.2"; + else if (Arch == llvm::Triple::x86_64 && diff --git a/debian/patches/series b/debian/patches/series index 6f9e37f0..11009e07 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,3 +40,4 @@ compiler-rt-i586.diff clang-analyzer-force-version.diff locale-issue-ld.diff +bug783205.patch From c7d2352be04336c4b2ecf63aa868d924c8be889f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 17 Aug 2015 12:29:42 +0000 Subject: [PATCH 06/46] Fix CVE-2015-2305 --- debian/changelog | 1 + debian/patches/CVE-2015-2305.patch | 35 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/CVE-2015-2305.patch diff --git a/debian/changelog b/debian/changelog index 37790bbe..3f0feaf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium * Fix VCS fields. * d/p/bug783205.patch rebase s390x patch to apply to 3.7 + * d/p/CVE-2015-2305.patch, fix security issue on regcomp.c -- Gianfranco Costamagna Thu, 13 Aug 2015 09:02:30 +0200 diff --git a/debian/patches/CVE-2015-2305.patch b/debian/patches/CVE-2015-2305.patch new file mode 100644 index 00000000..7d5964e9 --- /dev/null +++ b/debian/patches/CVE-2015-2305.patch @@ -0,0 +1,35 @@ +Description: Taken from http://gitweb.dragonflybsd.org/dragonfly.git/blobdiff/4d133046c59a851141519d03553a70e903b3eefc..2841837793bd095a82f477e9c370cfe6cfb3862c:/lib/libc/regex/regcomp.c +--- llvm-toolchain-3.5-3.5.2.orig/lib/Support/regcomp.c ++++ llvm-toolchain-3.5-3.5.2/lib/Support/regcomp.c +@@ -169,6 +169,7 @@ llvm_regcomp(llvm_regex_t *preg, const c + struct parse *p = &pa; + int i; + size_t len; ++ size_t maxlen; + #ifdef REDEBUG + # define GOODFLAGS(f) (f) + #else +@@ -191,7 +192,23 @@ llvm_regcomp(llvm_regex_t *preg, const c + (NC-1)*sizeof(cat_t)); + if (g == NULL) + return(REG_ESPACE); ++ /* ++ * Limit the pattern space to avoid a 32-bit overflow on buffer ++ * extension. Also avoid any signed overflow in case of conversion ++ * so make the real limit based on a 31-bit overflow. ++ * ++ * Likely not applicable on 64-bit systems but handle the case ++ * generically (who are we to stop people from using ~715MB+ ++ * patterns?). ++ */ ++ maxlen = ((size_t)-1 >> 1) / sizeof(sop) * 2 / 3; ++ if (len >= maxlen) { ++ free((char *)g); ++ return(REG_ESPACE); ++ } + p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ ++ assert(p->ssize >= len); ++ + p->strip = (sop *)calloc(p->ssize, sizeof(sop)); + p->slen = 0; + if (p->strip == NULL) { diff --git a/debian/patches/series b/debian/patches/series index 11009e07..df00fe76 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,3 +41,4 @@ clang-analyzer-force-version.diff locale-issue-ld.diff bug783205.patch +CVE-2015-2305.patch From 7b452981b825dc4399cf1d03e8a7a5780c5af609 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 18 Aug 2015 11:47:56 +0000 Subject: [PATCH 07/46] Merge 3.6 branch fixes --- debian/changelog | 6 +++ debian/control | 7 ++-- debian/copyright | 47 ++++++++++++++++-------- debian/libllvm-X.Y-ocaml-dev.doc-base.in | 16 ++++---- debian/llvm-X.Y-runtime.postinst.in | 4 +- debian/llvm-X.Y-runtime.prerm.in | 4 +- 6 files changed, 56 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f0feaf7..8659aa39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium + * Team upload * Fix VCS fields. * d/p/bug783205.patch rebase s390x patch to apply to 3.7 * d/p/CVE-2015-2305.patch, fix security issue on regcomp.c + * Fix many lintian warning/errors + - copyright fixes + - updated overrides for v5 switch + - control files + - disabled ocaml documentation -- Gianfranco Costamagna Thu, 13 Aug 2015 09:02:30 +0200 diff --git a/debian/control b/debian/control index 50e8d745..8c45e1ce 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Sylvestre Ledru Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, autoconf, automake, perl, libtool, chrpath, texinfo, sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9), - lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev, + lsb-release, patchutils, diffstat, xz-utils, python-dev, libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libjsoncpp-dev, lcov, procps, help2man, dh-ocaml, zlib1g-dev @@ -14,7 +14,7 @@ Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, libllvm-3.7-ocaml-dev Standards-Version: 3.9.6 Homepage: http://www.llvm.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.7/ +Vcs-Svn: svn://anonscm.debian.org/pkg-llvm/llvm-toolchain/branches/3.7/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/3.7/ # ------------- clang ------------- @@ -122,9 +122,10 @@ Description: C interface to the clang library Package: libclang1-3.7-dbg Architecture: any +Multi-Arch: same Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.7 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.7 (= ${binary:Version}) Description: clang library Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler diff --git a/debian/copyright b/debian/copyright index 5abf09ce..a50dd550 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ License: U-OF-I-BSD-LIKE Files: */install-sh Copyright: 1994 X Consortium -License: +License: LLVM This script is licensed under the LLVM license, with the following additional copyrights and restrictions: . @@ -106,19 +106,19 @@ Copyright: 2009-2013 Craig van Vliet 2009-2013 Howard Hinnant License: U-OF-I-BSD-LIKE or MIT -Files: compiler-rt/BlocksRuntime/Block.h +Files: compiler-rt/lib/BlocksRuntime/Block.h Copyright: 2008-2010 Apple, Inc. License: MIT -Files: compiler-rt/BlocksRuntime/Block_private.h +Files: compiler-rt/lib/BlocksRuntime/Block_private.h Copyright: 2008-2010 Apple, Inc. License: MIT -Files: compiler-rt/BlocksRuntime/data.c +Files: compiler-rt/lib/BlocksRuntime/data.c Copyright: 2008-2010 Apple, Inc. License: MIT -Files: compiler-rt/BlocksRuntime/runtime.c +Files: compiler-rt/lib/BlocksRuntime/runtime.c Copyright: 2008-2010 Apple, Inc. License: MIT @@ -134,7 +134,7 @@ License: BSD-3-clause Files: lib/Target/ARM/* Copyright: ARM Limited -License: +License: ARM ARM Limited . Software Grant License Agreement ("Agreement") @@ -185,7 +185,7 @@ License: Files: lldb/* Copyright: 2010, 2012 Apple Inc. -License: +License: NCSA University of Illinois/NCSA Open Source License . @@ -225,10 +225,10 @@ License: SOFTWARE. Files: lldb/test/pexpect-2.4/* -Copyright: -License: - Free, open source, and all that good stuff. - Pexpect Copyright (c) 2008 Noah Spurrier +Copyright: 2008 Noah Spurrier +License: Expat + +License: Expat . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -251,7 +251,7 @@ License: Files: lldb/test/unittest2/* Copyright: 1999-2003 Steve Purcell 2003-2010 Python Software Foundation -License: +License: Python This module is free software, and you may redistribute it and/or modify it under the same terms as Python itself, so long as this copyright message and disclaimer are retained in their original form. @@ -269,7 +269,7 @@ License: Files: polly/* Copyright: 2009-2013 Polly Team -License: +License: Polly ============================================================================== Polly Release License ============================================================================== @@ -324,9 +324,9 @@ Files: test/YAMLParser/* Copyright: 2006 Kirill Simonov License: MIT -Files: tools/debugserver/source/MacOSX/stack_logging.h +Files: lldb/tools/debugserver/source/MacOSX/stack_logging.h Copyright: 1999-2007 Apple Inc. -License: +License: Apple This file contains Original Code and/or Modifications of Original Code as defined in and that are subject to the Apple Public Source License Version 2.0 (the 'License'). You may not use this file except in @@ -346,6 +346,23 @@ Files: utils/unittest/googletest/* Copyright: 2006-2008, Google Inc. License: BSD-3-Clause +License: BSD-3-Clause + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + License: U-OF-I-BSD-LIKE ============================================================================== LLVM Release License diff --git a/debian/libllvm-X.Y-ocaml-dev.doc-base.in b/debian/libllvm-X.Y-ocaml-dev.doc-base.in index a5dc5fad..287b9c1e 100644 --- a/debian/libllvm-X.Y-ocaml-dev.doc-base.in +++ b/debian/libllvm-X.Y-ocaml-dev.doc-base.in @@ -1,8 +1,8 @@ -Document: libllvm-@LLVM_VERSION@-ocaml-dev-ocamldoc-api-reference -Title: Llvm OCamldoc API Reference -Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc) -Section: Programming/OCaml - -Format: HTML -Index: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/index.html -Files: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/* +#Document: libllvm-@LLVM_VERSION@-ocaml-dev-ocamldoc-api-reference +#Title: Llvm OCamldoc API Reference +#Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc) +#Section: Programming/OCaml +# +#Format: HTML +#Index: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/index.html +#Files: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/* diff --git a/debian/llvm-X.Y-runtime.postinst.in b/debian/llvm-X.Y-runtime.postinst.in index 68300326..987b3ea2 100644 --- a/debian/llvm-X.Y-runtime.postinst.in +++ b/debian/llvm-X.Y-runtime.postinst.in @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if test "$1" = "configure"; then if test -x /usr/sbin/update-binfmts; then diff --git a/debian/llvm-X.Y-runtime.prerm.in b/debian/llvm-X.Y-runtime.prerm.in index 09f96cc5..3f16015a 100644 --- a/debian/llvm-X.Y-runtime.prerm.in +++ b/debian/llvm-X.Y-runtime.prerm.in @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if test "$1" = "remove"; then if test -x /usr/sbin/update-binfmts; then From 45c5637efbf31d34a34786c0131fb9788eb33e42 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 18 Aug 2015 11:57:11 +0000 Subject: [PATCH 08/46] comment useless patch --- debian/patches/series | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index df00fe76..d34bc857 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,5 +40,4 @@ compiler-rt-i586.diff clang-analyzer-force-version.diff locale-issue-ld.diff -bug783205.patch CVE-2015-2305.patch From 7c800d9b6479cfc451c677eaae659ef14e5e4562 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 18 Aug 2015 12:28:43 +0000 Subject: [PATCH 09/46] fix changelog --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8659aa39..ab76c4ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium * Team upload * Fix VCS fields. - * d/p/bug783205.patch rebase s390x patch to apply to 3.7 * d/p/CVE-2015-2305.patch, fix security issue on regcomp.c * Fix many lintian warning/errors - copyright fixes From f89dabf072fae79c398782effb0974479bc32ea7 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 18 Aug 2015 12:38:07 +0000 Subject: [PATCH 10/46] Remove ocaml documentation (not built anymore) --- debian/libllvm-X.Y-ocaml-dev.doc-base.in | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 debian/libllvm-X.Y-ocaml-dev.doc-base.in diff --git a/debian/libllvm-X.Y-ocaml-dev.doc-base.in b/debian/libllvm-X.Y-ocaml-dev.doc-base.in deleted file mode 100644 index 287b9c1e..00000000 --- a/debian/libllvm-X.Y-ocaml-dev.doc-base.in +++ /dev/null @@ -1,8 +0,0 @@ -#Document: libllvm-@LLVM_VERSION@-ocaml-dev-ocamldoc-api-reference -#Title: Llvm OCamldoc API Reference -#Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc) -#Section: Programming/OCaml -# -#Format: HTML -#Index: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/index.html -#Files: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/* From 7609011190c36385a4b9aa510b7d220474eb6ebc Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 19 Aug 2015 06:57:14 +0000 Subject: [PATCH 11/46] Rebase bug783205.patch --- debian/changelog | 3 ++- debian/patches/bug783205.patch | 47 ---------------------------------- debian/patches/series | 3 ++- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 debian/patches/bug783205.patch diff --git a/debian/changelog b/debian/changelog index ab76c4ea..a6337553 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium * Fix many lintian warning/errors - copyright fixes - updated overrides for v5 switch - - control files + - d/control fixes on VCS fields and multiarch. - disabled ocaml documentation + * d/p/bug783205.patch: rebase to 3.7. -- Gianfranco Costamagna Thu, 13 Aug 2015 09:02:30 +0200 diff --git a/debian/patches/bug783205.patch b/debian/patches/bug783205.patch deleted file mode 100644 index 18725ea5..00000000 --- a/debian/patches/bug783205.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Steven Chamberlain -Date: Sun, 10 May 2015 19:46:59 +0100 -Subject: support Debian s390x multiarch paths - ---- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/ToolChains.cpp -+++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/ToolChains.cpp -@@ -3081,6 +3081,10 @@ static std::string getMultiarchTriple(co - if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu")) - return "sparc64-linux-gnu"; - break; -+ case llvm::Triple::systemz: -+ if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu")) -+ return "s390x-linux-gnu"; -+ break; - } - return TargetTriple.str(); - } -@@ -3424,6 +3428,8 @@ void Linux::AddClangSystemIncludeArgs(co - "/usr/include/sparc-linux-gnu"}; - const StringRef Sparc64MultiarchIncludeDirs[] = { - "/usr/include/sparc64-linux-gnu"}; -+ const StringRef SYSTEMZMultiarchIncludeDirs[] = { -+ "/usr/include/s390x-linux-gnu"}; - ArrayRef MultiarchIncludeDirs; - switch (getTriple().getArch()) { - case llvm::Triple::x86_64: -@@ -3469,6 +3475,9 @@ void Linux::AddClangSystemIncludeArgs(co - case llvm::Triple::sparcv9: - MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs; - break; -+ case llvm::Triple::systemz: -+ MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs; -+ break; - default: - break; - } ---- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/Tools.cpp -+++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/Tools.cpp -@@ -8008,7 +8008,7 @@ static std::string getLinuxDynamicLinker - return "/lib64/ld64.so.1"; - return "/lib64/ld64.so.2"; - } else if (Arch == llvm::Triple::systemz) -- return "/lib64/ld64.so.1"; -+ return "/lib/ld64.so.1"; - else if (Arch == llvm::Triple::sparcv9) - return "/lib64/ld-linux.so.2"; - else if (Arch == llvm::Triple::x86_64 && diff --git a/debian/patches/series b/debian/patches/series index d34bc857..ac3c6a8b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -38,6 +38,7 @@ lldb-libname.diff lit-lang.diff compiler-rt-i586.diff clang-analyzer-force-version.diff - +#bug783205.patch locale-issue-ld.diff CVE-2015-2305.patch +bug783205.patch From 69ca1630062a7e3ad5c9ae9657a03cf0870813ec Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 20 Aug 2015 15:48:22 +0000 Subject: [PATCH 12/46] Fix bug 794905 and add patch for bug 783205, update changelog --- debian/changelog | 10 ++++- debian/patches/bug783205.patch | 47 ++++++++++++++++++++ debian/patches/fix-cmake-config-prefix.patch | 22 +++++++++ debian/patches/series | 1 + 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 debian/patches/bug783205.patch create mode 100644 debian/patches/fix-cmake-config-prefix.patch diff --git a/debian/changelog b/debian/changelog index a6337553..947efbb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium * Team upload - * Fix VCS fields. + [ Luciano Bello ] * d/p/CVE-2015-2305.patch, fix security issue on regcomp.c + + [ Gianfranco Costamagna ] + * Fix VCS fields. * Fix many lintian warning/errors - copyright fixes - updated overrides for v5 switch @@ -10,6 +13,11 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium - disabled ocaml documentation * d/p/bug783205.patch: rebase to 3.7. + [ James Price ] + * d/p/fix-cmake-config-prefix.diff: fix cmake path, + needs a change after upstream revision r241080 + (Closes: #794905) + -- Gianfranco Costamagna Thu, 13 Aug 2015 09:02:30 +0200 llvm-toolchain-3.7 (1:3.7~+rc2-2) unstable; urgency=medium diff --git a/debian/patches/bug783205.patch b/debian/patches/bug783205.patch new file mode 100644 index 00000000..18725ea5 --- /dev/null +++ b/debian/patches/bug783205.patch @@ -0,0 +1,47 @@ +From: Steven Chamberlain +Date: Sun, 10 May 2015 19:46:59 +0100 +Subject: support Debian s390x multiarch paths + +--- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/ToolChains.cpp ++++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/ToolChains.cpp +@@ -3081,6 +3081,10 @@ static std::string getMultiarchTriple(co + if (llvm::sys::fs::exists(SysRoot + "/lib/sparc64-linux-gnu")) + return "sparc64-linux-gnu"; + break; ++ case llvm::Triple::systemz: ++ if (llvm::sys::fs::exists(SysRoot + "/lib/s390x-linux-gnu")) ++ return "s390x-linux-gnu"; ++ break; + } + return TargetTriple.str(); + } +@@ -3424,6 +3428,8 @@ void Linux::AddClangSystemIncludeArgs(co + "/usr/include/sparc-linux-gnu"}; + const StringRef Sparc64MultiarchIncludeDirs[] = { + "/usr/include/sparc64-linux-gnu"}; ++ const StringRef SYSTEMZMultiarchIncludeDirs[] = { ++ "/usr/include/s390x-linux-gnu"}; + ArrayRef MultiarchIncludeDirs; + switch (getTriple().getArch()) { + case llvm::Triple::x86_64: +@@ -3469,6 +3475,9 @@ void Linux::AddClangSystemIncludeArgs(co + case llvm::Triple::sparcv9: + MultiarchIncludeDirs = Sparc64MultiarchIncludeDirs; + break; ++ case llvm::Triple::systemz: ++ MultiarchIncludeDirs = SYSTEMZMultiarchIncludeDirs; ++ break; + default: + break; + } +--- llvm-toolchain-3.7-3.7~+rc2.orig/clang/lib/Driver/Tools.cpp ++++ llvm-toolchain-3.7-3.7~+rc2/clang/lib/Driver/Tools.cpp +@@ -8008,7 +8008,7 @@ static std::string getLinuxDynamicLinker + return "/lib64/ld64.so.1"; + return "/lib64/ld64.so.2"; + } else if (Arch == llvm::Triple::systemz) +- return "/lib64/ld64.so.1"; ++ return "/lib/ld64.so.1"; + else if (Arch == llvm::Triple::sparcv9) + return "/lib64/ld-linux.so.2"; + else if (Arch == llvm::Triple::x86_64 && diff --git a/debian/patches/fix-cmake-config-prefix.patch b/debian/patches/fix-cmake-config-prefix.patch new file mode 100644 index 00000000..4e9ad803 --- /dev/null +++ b/debian/patches/fix-cmake-config-prefix.patch @@ -0,0 +1,22 @@ +--- a/cmake/modules/Makefile ++++ b/cmake/modules/Makefile +@@ -62,17 +62,9 @@ + + LLVM_CONFIG_CODE := \ + \# Compute the CMake directory from the LLVMConfig.cmake file location.\n\ +-get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n\ +-\# Compute the installation prefix from the LLVMConfig.cmake file location.\n\ +-get_filename_component(LLVM_INSTALL_PREFIX "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n ++get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n + +-# Compute number of levels (typically 3 - ``share/llvm/cmake/``) to PROJ_prefix +-# from PROJ_cmake, then emit the appropriate number of calls to +-# get_filename_components(). Note this assumes there are no spaces in the +-# cmake_path_suffix variable. +-cmake_path_suffix := $(subst $(PROJ_prefix),,$(subst $(DESTDIR),,$(PROJ_cmake))) +-cmake_path_dirs := $(subst /, ,$(cmake_path_suffix)) +-LLVM_CONFIG_CODE += $(foreach __not_used,$(cmake_path_dirs),get_filename_component(LLVM_INSTALL_PREFIX "$${LLVM_INSTALL_PREFIX}" PATH)\n) ++LLVM_CONFIG_CODE += set(LLVM_INSTALL_PREFIX "$(subst /,\/,$(PROJ_prefix))")\n + + LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib") + diff --git a/debian/patches/series b/debian/patches/series index ac3c6a8b..3bc27bf3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,3 +42,4 @@ clang-analyzer-force-version.diff locale-issue-ld.diff CVE-2015-2305.patch bug783205.patch +fix-cmake-config-prefix.patch From 92a41b7e9945a930c47a5fa2d521652d5d062b2b Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 20 Aug 2015 15:50:58 +0000 Subject: [PATCH 13/46] Rename patch --- debian/changelog | 1 + debian/patches/fix-cmake-config-prefix.diff | 22 +++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-cmake-config-prefix.diff diff --git a/debian/changelog b/debian/changelog index 947efbb2..be6fec30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium * Team upload + [ Luciano Bello ] * d/p/CVE-2015-2305.patch, fix security issue on regcomp.c diff --git a/debian/patches/fix-cmake-config-prefix.diff b/debian/patches/fix-cmake-config-prefix.diff new file mode 100644 index 00000000..4e9ad803 --- /dev/null +++ b/debian/patches/fix-cmake-config-prefix.diff @@ -0,0 +1,22 @@ +--- a/cmake/modules/Makefile ++++ b/cmake/modules/Makefile +@@ -62,17 +62,9 @@ + + LLVM_CONFIG_CODE := \ + \# Compute the CMake directory from the LLVMConfig.cmake file location.\n\ +-get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n\ +-\# Compute the installation prefix from the LLVMConfig.cmake file location.\n\ +-get_filename_component(LLVM_INSTALL_PREFIX "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n ++get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n + +-# Compute number of levels (typically 3 - ``share/llvm/cmake/``) to PROJ_prefix +-# from PROJ_cmake, then emit the appropriate number of calls to +-# get_filename_components(). Note this assumes there are no spaces in the +-# cmake_path_suffix variable. +-cmake_path_suffix := $(subst $(PROJ_prefix),,$(subst $(DESTDIR),,$(PROJ_cmake))) +-cmake_path_dirs := $(subst /, ,$(cmake_path_suffix)) +-LLVM_CONFIG_CODE += $(foreach __not_used,$(cmake_path_dirs),get_filename_component(LLVM_INSTALL_PREFIX "$${LLVM_INSTALL_PREFIX}" PATH)\n) ++LLVM_CONFIG_CODE += set(LLVM_INSTALL_PREFIX "$(subst /,\/,$(PROJ_prefix))")\n + + LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib") + diff --git a/debian/patches/series b/debian/patches/series index 3bc27bf3..6c2a39ef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,4 +42,4 @@ clang-analyzer-force-version.diff locale-issue-ld.diff CVE-2015-2305.patch bug783205.patch -fix-cmake-config-prefix.patch +fix-cmake-config-prefix.diff From 2167e312ee2b84e6f3285e062d4039bc1148bd35 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 21 Aug 2015 10:32:02 +0000 Subject: [PATCH 14/46] * New upstream snapshot * Remove an obsolete declaration about dragonegg (Closes: #796182) --- debian/changelog | 8 +++++--- debian/control | 3 --- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index be6fec30..b3a3cf65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium +llvm-toolchain-3.7 (1:3.7~+rc3-1) unstable; urgency=medium - * Team upload + * New upstream snapshot + * Remove an obsolete declaration about dragonegg + (Closes: #796182) [ Luciano Bello ] * d/p/CVE-2015-2305.patch, fix security issue on regcomp.c @@ -19,7 +21,7 @@ llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium needs a change after upstream revision r241080 (Closes: #794905) - -- Gianfranco Costamagna Thu, 13 Aug 2015 09:02:30 +0200 + -- Sylvestre Ledru Fri, 21 Aug 2015 12:23:18 +0200 llvm-toolchain-3.7 (1:3.7~+rc2-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 8c45e1ce..9dbb479f 100644 --- a/debian/control +++ b/debian/control @@ -255,9 +255,6 @@ Description: Modular compiler and toolchain technologies and C++ front-ends, a front-end for a Forth-like language (Stacker), a young scheme front-end, and Java support is in development. LLVM can generate code for X86, SparcV9, PowerPC or many other architectures. - . - LLVM is the key component of the clang compiler and the gcc plugin called - dragonegg. Package: llvm-3.7-runtime Architecture: any From f4b609552e8e91d613ef604930b4dc9336188f4f Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 24 Aug 2015 09:50:50 +0000 Subject: [PATCH 15/46] Remove old file --- debian/patches/fix-cmake-config-prefix.patch | 22 -------------------- 1 file changed, 22 deletions(-) delete mode 100644 debian/patches/fix-cmake-config-prefix.patch diff --git a/debian/patches/fix-cmake-config-prefix.patch b/debian/patches/fix-cmake-config-prefix.patch deleted file mode 100644 index 4e9ad803..00000000 --- a/debian/patches/fix-cmake-config-prefix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/cmake/modules/Makefile -+++ b/cmake/modules/Makefile -@@ -62,17 +62,9 @@ - - LLVM_CONFIG_CODE := \ - \# Compute the CMake directory from the LLVMConfig.cmake file location.\n\ --get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n\ --\# Compute the installation prefix from the LLVMConfig.cmake file location.\n\ --get_filename_component(LLVM_INSTALL_PREFIX "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n -+get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n - --# Compute number of levels (typically 3 - ``share/llvm/cmake/``) to PROJ_prefix --# from PROJ_cmake, then emit the appropriate number of calls to --# get_filename_components(). Note this assumes there are no spaces in the --# cmake_path_suffix variable. --cmake_path_suffix := $(subst $(PROJ_prefix),,$(subst $(DESTDIR),,$(PROJ_cmake))) --cmake_path_dirs := $(subst /, ,$(cmake_path_suffix)) --LLVM_CONFIG_CODE += $(foreach __not_used,$(cmake_path_dirs),get_filename_component(LLVM_INSTALL_PREFIX "$${LLVM_INSTALL_PREFIX}" PATH)\n) -+LLVM_CONFIG_CODE += set(LLVM_INSTALL_PREFIX "$(subst /,\/,$(PROJ_prefix))")\n - - LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib") - From e43e290b212f1c1d0f249fa34db1cd8630efd7bf Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 25 Aug 2015 13:57:16 +0000 Subject: [PATCH 16/46] Update changelog and control file --- debian/changelog | 8 ++++++++ debian/control | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3a3cf65..d5f8143e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-3.7 (1:3.7~+rc3-2) UNRELEASED; urgency=medium + + * Team Upload + * d/control: Add more conflicting packages (clang and lldb) + (Closes: #796811, #796843) + + -- Gianfranco Costamagna Tue, 25 Aug 2015 15:56:17 +0200 + llvm-toolchain-3.7 (1:3.7~+rc3-1) unstable; urgency=medium * New upstream snapshot diff --git a/debian/control b/debian/control index 9dbb479f..2d65e7c7 100644 --- a/debian/control +++ b/debian/control @@ -172,8 +172,8 @@ Package: python-clang-3.7 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python -Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6 -Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6 +Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.8 +Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.8 Description: Clang Python Bindings Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -218,7 +218,7 @@ Package: libllvm3.7-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Modular compiler and toolchain technologies, debugging libraries @@ -412,7 +412,7 @@ Package: python-lldb-3.7 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python -Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6 +Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.8 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, python lib LLDB is a next generation, high-performance debugger. It is built as a set of From c09becb6f8e595ef17b10cd79e9c5fe0729bef6a Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 25 Aug 2015 14:03:28 +0000 Subject: [PATCH 17/46] Fix changelog typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d5f8143e..c13292ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ llvm-toolchain-3.7 (1:3.7~+rc3-2) UNRELEASED; urgency=medium * Team Upload - * d/control: Add more conflicting packages (clang and lldb) + * d/control: Add more conflicting packages (python-clang and python-lldb) (Closes: #796811, #796843) -- Gianfranco Costamagna Tue, 25 Aug 2015 15:56:17 +0200 From f23d92edec447aa9a42e909151fb483c08c63ca8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 27 Aug 2015 13:12:32 +0000 Subject: [PATCH 18/46] New snapshot release --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c13292ba..2de55026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -llvm-toolchain-3.7 (1:3.7~+rc3-2) UNRELEASED; urgency=medium +llvm-toolchain-3.7 (1:3.7~+rc4-1) unstable; urgency=medium - * Team Upload + * New snapshot release + + [ Gianfranco Costamagna ] * d/control: Add more conflicting packages (python-clang and python-lldb) (Closes: #796811, #796843) - -- Gianfranco Costamagna Tue, 25 Aug 2015 15:56:17 +0200 + -- Sylvestre Ledru Thu, 27 Aug 2015 08:53:59 +0200 llvm-toolchain-3.7 (1:3.7~+rc3-1) unstable; urgency=medium From 60d65515dc2d7f12ce4c1f868c6cb6a052f988c2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 28 Aug 2015 07:04:46 +0000 Subject: [PATCH 19/46] New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2de55026..a589745c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-3.7 (1:3.7-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Fri, 28 Aug 2015 08:59:58 +0200 + llvm-toolchain-3.7 (1:3.7~+rc4-1) unstable; urgency=medium * New snapshot release From e956e97150632c0cb7dc47aac4c15bede025f495 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 28 Aug 2015 07:10:36 +0000 Subject: [PATCH 20/46] * debian/patches/kfreebsd-build-fix.patch: - fix kfreebsd-* build failures by workarounding missing F_DUPFD_CLOEXEC (rebased patch from gnome-terminal 10_kfreebsd-f_dupfd_cloexec.patch) --- debian/changelog | 6 ++++++ debian/patches/series | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a589745c..af89ce8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,12 @@ llvm-toolchain-3.7 (1:3.7-1) unstable; urgency=medium * New upstream release + [ Gianfranco Costamagna ] + * debian/patches/kfreebsd-build-fix.patch: + - fix kfreebsd-* build failures by workarounding + missing F_DUPFD_CLOEXEC (rebased patch from gnome-terminal + 10_kfreebsd-f_dupfd_cloexec.patch) + -- Sylvestre Ledru Fri, 28 Aug 2015 08:59:58 +0200 llvm-toolchain-3.7 (1:3.7~+rc4-1) unstable; urgency=medium diff --git a/debian/patches/series b/debian/patches/series index 6c2a39ef..cbdf1f78 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -43,3 +43,4 @@ locale-issue-ld.diff CVE-2015-2305.patch bug783205.patch fix-cmake-config-prefix.diff +kfreebsd-build-fix.patch From b3a8f0b1b7dec3beee682ad74545ad4597853993 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 28 Aug 2015 07:10:50 +0000 Subject: [PATCH 21/46] Add patch --- debian/patches/kfreebsd-build-fix.patch | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 debian/patches/kfreebsd-build-fix.patch diff --git a/debian/patches/kfreebsd-build-fix.patch b/debian/patches/kfreebsd-build-fix.patch new file mode 100644 index 00000000..000dcadc --- /dev/null +++ b/debian/patches/kfreebsd-build-fix.patch @@ -0,0 +1,41 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +Description: Avoid usage of F_DUPFD_CLOEXEC where not available (e.g. kfreebsd*) + The patch is mostly taken from 10_kfreebsd-f_dupfd_cloexec.patch (gnome-terminal) + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711529 + Description: Fix build on kfreebsd + + kfreebsd doesn't have F_DUPFD_CLOEXEC, so use it conditionally. + As mentioned in the bug report, it will have support for it in + jessie, so we can drop it in jessie+1 + Author: Emilio Pozuelo Monfort + Author: Petr Salinger + +Author: Gianfranco Costamagna +--- llvm-toolchain-3.7-3.7~+rc3.orig/lldb/source/Plugins/Process/FreeBSD/ProcessPOSIX.cpp ++++ llvm-toolchain-3.7-3.7~+rc3/lldb/source/Plugins/Process/FreeBSD/ProcessPOSIX.cpp +@@ -214,11 +214,24 @@ ProcessPOSIX::DoLaunch (Module *module, + int terminal = m_monitor->GetTerminalFD(); + if (terminal >= 0) { + // The reader thread will close the file descriptor when done, so we pass it a copy. ++#ifdef F_DUPFD_CLOEXEC + int stdio = fcntl(terminal, F_DUPFD_CLOEXEC, 0); + if (stdio == -1) { + error.SetErrorToErrno(); + return error; + } ++#else ++ int stdio = fcntl(terminal, F_DUPFD, 0); ++ if (stdio == -1) { ++ error.SetErrorToErrno(); ++ return error; ++ } ++ stdio = fcntl(terminal, F_SETFD, FD_CLOEXEC); ++ if (stdio == -1) { ++ error.SetErrorToErrno(); ++ return error; ++ } ++#endif + SetSTDIOFileDescriptor(stdio); + } From 4a695d221aae0e8689927593f74c1b656e34edad Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 28 Aug 2015 07:13:23 +0000 Subject: [PATCH 22/46] Simplify patch --- debian/patches/kfreebsd-build-fix.patch | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/patches/kfreebsd-build-fix.patch b/debian/patches/kfreebsd-build-fix.patch index 000dcadc..237d048e 100644 --- a/debian/patches/kfreebsd-build-fix.patch +++ b/debian/patches/kfreebsd-build-fix.patch @@ -1,6 +1,3 @@ -## Description: add some description -## Origin/Author: add some origin or author -## Bug: bug URL Description: Avoid usage of F_DUPFD_CLOEXEC where not available (e.g. kfreebsd*) The patch is mostly taken from 10_kfreebsd-f_dupfd_cloexec.patch (gnome-terminal) Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711529 From 50641c5803cc93428d0021f061bef1fad5cd756c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 28 Aug 2015 07:40:01 +0000 Subject: [PATCH 23/46] Disable lldb on s390x, alpha & powerpc See https://llvm.org/bugs/show_bug.cgi?id=24548 --- debian/changelog | 2 ++ debian/control | 12 ++++++------ debian/rules | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index af89ce8c..8f5ce126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ llvm-toolchain-3.7 (1:3.7-1) unstable; urgency=medium * New upstream release + * Disable lldb on s390x, alpha & powerpc + See https://llvm.org/bugs/show_bug.cgi?id=24548 [ Gianfranco Costamagna ] * debian/patches/kfreebsd-build-fix.patch: diff --git a/debian/control b/debian/control index 2d65e7c7..1687501f 100644 --- a/debian/control +++ b/debian/control @@ -382,8 +382,8 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- Package: lldb-3.7 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel -# ia64 mips mipsel hurd ppc64el have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel +# ia64 mips mipsel hurd ppc64el s390x powerpc alpha have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}), python, llvm-3.7-dev, python-lldb-3.7 Conflicts: lldb-3.4, lldb-3.5 Pre-Depends: ${misc:Pre-Depends} @@ -393,8 +393,8 @@ Description: Next generation, high-performance debugger Project, such as the Clang expression parser and LLVM disassembler. Package: liblldb-3.7 -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel -# ia64 mips mipsel hurd ppc64el have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel +# ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -424,8 +424,8 @@ Description: Next generation, high-performance debugger, python lib Package: liblldb-3.7-dev Section: libdevel -Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 powerpc mips mipsel -# ia64 mips mipsel hurd ppc64el have been removed +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel +# ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.7 (= ${binary:Version}) Replaces: lldb-3.7-dev (<= 1:3.7~svn215195-2) Breaks: lldb-3.7-dev (<< 1:3.7~svn215195-2) diff --git a/debian/rules b/debian/rules index c1403cc1..4befc4b2 100755 --- a/debian/rules +++ b/debian/rules @@ -115,8 +115,9 @@ endif LLDB_ENABLE=yes -LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el +LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el s390x powerpc alpha # hurd has threading issues +# And some archs are failing because of https://llvm.org/bugs/show_bug.cgi?id=24548 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch. LLDB_ENABLE=no From ac07cf4fdff6126fbee3f1438dcfc0b567076cd9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 28 Aug 2015 12:22:58 +0000 Subject: [PATCH 24/46] Remove CVE-2015-2305.patch. Already fixed upstream in a different way --- debian/changelog | 7 ++++++ debian/patches/CVE-2015-2305.patch | 35 ------------------------------ debian/patches/series | 1 - 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 debian/patches/CVE-2015-2305.patch diff --git a/debian/changelog b/debian/changelog index 8f5ce126..cee21277 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.7 (1:3.7-2) UNRELEASED; urgency=medium + + * Remove CVE-2015-2305.patch. Already fixed upstream in a different + way + + -- Sylvestre Ledru Fri, 28 Aug 2015 14:22:33 +0200 + llvm-toolchain-3.7 (1:3.7-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/CVE-2015-2305.patch b/debian/patches/CVE-2015-2305.patch deleted file mode 100644 index 7d5964e9..00000000 --- a/debian/patches/CVE-2015-2305.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: Taken from http://gitweb.dragonflybsd.org/dragonfly.git/blobdiff/4d133046c59a851141519d03553a70e903b3eefc..2841837793bd095a82f477e9c370cfe6cfb3862c:/lib/libc/regex/regcomp.c ---- llvm-toolchain-3.5-3.5.2.orig/lib/Support/regcomp.c -+++ llvm-toolchain-3.5-3.5.2/lib/Support/regcomp.c -@@ -169,6 +169,7 @@ llvm_regcomp(llvm_regex_t *preg, const c - struct parse *p = &pa; - int i; - size_t len; -+ size_t maxlen; - #ifdef REDEBUG - # define GOODFLAGS(f) (f) - #else -@@ -191,7 +192,23 @@ llvm_regcomp(llvm_regex_t *preg, const c - (NC-1)*sizeof(cat_t)); - if (g == NULL) - return(REG_ESPACE); -+ /* -+ * Limit the pattern space to avoid a 32-bit overflow on buffer -+ * extension. Also avoid any signed overflow in case of conversion -+ * so make the real limit based on a 31-bit overflow. -+ * -+ * Likely not applicable on 64-bit systems but handle the case -+ * generically (who are we to stop people from using ~715MB+ -+ * patterns?). -+ */ -+ maxlen = ((size_t)-1 >> 1) / sizeof(sop) * 2 / 3; -+ if (len >= maxlen) { -+ free((char *)g); -+ return(REG_ESPACE); -+ } - p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ -+ assert(p->ssize >= len); -+ - p->strip = (sop *)calloc(p->ssize, sizeof(sop)); - p->slen = 0; - if (p->strip == NULL) { diff --git a/debian/patches/series b/debian/patches/series index cbdf1f78..4eb999b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,7 +40,6 @@ compiler-rt-i586.diff clang-analyzer-force-version.diff #bug783205.patch locale-issue-ld.diff -CVE-2015-2305.patch bug783205.patch fix-cmake-config-prefix.diff kfreebsd-build-fix.patch From 6ac6f30293442f0da5d9aefc3559c7708e0057ce Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 6 Sep 2015 10:13:31 +0000 Subject: [PATCH 25/46] Also generate liblldb-3.7-dbg --- debian/changelog | 1 + debian/control | 13 +++++++++++++ debian/rules | 1 + 3 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index cee21277..81142151 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-3.7 (1:3.7-2) UNRELEASED; urgency=medium * Remove CVE-2015-2305.patch. Already fixed upstream in a different way + * Also generate liblldb-3.7-dbg -- Sylvestre Ledru Fri, 28 Aug 2015 14:22:33 +0200 diff --git a/debian/control b/debian/control index 1687501f..37a2c0fc 100644 --- a/debian/control +++ b/debian/control @@ -407,6 +407,19 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. +Package: liblldb-3.7-dbg +Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel +# ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed +Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.7 (= ${binary:Version}) +Pre-Depends: ${misc:Pre-Depends} +Section: extra +Description: Next generation, high-performance debugger, debugging libraries + LLDB is a next generation, high-performance debugger. It is built as a set of + reusable components which highly leverage existing libraries in the larger LLVM + Project, such as the Clang expression parser and LLVM disassembler. + . + This package contains the LLDB runtime library debug symbols. + Package: python-lldb-3.7 Section: python diff --git a/debian/rules b/debian/rules index 4befc4b2..02aa843f 100755 --- a/debian/rules +++ b/debian/rules @@ -374,6 +374,7 @@ override_dh_installman: override_dh_strip: dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg + dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=libllldb-(LLVM_VERSION)-dbg dh_strip -a From 472959be9f7fa6f440d77fd45c040467dc6613a6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 6 Sep 2015 18:00:36 +0000 Subject: [PATCH 26/46] fix a typo --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 02aa843f..825fd2c9 100755 --- a/debian/rules +++ b/debian/rules @@ -374,7 +374,7 @@ override_dh_installman: override_dh_strip: dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg - dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=libllldb-(LLVM_VERSION)-dbg + dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=libllldb-$(LLVM_VERSION)-dbg dh_strip -a From b38f4db27ca9619972c5df272a3351c9b4fef2ec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 7 Sep 2015 08:10:53 +0000 Subject: [PATCH 27/46] fix a second typo --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 825fd2c9..55ae1a01 100755 --- a/debian/rules +++ b/debian/rules @@ -374,7 +374,7 @@ override_dh_installman: override_dh_strip: dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg - dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=libllldb-$(LLVM_VERSION)-dbg + dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=liblldb-$(LLVM_VERSION)-dbg dh_strip -a From 6e95e4620cb8b45b5fbd6f24a5044c7206c05064 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Sep 2015 16:20:54 +0000 Subject: [PATCH 28/46] Select LLVM OpenMP as the default backend --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 81142151..b653f49b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-3.7 (1:3.7-2) UNRELEASED; urgency=medium * Remove CVE-2015-2305.patch. Already fixed upstream in a different way * Also generate liblldb-3.7-dbg + * Select LLVM OpenMP as the default backend -- Sylvestre Ledru Fri, 28 Aug 2015 14:22:33 +0200 diff --git a/debian/rules b/debian/rules index 55ae1a01..29af9444 100755 --- a/debian/rules +++ b/debian/rules @@ -213,6 +213,7 @@ override_dh_auto_configure: preconfigure --with-bug-report-url=http://bugs.debian.org/ \ --enable-shared \ --disable-bindings \ + --with-clang-default-openmp-runtime=libomp \ $(CONFIGURE_EXTRA) \ CLANG_VENDOR=$(VENDOR) || { cat config.log tools/polly/config.log; exit 1; }; \ else \ From b4f0073bc4bb108cf20c6e4878e75bdb25ef5317 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Sep 2015 18:23:07 +0000 Subject: [PATCH 29/46] fix the section --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 37a2c0fc..7d924b83 100644 --- a/debian/control +++ b/debian/control @@ -412,7 +412,7 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hp # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.7 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} -Section: extra +Section: debug Description: Next generation, high-performance debugger, debugging libraries LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM From 72d24bffafdb0093fc2e51117447938bb91126fb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 15 Sep 2015 16:08:56 +0000 Subject: [PATCH 30/46] uploaded --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b653f49b..e780f191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-3.7 (1:3.7-2) UNRELEASED; urgency=medium +llvm-toolchain-3.7 (1:3.7-2) unstable; urgency=medium * Remove CVE-2015-2305.patch. Already fixed upstream in a different way From f51fa296bf14de0c7fdd01b94aceb5e049673b5f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 17 Sep 2015 12:47:42 +0000 Subject: [PATCH 31/46] Update compiler-rt to simplify the port to Ubuntu precise ubuntu-precise-compiler-rt.diff --- debian/changelog | 7 +++++++ debian/patches/series | 1 + debian/patches/ubuntu-precise-compiler-rt.diff | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 debian/patches/ubuntu-precise-compiler-rt.diff diff --git a/debian/changelog b/debian/changelog index e780f191..fbdf7c52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.7 (1:3.7-3) UNRELEASED; urgency=medium + + * Update compiler-rt to simplify the port to Ubuntu precise + ubuntu-precise-compiler-rt.diff + + -- Sylvestre Ledru Thu, 17 Sep 2015 14:47:17 +0200 + llvm-toolchain-3.7 (1:3.7-2) unstable; urgency=medium * Remove CVE-2015-2305.patch. Already fixed upstream in a different diff --git a/debian/patches/series b/debian/patches/series index 4eb999b3..61e9de69 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -43,3 +43,4 @@ locale-issue-ld.diff bug783205.patch fix-cmake-config-prefix.diff kfreebsd-build-fix.patch +ubuntu-precise-compiler-rt.diff diff --git a/debian/patches/ubuntu-precise-compiler-rt.diff b/debian/patches/ubuntu-precise-compiler-rt.diff new file mode 100644 index 00000000..b0d56949 --- /dev/null +++ b/debian/patches/ubuntu-precise-compiler-rt.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-3.7-3.7/compiler-rt/make/platform/clang_linux.mk +=================================================================== +--- llvm-toolchain-3.7-3.7.orig/compiler-rt/make/platform/clang_linux.mk ++++ llvm-toolchain-3.7-3.7/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 i586,$(CompilerTargetArch)),true) ++ifeq ($(call contains,i386 x86_64 i586 i686,$(CompilerTargetArch)),true) + + # TryCompile compiler source flags + # Returns exit code of running a compiler invocation. From 80c968520e3d64577581698232dd6742f72978d9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 21 Sep 2015 15:02:06 +0000 Subject: [PATCH 32/46] also update an other section of the file --- debian/patches/ubuntu-precise-compiler-rt.diff | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/patches/ubuntu-precise-compiler-rt.diff b/debian/patches/ubuntu-precise-compiler-rt.diff index b0d56949..86523bbc 100644 --- a/debian/patches/ubuntu-precise-compiler-rt.diff +++ b/debian/patches/ubuntu-precise-compiler-rt.diff @@ -11,3 +11,13 @@ Index: llvm-toolchain-3.7-3.7/compiler-rt/make/platform/clang_linux.mk # TryCompile compiler source flags # Returns exit code of running a compiler invocation. +@@ -35,7 +35,7 @@ + echo $$?) + + test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c +-ifneq (,$(filter $(CompilerTargetArch),i386 i586)) ++ifneq (,$(filter $(CompilerTargetArch),i386 i586 i686)) + SupportedArches := i386 + ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0) + SupportedArches += x86_64 + From 86f14dd40b14d571b8f612462286df398ee4dc4c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Oct 2015 08:54:01 +0000 Subject: [PATCH 33/46] Introduce clang-tidy as a new package --- debian/changelog | 1 + debian/clang-X.Y.install.in | 2 -- debian/clang-X.Y.lintian-overrides.in | 1 - debian/clang-X.Y.manpages.in | 1 - debian/clang-tidy-X.Y.install.in | 2 ++ debian/clang-tidy-X.Y.lintian-overrides.in | 3 +++ debian/clang-tidy-X.Y.manpages.in | 1 + debian/control | 9 +++++++++ 8 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 debian/clang-tidy-X.Y.install.in create mode 100644 debian/clang-tidy-X.Y.lintian-overrides.in create mode 100644 debian/clang-tidy-X.Y.manpages.in diff --git a/debian/changelog b/debian/changelog index fbdf7c52..974f9001 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-3.7 (1:3.7-3) UNRELEASED; urgency=medium * Update compiler-rt to simplify the port to Ubuntu precise ubuntu-precise-compiler-rt.diff + * Introduce clang-tidy as a new package -- Sylvestre Ledru Thu, 17 Sep 2015 14:47:17 +0200 diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 22272cf3..1dcdda7e 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -4,7 +4,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-check usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements -usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-query usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename @@ -20,7 +19,6 @@ usr/bin/clang-check-@LLVM_VERSION@ usr/bin/clang-tblgen-@LLVM_VERSION@ usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/clang-apply-replacements-@LLVM_VERSION@ -usr/bin/clang-tidy-@LLVM_VERSION@ usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/clang-query-@LLVM_VERSION@ usr/bin/clang-rename-@LLVM_VERSION@ diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index dabecf22..46514394 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -5,7 +5,6 @@ clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-v clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index 852e6c0a..3a952059 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -3,6 +3,5 @@ clang/tools/scan-build/scan-build-@LLVM_VERSION@.1 debian/man/clang-check-@LLVM_VERSION@.1 debian/man/clang-tblgen-@LLVM_VERSION@.1 debian/man/scan-view-@LLVM_VERSION@.1 -debian/man/clang-tidy-@LLVM_VERSION@.1 debian/man/clang-apply-replacements-@LLVM_VERSION@.1 debian/man/pp-trace-@LLVM_VERSION@.1 diff --git a/debian/clang-tidy-X.Y.install.in b/debian/clang-tidy-X.Y.install.in new file mode 100644 index 00000000..1041ae4c --- /dev/null +++ b/debian/clang-tidy-X.Y.install.in @@ -0,0 +1,2 @@ +usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy +usr/bin/clang-tidy-@LLVM_VERSION@ diff --git a/debian/clang-tidy-X.Y.lintian-overrides.in b/debian/clang-tidy-X.Y.lintian-overrides.in new file mode 100644 index 00000000..3cad8316 --- /dev/null +++ b/debian/clang-tidy-X.Y.lintian-overrides.in @@ -0,0 +1,3 @@ +# I know but well... +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz + diff --git a/debian/clang-tidy-X.Y.manpages.in b/debian/clang-tidy-X.Y.manpages.in new file mode 100644 index 00000000..fa4a8146 --- /dev/null +++ b/debian/clang-tidy-X.Y.manpages.in @@ -0,0 +1 @@ +debian/man/clang-tidy-@LLVM_VERSION@.1 diff --git a/debian/control b/debian/control index 7d924b83..5bdaa214 100644 --- a/debian/control +++ b/debian/control @@ -85,6 +85,15 @@ Description: Tool to convert C++98 and C++03 code to C++11 the AST Matching library. +Package: clang-tidy-3.7 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: clang-based C++ linter tool + Provide an extensible framework for diagnosing and fixing typical programming + errors, like style violations, interface misuse, or bugs that can be deduced + via static analysis. clang-tidy is modular and provides a convenient interface + for writing new checks. + Package: clang-3.7-doc Architecture: all Section: doc From c8aa5bec599b49f28d7555dfeda4d01a76536dc7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Oct 2015 12:18:13 +0000 Subject: [PATCH 34/46] Fix the lintian overrides for clang-tidy --- debian/clang-tidy-X.Y.lintian-overrides.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/clang-tidy-X.Y.lintian-overrides.in b/debian/clang-tidy-X.Y.lintian-overrides.in index 3cad8316..c915da60 100644 --- a/debian/clang-tidy-X.Y.lintian-overrides.in +++ b/debian/clang-tidy-X.Y.lintian-overrides.in @@ -1,3 +1,3 @@ # I know but well... -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz +clang-tidy-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz From 3b086bf46164488faff78f0ae8b43a5502156837 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Oct 2015 07:06:17 +0000 Subject: [PATCH 35/46] Introduce clang-tidy-3.7 as a new package --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 974f9001..983a7da9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -llvm-toolchain-3.7 (1:3.7-3) UNRELEASED; urgency=medium +llvm-toolchain-3.7 (1:3.7-3) unstable; urgency=medium * Update compiler-rt to simplify the port to Ubuntu precise ubuntu-precise-compiler-rt.diff - * Introduce clang-tidy as a new package + * Introduce clang-tidy-3.7 as a new package -- Sylvestre Ledru Thu, 17 Sep 2015 14:47:17 +0200 From 07f978740684e1b6ee1d927892e20dc82321f76c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Oct 2015 07:10:45 +0000 Subject: [PATCH 36/46] Add a Break/Replaces clang-3.7 (<< 1:3.7-3) from clang-tidy-3.7 to simplify the transition --- debian/changelog | 7 +++++++ debian/control | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 983a7da9..1de985df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.7 (1:3.7-4) unstable; urgency=medium + + * Add a Break/Replaces clang-3.7 (<< 1:3.7-3) from clang-tidy-3.7 + to simplify the transition + + -- + llvm-toolchain-3.7 (1:3.7-3) unstable; urgency=medium * Update compiler-rt to simplify the port to Ubuntu precise diff --git a/debian/control b/debian/control index 5bdaa214..e7a03cb7 100644 --- a/debian/control +++ b/debian/control @@ -88,6 +88,8 @@ Description: Tool to convert C++98 and C++03 code to C++11 Package: clang-tidy-3.7 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: clang-3.7 (<< 1:3.7-3) +Breaks: clang-3.7 (<< 1:3.7-3) Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced From 5f3970a86f8097ab6d4d84b99a1a5d10331f4e25 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Oct 2015 16:42:42 +0000 Subject: [PATCH 37/46] Remove some warnings in the manpages generation (Closes: #795310) --- debian/changelog | 3 ++- debian/rules | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1de985df..b638a554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ llvm-toolchain-3.7 (1:3.7-4) unstable; urgency=medium * Add a Break/Replaces clang-3.7 (<< 1:3.7-3) from clang-tidy-3.7 to simplify the transition + * Remove some warnings in the manpages generation (Closes: #795310) - -- + -- Sylvestre Ledru Tue, 20 Oct 2015 09:28:32 +0200 llvm-toolchain-3.7 (1:3.7-3) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 29af9444..3794ad76 100755 --- a/debian/rules +++ b/debian/rules @@ -265,7 +265,7 @@ build_doc: CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen llvm-ranlib macho-dump lldb clang-format clang-modernize clang clang-tblgen clang-check clang-tidy clang-apply-replacements pp-trace"; \ for f in $$CMDS; do \ echo "Generating manpage of $$f"; \ - LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ help2man --no-discard-stderr --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/$(BUILD_DIR)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ + LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-discard-stderr --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/$(BUILD_DIR)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ done override_dh_auto_install: From 43c30651ee26e0cce26810b581646f15fa117598 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 1 Nov 2015 15:01:51 +0000 Subject: [PATCH 38/46] Cherry pick upstream change r242372 (should be in 3.7.1) to fix a build failure with rust beta --- debian/changelog | 7 ++++ debian/patches/rust-patch-242372.diff | 60 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 68 insertions(+) create mode 100644 debian/patches/rust-patch-242372.diff diff --git a/debian/changelog b/debian/changelog index b638a554..55d78faf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.7 (1:3.7-5) unstable; urgency=medium + + * Cherry pick upstream change r242372 (should be in 3.7.1) to fix + a build failure with rust beta + + -- Sylvestre Ledru Sun, 01 Nov 2015 16:01:08 +0100 + llvm-toolchain-3.7 (1:3.7-4) unstable; urgency=medium * Add a Break/Replaces clang-3.7 (<< 1:3.7-3) from clang-tidy-3.7 diff --git a/debian/patches/rust-patch-242372.diff b/debian/patches/rust-patch-242372.diff new file mode 100644 index 00000000..b170b3ed --- /dev/null +++ b/debian/patches/rust-patch-242372.diff @@ -0,0 +1,60 @@ +Index: include/llvm-c/Core.h +=================================================================== +--- include/llvm-c/Core.h (révision 242371) ++++ include/llvm-c/Core.h (révision 242372) +@@ -2675,7 +2675,8 @@ + LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch, + const char *Name); + LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty, +- unsigned NumClauses, const char *Name); ++ LLVMValueRef PersFn, unsigned NumClauses, ++ const char *Name); + LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn); + LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef); + +Index: bindings/go/llvm/ir.go +=================================================================== +--- bindings/go/llvm/ir.go (révision 242371) ++++ bindings/go/llvm/ir.go (révision 242372) +@@ -1731,7 +1731,7 @@ + func (b Builder) CreateLandingPad(t Type, nclauses int, name string) (l Value) { + cname := C.CString(name) + defer C.free(unsafe.Pointer(cname)) +- l.C = C.LLVMBuildLandingPad(b.C, t.C, C.unsigned(nclauses), cname) ++ l.C = C.LLVMBuildLandingPad(b.C, t.C, nil, C.unsigned(nclauses), cname) + return l + } + +Index: bindings/ocaml/llvm/llvm_ocaml.c +=================================================================== +--- bindings/ocaml/llvm/llvm_ocaml.c (révision 242371) ++++ bindings/ocaml/llvm/llvm_ocaml.c (révision 242372) +@@ -1745,7 +1745,7 @@ + CAMLprim LLVMValueRef llvm_build_landingpad(LLVMTypeRef Ty, LLVMValueRef PersFn, + value NumClauses, value Name, + value B) { +- return LLVMBuildLandingPad(Builder_val(B), Ty, Int_val(NumClauses), ++ return LLVMBuildLandingPad(Builder_val(B), Ty, PersFn, Int_val(NumClauses), + String_val(Name)); + } + +Index: lib/IR/Core.cpp +=================================================================== +--- lib/IR/Core.cpp (révision 242371) ++++ lib/IR/Core.cpp (révision 242372) +@@ -2257,7 +2257,14 @@ + } + + LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty, +- unsigned NumClauses, const char *Name) { ++ LLVMValueRef PersFn, unsigned NumClauses, ++ const char *Name) { ++ // The personality used to live on the landingpad instruction, but now it ++ // lives on the parent function. For compatibility, take the provided ++ // personality and put it on the parent function. ++ if (PersFn) ++ unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn( ++ cast(unwrap(PersFn))); + return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name)); + } + diff --git a/debian/patches/series b/debian/patches/series index 61e9de69..8538980e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,3 +44,4 @@ bug783205.patch fix-cmake-config-prefix.diff kfreebsd-build-fix.patch ubuntu-precise-compiler-rt.diff +rust-patch-242372.diff From c9a90b6f2ccefb0ac55b84926404f09ca4c197df Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 13 Nov 2015 08:46:21 +0000 Subject: [PATCH 39/46] remove the rust patch --- debian/changelog | 7 ---- debian/patches/rust-patch-242372.diff | 60 --------------------------- debian/patches/series | 1 - 3 files changed, 68 deletions(-) delete mode 100644 debian/patches/rust-patch-242372.diff diff --git a/debian/changelog b/debian/changelog index 55d78faf..b638a554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -llvm-toolchain-3.7 (1:3.7-5) unstable; urgency=medium - - * Cherry pick upstream change r242372 (should be in 3.7.1) to fix - a build failure with rust beta - - -- Sylvestre Ledru Sun, 01 Nov 2015 16:01:08 +0100 - llvm-toolchain-3.7 (1:3.7-4) unstable; urgency=medium * Add a Break/Replaces clang-3.7 (<< 1:3.7-3) from clang-tidy-3.7 diff --git a/debian/patches/rust-patch-242372.diff b/debian/patches/rust-patch-242372.diff deleted file mode 100644 index b170b3ed..00000000 --- a/debian/patches/rust-patch-242372.diff +++ /dev/null @@ -1,60 +0,0 @@ -Index: include/llvm-c/Core.h -=================================================================== ---- include/llvm-c/Core.h (révision 242371) -+++ include/llvm-c/Core.h (révision 242372) -@@ -2675,7 +2675,8 @@ - LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch, - const char *Name); - LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty, -- unsigned NumClauses, const char *Name); -+ LLVMValueRef PersFn, unsigned NumClauses, -+ const char *Name); - LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn); - LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef); - -Index: bindings/go/llvm/ir.go -=================================================================== ---- bindings/go/llvm/ir.go (révision 242371) -+++ bindings/go/llvm/ir.go (révision 242372) -@@ -1731,7 +1731,7 @@ - func (b Builder) CreateLandingPad(t Type, nclauses int, name string) (l Value) { - cname := C.CString(name) - defer C.free(unsafe.Pointer(cname)) -- l.C = C.LLVMBuildLandingPad(b.C, t.C, C.unsigned(nclauses), cname) -+ l.C = C.LLVMBuildLandingPad(b.C, t.C, nil, C.unsigned(nclauses), cname) - return l - } - -Index: bindings/ocaml/llvm/llvm_ocaml.c -=================================================================== ---- bindings/ocaml/llvm/llvm_ocaml.c (révision 242371) -+++ bindings/ocaml/llvm/llvm_ocaml.c (révision 242372) -@@ -1745,7 +1745,7 @@ - CAMLprim LLVMValueRef llvm_build_landingpad(LLVMTypeRef Ty, LLVMValueRef PersFn, - value NumClauses, value Name, - value B) { -- return LLVMBuildLandingPad(Builder_val(B), Ty, Int_val(NumClauses), -+ return LLVMBuildLandingPad(Builder_val(B), Ty, PersFn, Int_val(NumClauses), - String_val(Name)); - } - -Index: lib/IR/Core.cpp -=================================================================== ---- lib/IR/Core.cpp (révision 242371) -+++ lib/IR/Core.cpp (révision 242372) -@@ -2257,7 +2257,14 @@ - } - - LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty, -- unsigned NumClauses, const char *Name) { -+ LLVMValueRef PersFn, unsigned NumClauses, -+ const char *Name) { -+ // The personality used to live on the landingpad instruction, but now it -+ // lives on the parent function. For compatibility, take the provided -+ // personality and put it on the parent function. -+ if (PersFn) -+ unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn( -+ cast(unwrap(PersFn))); - return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name)); - } - diff --git a/debian/patches/series b/debian/patches/series index 8538980e..61e9de69 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,4 +44,3 @@ bug783205.patch fix-cmake-config-prefix.diff kfreebsd-build-fix.patch ubuntu-precise-compiler-rt.diff -rust-patch-242372.diff From 65e0ff1de9d8f0ba96bf341605c6517b28cacd5d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Nov 2015 09:39:05 +0000 Subject: [PATCH 40/46] Also install run-clang-tidy.py & clang-tidy-diff.py (also installed in usr/bin/ as run-clang-tidy-3.7.py & clang-tidy-diff-3.7.py) --- debian/changelog | 7 +++++++ debian/clang-tidy-X.Y.install.in | 2 ++ debian/clang-tidy-X.Y.links.in | 3 +++ 3 files changed, 12 insertions(+) create mode 100644 debian/clang-tidy-X.Y.links.in diff --git a/debian/changelog b/debian/changelog index b638a554..676dabf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.7 (1:3.7-5) UNRELEASED; urgency=medium + + * Also install run-clang-tidy.py & clang-tidy-diff.py (also installed in + usr/bin/ as run-clang-tidy-3.7.py & clang-tidy-diff-3.7.py) + + -- Sylvestre Ledru Mon, 16 Nov 2015 10:37:59 +0100 + llvm-toolchain-3.7 (1:3.7-4) unstable; urgency=medium * Add a Break/Replaces clang-3.7 (<< 1:3.7-3) from clang-tidy-3.7 diff --git a/debian/clang-tidy-X.Y.install.in b/debian/clang-tidy-X.Y.install.in index 1041ae4c..b6cb099a 100644 --- a/debian/clang-tidy-X.Y.install.in +++ b/debian/clang-tidy-X.Y.install.in @@ -1,2 +1,4 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-tidy +usr/lib/llvm-@LLVM_VERSION@/share/clang/run-clang-tidy.py +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-tidy-diff.py usr/bin/clang-tidy-@LLVM_VERSION@ diff --git a/debian/clang-tidy-X.Y.links.in b/debian/clang-tidy-X.Y.links.in new file mode 100644 index 00000000..f3fa5288 --- /dev/null +++ b/debian/clang-tidy-X.Y.links.in @@ -0,0 +1,3 @@ ++usr/lib/llvm-@LLVM_VERSION@/share/clang/run-clang-tidy.py usr/bin/run-clang-tidy-@LLVM_VERSION@/.py ++usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-tidy-diff.py usr/bin/clang-tidy-diff-@LLVM_VERSION@.py + From 8490839ffd2e2ef8b96f587efef06f83a5aff408 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Nov 2015 10:46:57 +0000 Subject: [PATCH 41/46] refresh of the patches --- debian/patches/0021-shared-lib-debian.patch | 10 +++++----- debian/patches/0044-soname.diff | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch index b6291fb7..ac970804 100644 --- a/debian/patches/0021-shared-lib-debian.patch +++ b/debian/patches/0021-shared-lib-debian.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile +Index: llvm-toolchain-3.7_3.7.1~+rc1/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 +--- llvm-toolchain-3.7_3.7.1~+rc1.orig/tools/llvm-shlib/Makefile ++++ llvm-toolchain-3.7_3.7.1~+rc1/tools/llvm-shlib/Makefile @@ -41,6 +41,12 @@ LLVMLibsOptions := $(IncludeInLibLlvm:$( LLVMLibsPaths := $(IncludeInLibLlvm) @@ -19,8 +19,8 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile 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 +- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME).1$(SHLIBEXT) ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME).1$(SHLIBEXT) -Wl,-Bsymbolic-functions endif ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index e478bc77..0bf8f1c8 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -1,12 +1,12 @@ -Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile +Index: llvm-toolchain-3.7_3.7.1~+rc1/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 +--- llvm-toolchain-3.7_3.7.1~+rc1.orig/tools/llvm-shlib/Makefile ++++ llvm-toolchain-3.7_3.7.1~+rc1/tools/llvm-shlib/Makefile @@ -67,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) -Wl,-Bsymbolic-functions +- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME).1$(SHLIBEXT) -Wl,-Bsymbolic-functions + LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions endif From ab8deecd86300a53322ff0dbc96879517541182a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Nov 2015 10:47:04 +0000 Subject: [PATCH 42/46] fix the repack script --- debian/orig-tar.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 49f66f2f..d013ca6d 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -15,7 +15,7 @@ set -e SVN_BASE_URL=http://llvm.org/svn/llvm-project/ MAJOR_VERSION=3.7 -CURRENT_VERSION=3.7 # Should be changed to 3.5.1 later +CURRENT_VERSION=3.7.1 # Should be changed to 3.7.1 later if test -n "$1"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/ @@ -73,7 +73,7 @@ fi if test -n "$RCRELEASE"; then # VERSION=$MAJOR_VERSION"+"$REVISION # WAS TAG - VERSION=$MAJOR_VERSION"~+"$TAG + VERSION=$CURRENT_VERSION"~+"$TAG FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION else VERSION=$CURRENT_VERSION"~svn"$REVISION From d42e83a03f94e88f705b8e365a59220c5afa9387 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Nov 2015 10:47:20 +0000 Subject: [PATCH 43/46] * Fix clang-modernize detection of clang-apply-replacements (Closes: #791607) --- debian/patches/clang-apply-replacements.diff | 35 ++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 debian/patches/clang-apply-replacements.diff diff --git a/debian/patches/clang-apply-replacements.diff b/debian/patches/clang-apply-replacements.diff new file mode 100644 index 00000000..4448d63f --- /dev/null +++ b/debian/patches/clang-apply-replacements.diff @@ -0,0 +1,35 @@ +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-3.7"); + 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-3.7"); + 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-3.7', + 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/series b/debian/patches/series index 61e9de69..76ac1b75 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -44,3 +44,4 @@ bug783205.patch fix-cmake-config-prefix.diff kfreebsd-build-fix.patch ubuntu-precise-compiler-rt.diff +clang-apply-replacements.diff From b501324960ad22c4e5c6ccfa0df632aa4bae4444 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Nov 2015 13:26:32 +0000 Subject: [PATCH 44/46] Update of the minor version --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3794ad76..cd7f76e9 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ DEB_INST := $(CURDIR)/debian/tmp/ # accomodate that by hardcoding the 5 detection GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?(5|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') LLVM_VERSION := 3.7 -LLVM_VERSION_FULL := $(LLVM_VERSION).0 +LLVM_VERSION_FULL := $(LLVM_VERSION).1 SONAME_EXT := 1 # Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p") From 2b4de06ab87affe5aef9f073e3f0cad1e93eb0a3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Nov 2015 17:05:59 +0000 Subject: [PATCH 45/46] * New snapshot release * Fix clang-modernize detection of clang-apply-replacements (Closes: #791607) * Priority extra for liblldb-3.7-dbg * clang-tidy-3.7 depends on python --- debian/changelog | 8 ++++++-- debian/control | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 676dabf4..11d600b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -llvm-toolchain-3.7 (1:3.7-5) UNRELEASED; urgency=medium +llvm-toolchain-3.7 (1:3.7.1~+rc1-1~exp1) experimental; urgency=medium + * New snapshot release * Also install run-clang-tidy.py & clang-tidy-diff.py (also installed in usr/bin/ as run-clang-tidy-3.7.py & clang-tidy-diff-3.7.py) + * Fix clang-modernize detection of clang-apply-replacements (Closes: #791607) + * Priority extra for liblldb-3.7-dbg + * clang-tidy-3.7 depends on python - -- Sylvestre Ledru Mon, 16 Nov 2015 10:37:59 +0100 + -- Sylvestre Ledru Wed, 18 Nov 2015 10:01:18 +0100 llvm-toolchain-3.7 (1:3.7-4) unstable; urgency=medium diff --git a/debian/control b/debian/control index e7a03cb7..d8216417 100644 --- a/debian/control +++ b/debian/control @@ -87,7 +87,7 @@ Description: Tool to convert C++98 and C++03 code to C++11 Package: clang-tidy-3.7 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, python Replaces: clang-3.7 (<< 1:3.7-3) Breaks: clang-3.7 (<< 1:3.7-3) Description: clang-based C++ linter tool @@ -424,6 +424,7 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hp Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.7 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: debug +Priority: extra Description: Next generation, high-performance debugger, debugging libraries LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM From a5f10bd3a7e3fcbd30683c5ecb0e4d3e2fc0093e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 26 Nov 2015 13:14:13 +0000 Subject: [PATCH 46/46] * Fix bad symlinks (Closes: #806319) * New snapshot release --- debian/changelog | 12 ++++++++++++ debian/clang-tidy-X.Y.links.in | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11d600b3..3c4e31df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +llvm-toolchain-3.7 (1:3.7.1~+rc2-1~exp2) UNRELEASED; urgency=medium + + * Fix bad symlinks (Closes: #806319) + + -- Sylvestre Ledru Thu, 26 Nov 2015 14:13:58 +0100 + +llvm-toolchain-3.7 (1:3.7.1~+rc2-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Wed, 25 Nov 2015 11:28:21 +0100 + llvm-toolchain-3.7 (1:3.7.1~+rc1-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/clang-tidy-X.Y.links.in b/debian/clang-tidy-X.Y.links.in index f3fa5288..8efc73a4 100644 --- a/debian/clang-tidy-X.Y.links.in +++ b/debian/clang-tidy-X.Y.links.in @@ -1,3 +1,3 @@ -+usr/lib/llvm-@LLVM_VERSION@/share/clang/run-clang-tidy.py usr/bin/run-clang-tidy-@LLVM_VERSION@/.py -+usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-tidy-diff.py usr/bin/clang-tidy-diff-@LLVM_VERSION@.py +usr/lib/llvm-@LLVM_VERSION@/share/clang/run-clang-tidy.py usr/bin/run-clang-tidy-@LLVM_VERSION@/.py +usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-tidy-diff.py usr/bin/clang-tidy-diff-@LLVM_VERSION@.py