prepare packaging of version 8

This commit is contained in:
Sylvestre Ledru 2018-08-12 14:27:35 +02:00
parent cbfebb8fd7
commit dccba56599
19 changed files with 226 additions and 217 deletions

16
debian/README vendored
View File

@ -2,7 +2,7 @@ Organization of the repository
==============================
The debian package for each LLVM point release is maintained as a git branch.
For example, the 7 release lives at in the "7" branch.
For example, the 8 release lives at in the "8" branch.
The current snapshot release is maintained in the "snapshot" branch.
@ -50,24 +50,24 @@ Retrieving a specific branch or release candidate with orig-tar.sh
==================================================================
When using orig-tar.sh, if you need to retrieve a specific branch, you can pass
the branch name as the first argument. For example, to get the 7 release
the branch name as the first argument. For example, to get the 8 release
branch at
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_70
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_80
you should use,
$ sh 7/debian/orig-tar.sh release_70
$ sh snapshot/debian/orig-tar.sh release_80
To retrieve a specific release candidate, you can pass the branch name as the
first argument, and the tag rc number as the second argument. For example, to
get the 7.0.1 release candidate rc3 at
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_701/rc3
get the 8.0.1 release candidate rc3 at
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_801/rc3
you should use,
$ sh 7/debian/orig-tar.sh RELEASE_701 rc3 7.0.1
$ sh snapshot/debian/orig-tar.sh RELEASE_801 rc3 8.0.1
For a stable release, the syntax is:
$ sh 7/debian/orig-tar.sh RELEASE_700 final 7.0
$ sh snapshot/debian/orig-tar.sh RELEASE_800 final 8.0
Additional maintainer scripts

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-snapshot (1:8~svn339515-1~exp1) experimental; urgency=medium
* New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 12 Aug 2018 14:17:36 +0200
llvm-toolchain-snapshot (1:8~svn336894-1~exp1) experimental; urgency=medium
* branching

176
debian/control vendored
View File

