Merge branch '7' into snapshot

This commit is contained in:
Gianfranco Costamagna 2018-10-10 11:29:39 +02:00
commit 54dc14d1e2
5 changed files with 37 additions and 6 deletions

26
debian/changelog vendored
View File

@ -14,6 +14,32 @@ llvm-toolchain-snapshot (1:8~svn342269-2) UNRELEASED; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 21 Sep 2018 22:48:47 +0200
llvm-toolchain-7 (1:7-5) unstable; urgency=medium
* In debci, run qualify-clang.sh in verbose mode
* Only run the g++ test if g++ exist
[ Reshabh Sharma ]
* Run check-openmp to test OpenMP
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 06 Oct 2018 08:25:48 +0200
llvm-toolchain-7 (1:7-4) unstable; urgency=medium
* Remove bat files https://bugs.llvm.org/show_bug.cgi?id=30755
* Fix the autopkgtest script (no gcc in the test)
* remove dep from lld to llvm-8-dev because lld
doesn't use LLVM LTO
* remove old Replaces/Breaks
* Standards-Version: 4.2.1
* Backport a fix to improve scan-build code error.
Thanks to Roman Lebedev for the fix(Closes: #909662)
* Remove bat files https://bugs.llvm.org/show_bug.cgi?id=30755
* Install bash-completion for clang
* Disable ocaml on armel
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 21 Sep 2018 22:48:47 +0200
llvm-toolchain-7 (1:7-2) unstable; urgency=medium
* Fix the ftbfs under armel on libc++ and enable openmp on armel.

2
debian/control vendored
View File

@ -293,7 +293,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers
Package: llvm-8-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-pygments, python-yaml,
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

View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# Stop at the first error
set -e
@ -241,7 +241,6 @@ int main(void) {
}' > foo.cpp
clang++-$VERSION -stdlib=libc++ foo.cpp -o o
if ! ldd o 2>&1|grep -q libc++.so.1; then
# if ! ./a.out 2>&1 | -q -E "(Test unit written|PreferSmall)"; then
echo "not linked against libc++.so.1"
exit -1
fi
@ -291,9 +290,11 @@ int main() {
clang++-$VERSION -std=c++17 -stdlib=libc++ foo.cpp -lc++experimental -lc++fs -o o
./o > /dev/null
if test -f /usr/bin/g++; then
g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -L/usr/lib/llvm-$VERSION/lib/ \
foo.cpp -nodefaultlibs -std=c++17 -lc++ -lc++abi -lm -lc -lgcc_s -lgcc|| true
./o > /dev/null
fi
if test ! -f /usr/lib/llvm-$VERSION/include/polly/LinkAllPasses.h; then
@ -502,7 +503,8 @@ EOF
echo "if it fails, please run"
echo "apt-get install libc6-dev:i386 libgcc-5-dev:i386 libc6-dev-x32 libx32gcc-5-dev libx32gcc-8-dev"
for SYSTEM in ""; do
for MARCH in -m64 -m32 -mx32 "-m32 -march=i686"; do
# for MARCH in -m64 -m32 -mx32 "-m32 -march=i686"; do
for MARCH in -m64; do
for LIB in --rtlib=compiler-rt -fsanitize=address -fsanitize=thread -fsanitize=memory -fsanitize=undefined -fsanitize=dataflow; do # -fsanitize=efficiency-working-set; do
if test "$MARCH" == "-m32" -o "$MARCH" == "-mx32"; then
if test $LIB == "-fsanitize=thread" -o $LIB == "-fsanitize=memory" -o $LIB == "-fsanitize=dataflow" -o $LIB == "-fsanitize=address" -o $LIB == "-fsanitize=undefined"; then

3
debian/rules vendored
View File

@ -699,6 +699,9 @@ endif
# Sanitizer
$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-sanitizer || true
# OpenMP
$(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-openmp || true
# Libcxx
$(MAKE) $(NJOBS) -C libcxx/build check-libcxx || true

View File

@ -1,3 +1,3 @@
Test-Command: sh ./debian/qualify-clang.sh
Depends: @
Test-Command: bash -v ./debian/qualify-clang.sh
Depends: @, cmake
Restrictions: allow-stderr