@ -19,19 +19,19 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
Standards-Version: 4.2.0
Homepage: https://www.llvm.org/
Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 7
Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/7
Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot
Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
# ------------- clang -------------
Package: clang-7
Package: clang-8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
${dep:devlibs-objc}, libclang-common-7-dev (= ${binary:Version}),
libclang1-7 (= ${binary:Version}), libc6-dev, binutils
${dep:devlibs-objc}, libclang-common-8-dev (= ${binary:Version}),
libclang1-8 (= ${binary:Version}), libc6-dev, binutils
Provides: c-compiler, objc-compiler, c++-compiler
Recommends: llvm-7-dev, python, libomp-dev
Suggests: gnustep, gnustep-devel, clang-7-doc
Recommends: llvm-8-dev, python, libomp-dev
Suggests: gnustep, gnustep-devel, clang-8-doc
Description: C, C++ and Objective-C compiler
Clang project is a C, C++, Objective C and Objective C++ front-end
based on the LLVM compiler. Its goal is to offer a replacement to the
@ -40,9 +40,9 @@ Description: C, C++ and Objective-C compiler
Clang implements all of the ISO C++ 1998, 11 and 14 standards and also
provides most of the support of C++17.
Package: clang-tools-7
Package: clang-tools-8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-7 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-8 (= ${binary:Version})
Description: clang-based tools for C/C++ developments
Clang project is a C, C++, Objective C and Objective C++ front-end
based on the LLVM compiler. Its goal is to offer a replacement to the
@ -54,10 +54,10 @@ Description: clang-based tools for C/C++ developments
This package contains some clang-based tools like scan-build, clangd,
clang-cl, etc.
Package: clang-format-7
Package: clang-format-8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
libllvm7 (= ${binary:Version})
libllvm8 (= ${binary:Version})
Description: Tool to format C/C++/Obj-C code
Clang-format is both a library and a stand-alone tool with the goal of
automatically reformatting C++ sources files according to configurable
@ -70,20 +70,20 @@ Description: Tool to format C/C++/Obj-C code
.
This package also provides vim and emacs plugins.
Package: clang-tidy-7
Package: clang-tidy-8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
libllvm7 (= ${binary:Version}), libclang-common-7-dev,
clang-tools-7, python-yaml
Replaces: clang-modernize-7, clang-7 (<< 7~svn250696-1)
Breaks: clang-modernize-7, clang-7 (<< 7~svn250696-1)
libllvm8 (= ${binary:Version}), libclang-common-8-dev,
clang-tools-8, python-yaml
Replaces: clang-modernize-8, clang-8 (<< 8~svn250696-1)
Breaks: clang-modernize-8, clang-8 (<< 8~svn250696-1)
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-7-doc
Package: clang-8-doc
Architecture: all
Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax
@ -97,7 +97,7 @@ Description: C, C++ and Objective-C compiler - Documentation
.
This package contains the documentation.
Package: libclang1-7
Package: libclang1-8
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -119,12 +119,12 @@ Description: C interface to the clang library
locations with elements within the AST, and other facilities that support
Clang-based development tools.
Package: libclang-7-dev
Package: libclang-8-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
${dep:devlibs-objc}, libclang1-7 (= ${binary:Version}),
libclang-common-7-dev (= ${binary:Version})
${dep:devlibs-objc}, libclang1-8 (= ${binary:Version}),
libclang-common-8-dev (= ${binary:Version})
Description: clang library - Development package
Clang project is a C, C++, Objective C and Objective C++ front-end
based on the LLVM compiler. Its goal is to offer a replacement to the
@ -134,12 +134,12 @@ Description: clang library - Development package
provides most of the support of C++17.
.
This package contains the clang headers to develop extensions over
libclang1-7.
libclang1-8.
Package: libclang-common-7-dev
Package: libclang-common-8-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm7 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version})
Description: clang library - Common development package
Clang project is a C, C++, Objective C and Objective C++ front-end
based on the LLVM compiler. Its goal is to offer a replacement to the
@ -152,10 +152,10 @@ Description: clang library - Common development package
(profiling, etc).
Package: libfuzzer-7-dev
Package: libfuzzer-8-dev
Architecture: linux-any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-7 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-8 (= ${binary:Version})
Description: Library for coverage-guided fuzz testing
LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing
of other libraries.
@ -173,7 +173,7 @@ Description: Library for coverage-guided fuzz testing
instrumentation.
Package: python-clang-7
Package: python-clang-8
Section: python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python
@ -192,7 +192,7 @@ Description: Clang Python Bindings
This binding package provides access to the Clang compiler and libraries.
Package: clang-7-examples
Package: clang-8-examples
Architecture: any
Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -208,7 +208,7 @@ Description: Clang examples
# ------------- LLVM -------------
Package: libllvm7
Package: libllvm8
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -223,11 +223,11 @@ Description: Modular compiler and toolchain technologies, runtime library
.
This package contains the LLVM runtime library.
Package: llvm-7
Package: llvm-8
Architecture: any
Suggests: llvm-7-doc
Depends: llvm-7-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: llvm-7-dev
Suggests: llvm-8-doc
Depends: llvm-8-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: llvm-8-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
@ -251,11 +251,11 @@ Description: Modular compiler and toolchain technologies
a young scheme front-end, and Java support is in development. LLVM can
generate code for X86, SparcV9, PowerPC or many other architectures.
Package: llvm-7-runtime
Package: llvm-8-runtime
Architecture: any
Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends}
Conflicts: llvm (<< 2.7-1)
Replaces: llvm (<< 2.7-1)
Conflicts: llvm (<< 2.8-1)
Replaces: llvm (<< 2.8-1)
Description: Modular compiler and toolchain technologies, IR interpreter
LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other
@ -272,10 +272,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter
This package provides the minimal required to execute programs in LLVM
format.
Package: llvm-7-dev
Package: llvm-8-dev
Architecture: any
Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends},
llvm-7 (= ${binary:Version}), libllvm7 (= ${binary:Version}), libtinfo-dev
llvm-8 (= ${binary:Version}), libllvm8 (= ${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
@ -293,10 +293,10 @@ Description: Modular compiler and toolchain technologies, libraries and headers
This package provides the libraries and headers to develop applications
using llvm.
Package: llvm-7-tools
Package: llvm-8-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
llvm-7-dev (= ${binary:Version})
llvm-8-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
@ -312,11 +312,11 @@ Description: Modular compiler and toolchain technologies, tools
.
This package provides tools for testing.
# Package: libllvm-7-ocaml-dev
# Package: libllvm-8-ocaml-dev
# Section: ocaml
# Architecture: amd64 arm64 armel armhf i386 ppc64el s390x
# Suggests: llvm-7-doc
# Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-7-dev (= ${binary:Version})
# Suggests: llvm-8-doc
# Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-8-dev (= ${binary:Version})
# Replaces: libllvm-x.y-ocaml-dev
# Conflicts: libllvm-x.y-ocaml-dev
# Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev
@ -335,7 +335,7 @@ Description: Modular compiler and toolchain technologies, tools
# .
# This package provides the OCaml bindings to develop applications using llvm.
Package: llvm-7-doc
Package: llvm-8-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
@ -354,10 +354,10 @@ Description: Modular compiler and toolchain technologies, documentation
.
This package contains all documentation (extensive).
Package: llvm-7-examples
Package: llvm-8-examples
Section: doc
Architecture: all
Depends: ${misc:Depends}, llvm-7-dev (>= ${source:Version}), llvm-7-dev (<< ${source:Version}+c~)
Depends: ${misc:Depends}, llvm-8-dev (>= ${source:Version}), llvm-8-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
@ -377,20 +377,20 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lld -------------
Package: lld-7
Package: lld-8
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm7 (= ${binary:Version}), llvm-7-dev
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version}), llvm-8-dev
Pre-Depends: ${misc:Pre-Depends}
Description: LLVM-based linker
LLD is a new, high-performance linker. It is built as a set of reusable
components which highly leverage existing libraries in the larger LLVM
Project.
Package: liblld-7
Package: liblld-8
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm7 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs
Description: LLVM-based linker, library
@ -400,12 +400,12 @@ Description: LLVM-based linker, library
.
This package contains the LLD runtime library.
Package: liblld-7-dev
Package: liblld-8-dev
Section: libdevel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
# ia64 mips mipsel hurd powerpc ppc64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lld-7 (= ${binary:Version}),
liblld-7 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, lld-8 (= ${binary:Version}),
liblld-8 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Description: LLVM-based linker, header files
LLD is a new, high-performance linker. It is built as a set of reusable
@ -417,25 +417,25 @@ Description: LLVM-based linker, header files
# ------------- lldb -------------
Package: lldb-7
Package: lldb-8
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 ppc64el s390 sparc hppa m68k sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm7 (= ${binary:Version}), llvm-7-dev,
python-lldb-7
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version}), llvm-8-dev,
python-lldb-8
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger
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.
Package: liblldb-7
Package: liblldb-8
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 ppc64el s390 sparc hppa m68k sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm7 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs
Replaces: lldb-7 (<= 7~svn215195-2)
Breaks: lldb-7 (<< 7~svn215195-2)
Replaces: lldb-8 (<= 8~svn215195-2)
Breaks: lldb-8 (<< 8~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
@ -443,11 +443,11 @@ Description: Next generation, high-performance debugger, library
.
This package contains the LLDB runtime library.
Package: python-lldb-7
Package: python-lldb-8
Section: python
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 ppc64el s390 sparc hppa m68k sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-7-dev, python, python-six
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-8-dev, python, python-six
Conflicts: python-lldb-3.8, python-lldb-3.9, python-lldb-x.y
Replaces: python-lldb-x.y
Provides: python-lldb-x.y
@ -460,13 +460,13 @@ Description: Next generation, high-performance debugger, python lib
This binding package provides access to lldb.
Package: liblldb-7-dev
Package: liblldb-8-dev
Section: libdevel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 ppc64el s390 sparc hppa m68k sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-7 (= ${binary:Version})
Replaces: lldb-7-dev (<= 7~svn215195-2)
Breaks: lldb-7-dev (<< 7~svn215195-2)
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-8 (= ${binary:Version})
Replaces: lldb-8-dev (<= 8~svn215195-2)
Breaks: lldb-8-dev (<< 8~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
@ -478,20 +478,20 @@ Description: Next generation, high-performance debugger, header files
# ------------- openmp -------------
Package: libomp-7-dev
Package: libomp-8-dev
Section: libdevel
Architecture: any
Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-7-doc
Replaces: libiomp-dev (<< 3.7-1), libomp-dev
Breaks: libiomp-dev (<< 3.7-1), libomp-dev
Depends: libomp5-8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-8-doc
Replaces: libiomp-dev (<< 3.8-1), libomp-dev
Breaks: libiomp-dev (<< 3.8-1), libomp-dev
Provides: libomp-dev
Description: LLVM OpenMP runtime - dev package
The runtime is the part of the OpenMP implementation that your code is
linked against, and that manages the multiple threads in an OpenMP program
while it is executing.
Package: libomp5-7
Package: libomp5-8
Multi-Arch: same
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -504,7 +504,7 @@ Description: LLVM OpenMP runtime
linked against, and that manages the multiple threads in an OpenMP program
while it is executing.
Package: libomp-7-doc
Package: libomp-8-doc
Section: doc
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
@ -519,7 +519,7 @@ Description: LLVM OpenMP runtime - Documentation
# ------------- libcxx -------------
Package: libc++1-7
Package: libc++1-8
Section: libs
Architecture: any
Multi-Arch: same
@ -539,12 +539,12 @@ Description: LLVM C++ Standard library
as exception objects, rtti and memory allocation.
* Extensive unit tests.
Package: libc++-7-dev
Package: libc++-8-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libc++1-7 (= ${binary:Version}), ${misc:Depends}, libc++-helpers
Provides: libstdc++-dev, libc++-7-dev
Depends: libc++1-8 (= ${binary:Version}), ${misc:Depends}, libc++-helpers
Provides: libstdc++-dev, libc++-8-dev
Breaks: libc++-dev
Description: LLVM C++ Standard library (development files)
libc++ is another implementation of the C++ standard library
@ -559,10 +559,10 @@ Description: LLVM C++ Standard library (development files)
as exception objects, rtti and memory allocation.
* Extensive unit tests.
Package: libc++-7-test
Package: libc++-8-test
Section: libs
Architecture: any
Depends: libc++1-7 (= ${binary:Version}), ${misc:Depends}
Depends: libc++1-8 (= ${binary:Version}), ${misc:Depends}
Description: LLVM C++ Standard library (test cases)
Breaks: libc++-test
Provides: libc++-test
@ -582,7 +582,7 @@ Provides: libc++-test
# ------------- libcxxabi -------------
Package: libc++abi1-7
Package: libc++abi1-8
Section: libs
Architecture: any
Multi-Arch: same
@ -600,13 +600,13 @@ Description: LLVM low level support for a standard C++ library
* Provide a portable sublayer to ease the porting of libc++
.
Package: libc++abi-7-dev
Package: libc++abi-8-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libc++abi1-7 (= ${binary:Version}), ${misc:Depends}
Replaces: libc++-7-dev (<< 3.9.0-3)
Breaks: libc++-dev (<< 3.9.0-3), libc++-7-dev
Depends: libc++abi1-8 (= ${binary:Version}), ${misc:Depends}
Replaces: libc++-8-dev (<< 3.9.0-3)
Breaks: libc++-dev (<< 3.9.0-3), libc++-8-dev
Description: LLVM low level support for a standard C++ library (development files)
libc++abi is another implementation of low level support for a standard C++
library.
@ -617,10 +617,10 @@ Description: LLVM low level support for a standard C++ library (development file
* Provide a portable sublayer to ease the porting of libc++
.
Package: libc++abi-7-test
Package: libc++abi-8-test
Section: libs
Architecture: any
Depends: libc++abi1-7 (= ${binary:Version}), ${misc:Depends}
Depends: libc++abi1-8 (= ${binary:Version}), ${misc:Depends}
Breaks: libc++abi-test
Provides: libc++abi-test
Description: libc++abi test cases
@ -635,11 +635,11 @@ Description: libc++abi test cases
Test cases of libc++abi library.
Package: libc++-7-helpers
Package: libc++-8-helpers
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Breaks: libc++-7-helpers
Breaks: libc++-8-helpers
Provides: libc++-helpers
Description: LLVM C++ Standard library - build helpers
libc++ is another implementation of the C++ standard library

4
debian/orig-tar.sh vendored
View File

@ -19,8 +19,8 @@ set -e
# sh 4.0/debian/orig-tar.sh RELEASE_40 rc1
SVN_BASE_URL=http://llvm.org/svn/llvm-project/
MAJOR_VERSION=7
CURRENT_VERSION=7 # Should be changed to 3.5.1 later
MAJOR_VERSION=8
CURRENT_VERSION=8 # 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/

View File

@ -3,11 +3,11 @@
tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_6.0~svn309319/clang/tools/libclang/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn339515/clang/tools/libclang/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_6.0~svn309319.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_6.0~svn309319/clang/tools/libclang/CMakeLists.txt
@@ -84,7 +84,7 @@ else()
--- llvm-toolchain-snapshot_8~svn339515.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn339515/clang/tools/libclang/CMakeLists.txt
@@ -87,7 +87,7 @@ else()
set(output_name "clang")
endif()
@ -16,15 +16,16 @@ Index: llvm-toolchain-snapshot_6.0~svn309319/clang/tools/libclang/CMakeLists.txt
OUTPUT_NAME ${output_name}
${SOURCES}
DEPENDS clang-headers
Index: llvm-toolchain-snapshot_6.0~svn309319/tools/llvm-shlib/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn339515/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_6.0~svn309319.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_6.0~svn309319/tools/llvm-shlib/CMakeLists.txt
@@ -35,6 +35,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
endif()
--- llvm-toolchain-snapshot_8~svn339515.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn339515/tools/llvm-shlib/CMakeLists.txt
@@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
+set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
+ set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+
list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")

View File

@ -1,16 +1,16 @@
# Force the version of clang in the analyzer
# This was causing the static analyzer to fail silently if the clang & clang++ are
# not installed
Index: llvm-toolchain-snapshot_7.0~svn257.06/clang/tools/scan-build/libexec/ccc-analyzer
Index: llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
===================================================================
--- llvm-toolchain-snapshot_7.0~svn257.06.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_7.0~svn257.06/clang/tools/scan-build/libexec/ccc-analyzer
--- llvm-toolchain-snapshot_8~svn339515.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
@@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
$Clang = $ENV{'CLANG_CXX'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-7'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-8'; }
$IsCXX = 1
}
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_7.0~svn257.06/clang/tools/scan-build/libexec/ccc-
$Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-7'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-8'; }
$IsCXX = 0
}

View File

@ -11,7 +11,7 @@
help='formatting style to apply (LLVM, Google, Chromium, '
'Mozilla, WebKit)')
- parser.add_argument('-binary', default='clang-format',
+ parser.add_argument('-binary', default='clang-format-7',
+ parser.add_argument('-binary', default='clang-format-8',
help='location of binary to use for clang-format')
args = parser.parse_args()
@ -22,7 +22,7 @@
(defcustom clang-format-executable
- (or (executable-find "clang-format")
+ (or (executable-find "clang-format-7")
+ (or (executable-find "clang-format-8")
"clang-format")
"Location of the clang-format executable.
@ -33,7 +33,7 @@
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-7'
+binary = 'clang-format-8'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')

View File

@ -1,17 +1,17 @@
Index: llvm-toolchain-snapshot_7.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
Index: llvm-toolchain-snapshot_8.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
===================================================================
--- llvm-toolchain-snapshot_7.0~svn309541.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_7.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
--- llvm-toolchain-snapshot_8.0~svn309541.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_8.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -157,10 +157,10 @@ def main():
'clang-tidy and clang-apply-replacements in '
'$PATH.')
parser.add_argument('-clang-tidy-binary', metavar='PATH',
- default='clang-tidy',
+ default='clang-tidy-7',
+ default='clang-tidy-8',
help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
- default='clang-apply-replacements',
+ default='clang-apply-replacements-7',
+ default='clang-apply-replacements-8',
help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None,
help='checks filter, when not specified, use clang-tidy '

View File

@ -6,7 +6,7 @@ Index: llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view
kMaxPortsToTry = 100
###
+BASE_DIR = '/usr/share/clang/scan-view-7'
+BASE_DIR = '/usr/share/clang/scan-view-8'
def url_is_up(url):

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
Index: llvm-toolchain-snapshot_8~svn339515/utils/TableGen/CodeEmitterGen.cpp
===================================================================
--- llvm-toolchain-snapshot_3.9~svn268880.orig/utils/TableGen/CodeEmitterGen.cpp
+++ llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
@@ -229,6 +229,9 @@ void CodeEmitterGen::run(raw_ostream &o)
--- llvm-toolchain-snapshot_8~svn339515.orig/utils/TableGen/CodeEmitterGen.cpp
+++ llvm-toolchain-snapshot_8~svn339515/utils/TableGen/CodeEmitterGen.cpp
@@ -239,6 +239,9 @@ void CodeEmitterGen::run(raw_ostream &o)
ArrayRef<const CodeGenInstruction*> NumberedInstructions =
Target.getInstructionsByEnumValue();

View File

@ -12,10 +12,10 @@ which could then break something else.
This probably should have upstream bug but I couldn't find any existing report.
Index: llvm-toolchain-snapshot_7.0~svn293997/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Index: llvm-toolchain-snapshot_8.0~svn293998/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- llvm-toolchain-snapshot_7.0~svn293997.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_7.0~svn293997/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
--- llvm-toolchain-snapshot_8.0~svn293998.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_8.0~svn293998/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -32,6 +32,7 @@
#include "lldb/Utility/StreamString.h"
#include "llvm/ADT/SmallString.h"

View File

@ -2,14 +2,16 @@
lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
Index: llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- llvm-toolchain-snapshot_8~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -443,7 +443,7 @@ def make_symlink_liblldb(
if eOSType == utilsOsType.EnumOsType.Darwin:
strLibFileExtn = ".dylib"
else:
- strLibFileExtn = ".so"
+ strLibFileExtn = "-7.so"
+ strLibFileExtn = "-8.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(

View File

@ -2,10 +2,10 @@
lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn339515/lldb/source/API/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
--- llvm-toolchain-snapshot_8~svn339515.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn339515/lldb/source/API/CMakeLists.txt
@@ -4,7 +4,12 @@ endif()
get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS)
@ -40,4 +40,4 @@ Index: llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
- )
endif()
if (LLDB_WRAP_PYTHON)
if (LLDB_BUILD_FRAMEWORK)

View File

@ -9,7 +9,7 @@
file = 'libclang.dll'
else:
- file = 'libclang.so'
+ file = 'libclang-7.so'
+ file = 'libclang-8.so'
if Config.library_path:
file = Config.library_path + '/' + file

View File

@ -9,7 +9,7 @@
$Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
if (!defined $Clang || ! -x $Clang) {
- $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-7/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-8/bin/clang");
}
if (!defined $Clang || ! -x $Clang) {
return "error: Cannot find an executable 'clang' relative to" .

View File

@ -18,10 +18,10 @@
test/Feature/load_module.ll | 1 -
17 files changed, 14 insertions(+), 17 deletions(-)
Index: llvm-toolchain-snapshot_7~svn335949/test/BugPoint/crash-narrowfunctiontest.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/BugPoint/crash-narrowfunctiontest.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/BugPoint/crash-narrowfunctiontest.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/BugPoint/crash-narrowfunctiontest.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/BugPoint/crash-narrowfunctiontest.ll
+++ llvm-toolchain-snapshot_8~svn339515/test/BugPoint/crash-narrowfunctiontest.ll
@@ -2,7 +2,6 @@
;
; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls --opt-command opt -silence-passes > /dev/null
@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/BugPoint/crash-narrowfunctiontes
define i32 @foo() { ret i32 1 }
Index: llvm-toolchain-snapshot_7~svn335949/test/BugPoint/remove_arguments_test.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/BugPoint/remove_arguments_test.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/BugPoint/remove_arguments_test.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/BugPoint/remove_arguments_test.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/BugPoint/remove_arguments_test.ll
+++ llvm-toolchain-snapshot_8~svn339515/test/BugPoint/remove_arguments_test.ll
@@ -1,7 +1,6 @@
; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes --opt-command opt
; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
@ -42,10 +42,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/BugPoint/remove_arguments_test.l
; 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_7~svn335949/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -53,22 +53,22 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/cross-modu
declare i32 @FB()
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
@@ -1,6 +1,6 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -relocation-model=pic -code-model=large %s
-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
-; XFAIL: cygwin, windows-msvc, windows-gnu, mips-, mipsel-, i686, i386, aarch64, arm
+; XFAIL: *
declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...)
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/multi-modu
declare i32 @FB()
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -87,10 +87,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/stubs-sm-p
define i32 @main() nounwind {
entry:
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -98,10 +98,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/test-globa
@count = global i32 1, align 4
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -109,10 +109,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/MCJIT/test-ptr-r
@.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_7~svn335949/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -120,22 +120,22 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/cross-m
declare i32 @FB()
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
@@ -1,6 +1,6 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
-; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
-; XFAIL: cygwin, windows-msvc, windows-gnu, mips-, mipsel-, i686, i386, aarch64, arm
+; XFAIL: *
declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...)
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -143,34 +143,34 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/multi-m
declare i32 @FB()
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
@@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -relocation-model=pic -code-model=small %s > /dev/null
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
+; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32, x86_64
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu, windows-msvc
+; XFAIL: *
; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
@@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -O0 -relocation-model=pic -code-model=small %s
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
+; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32, x86_64
-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, windows-gnu, windows-msvc
+; XFAIL: *
; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -178,10 +178,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/stubs-s
define i32 @main() nounwind {
entry:
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -189,10 +189,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/test-gl
@count = global i32 1, align 4
Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
+++ llvm-toolchain-snapshot_8~svn339515/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
@ -200,10 +200,10 @@ Index: llvm-toolchain-snapshot_7~svn335949/test/ExecutionEngine/OrcMCJIT/test-pt
@.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_7~svn335949/test/Feature/load_module.ll
Index: llvm-toolchain-snapshot_8~svn339515/test/Feature/load_module.ll
===================================================================
--- llvm-toolchain-snapshot_7~svn335949.orig/test/Feature/load_module.ll
+++ llvm-toolchain-snapshot_7~svn335949/test/Feature/load_module.ll
--- llvm-toolchain-snapshot_8~svn339515.orig/test/Feature/load_module.ll
+++ llvm-toolchain-snapshot_8~svn339515/test/Feature/load_module.ll
@@ -3,7 +3,6 @@
; RUN: -disable-output 2>&1 | grep Hello
; REQUIRES: loadable_module

View File

@ -1,12 +1,12 @@
#!/bin/sh
ORIG_VERSION=6.0
TARGET_VERSION=7.0
ORIG_VERSION_2=6_0
TARGET_VERSION_2=7_0
ORIG_VERSION_3=60
TARGET_VERSION_3=70
ORIG_VERSION=7
TARGET_VERSION=8
ORIG_VERSION_2=7_0
TARGET_VERSION_2=8_0
ORIG_VERSION_3=70
TARGET_VERSION_3=80
LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/clang-apply-replacements.diff debian/patches/fix-scan-view-path.diff debian/qualify-clang.sh debian/README`
LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/qualify-clang.sh debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff`
for F in $LIST; do
sed -i -e "s|$ORIG_VERSION_3|$TARGET_VERSION_3|g" $F
sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F

View File

@ -2,7 +2,7 @@
# Stop at the first error
set -e
VERSION=7
VERSION=8
if test ! -f /usr/bin/llvm-config-$VERSION; then
echo "Install llvm-$VERSION & llvm-$VERSION-dev"
@ -304,8 +304,8 @@ for SYSTEM in ""; do
done
echo "If the following fails, try setting an environment variable such as:"
echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/7/include"
echo "libobjc-7-dev should be also installed"
echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/8/include"
echo "libobjc-8-dev should be also installed"
echo "#include <objc/objc.h>" > foo.m
clang-$VERSION -c foo.m

18
debian/rules vendored
View File

@ -436,7 +436,7 @@ override_dh_auto_install:
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \
ln -s libomp.so.$(SONAME_OPENMP) libomp.so
mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp
cp openmp/runtime/exports/common.dia.50.ompt.optional/include/* debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp
@ -563,10 +563,10 @@ endif
override_dh_makeshlibs:
dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:7~svn298832-1~)" -- -c4
dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:7~svn298832-1~)"
dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:7~svn298832-1~)"
dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:7~svn298832-1~)"
dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:8~svn298832-1~)" -- -c4
dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:8~svn298832-1~)"
dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:8~svn298832-1~)"
dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:8~svn298832-1~)"
dh_makeshlibs --remaining-packages
override_dh_shlibdeps:
@ -585,10 +585,10 @@ override_dh_strip:
find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f
ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?)))
: # If we don't have the right version of debhelper, don't run the option
dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
endif
# ifeq (${LLD_ENABLE},yes)
# dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg