mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-22 07:07:05 +00:00
Merge branch '7' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into 7
This commit is contained in:
Sylvestre Ledru
commit
0af6a967f0
12
debian/README
vendored
12
debian/README
vendored
@ -2,14 +2,14 @@ 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.0" branch.
|
||||
For example, the 7 release lives at in the "7" branch.
|
||||
|
||||
The current snapshot release is maintained in the "snapshot" branch.
|
||||
|
||||
The easiest way to get all branches is probably to have one
|
||||
clone per version:
|
||||
|
||||
for f in 4.0 5.0 6.0 snapshot; do
|
||||
for f in 4.0 5.0 6.0 7 snapshot; do
|
||||
git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f
|
||||
done
|
||||
|
||||
@ -50,12 +50,12 @@ 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.0 release
|
||||
the branch name as the first argument. For example, to get the 7 release
|
||||
branch at
|
||||
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_70
|
||||
you should use,
|
||||
|
||||
$ sh 7.0/debian/orig-tar.sh release_70
|
||||
$ sh 7/debian/orig-tar.sh release_70
|
||||
|
||||
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
|
||||
@ -63,11 +63,11 @@ get the 7.0.1 release candidate rc3 at
|
||||
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_701/rc3
|
||||
you should use,
|
||||
|
||||
$ sh 7.0/debian/orig-tar.sh RELEASE_701 rc3 7.0.1
|
||||
$ sh 7/debian/orig-tar.sh RELEASE_701 rc3 7.0.1
|
||||
|
||||
For a stable release, the syntax is:
|
||||
|
||||
$ sh 7.0/debian/orig-tar.sh RELEASE_700 final 7.0
|
||||
$ sh 7/debian/orig-tar.sh RELEASE_700 final 7.0
|
||||
|
||||
|
||||
Additional maintainer scripts
|
||||
|
||||
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -1,6 +1,9 @@
|
||||
llvm-toolchain-snapshot (1:7~+rc1-1~exp1) experimental; urgency=medium
|
||||
llvm-toolchain-7 (1:7~+rc1-1~exp1) experimental; urgency=medium
|
||||
|
||||
* First testing release of 7
|
||||
- Rename packages
|
||||
- Update the VCS-* URL
|
||||
* Standards-Version to 4.2.0
|
||||
|
||||
[ Dimitri John Ledkov ]
|
||||
* Enable lldb on ppc64el LP: #1777136
|
||||
|
||||
8
debian/control
vendored
8
debian/control
vendored
@ -1,4 +1,4 @@
|
||||
Source: llvm-toolchain-snapshot
|
||||
Source: llvm-toolchain-7
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
|
||||
@ -17,10 +17,10 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
|
||||
# libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x],
|
||||
# dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x],
|
||||
Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
|
||||
Standards-Version: 4.1.5
|
||||
Standards-Version: 4.2.0
|
||||
Homepage: https://www.llvm.org/
|
||||
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
|
||||
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
|
||||
|
||||
# ------------- clang -------------
|
||||
|
||||
|
||||
@ -7,9 +7,11 @@
|
||||
clang/test/Sema/warn-strlcpycat-size.c | 55 --------------
|
||||
6 files changed, 25 insertions(+), 78 deletions(-)
|
||||
|
||||
--- a/clang/include/clang/Basic/Builtins.def
|
||||
+++ b/clang/include/clang/Basic/Builtins.def
|
||||
@@ -488,8 +488,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
|
||||
Index: llvm-toolchain-7_7~+rc1/clang/include/clang/Basic/Builtins.def
|
||||
===================================================================
|
||||
--- llvm-toolchain-7_7~+rc1.orig/clang/include/clang/Basic/Builtins.def
|
||||
+++ llvm-toolchain-7_7~+rc1/clang/include/clang/Basic/Builtins.def
|
||||
@@ -503,8 +503,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
|
||||
BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
|
||||
BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
|
||||
BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF")
|
||||
@ -20,7 +22,7 @@
|
||||
BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
|
||||
BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
|
||||
BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
|
||||
@@ -874,8 +874,8 @@ LIBBUILTIN(getcontext, "iK*", "fj",
|
||||
@@ -952,8 +952,8 @@ LIBBUILTIN(getcontext, "iK*", "fj",
|
||||
LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES)
|
||||
LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES)
|
||||
// non-standard but very common
|
||||
@ -30,10 +32,12 @@
|
||||
+//LIBBUILTIN(strlcat, "zc*cC*z", "f", "string.h", ALL_GNU_LANGUAGES)
|
||||
// id objc_msgSend(id, SEL, ...)
|
||||
LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG)
|
||||
// long double objc_msgSend_fpret(id self, SEL op, ...)
|
||||
--- a/clang/lib/AST/Decl.cpp
|
||||
+++ b/clang/lib/AST/Decl.cpp
|
||||
@@ -3455,13 +3455,13 @@ unsigned FunctionDecl::getMemoryFunction
|
||||
// long double objc_msgSend_fpret(id self, SEL op, ...)
|
||||
Index: llvm-toolchain-7_7~+rc1/clang/lib/AST/Decl.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-7_7~+rc1.orig/clang/lib/AST/Decl.cpp
|
||||
+++ llvm-toolchain-7_7~+rc1/clang/lib/AST/Decl.cpp
|
||||
@@ -3591,13 +3591,13 @@ unsigned FunctionDecl::getMemoryFunction
|
||||
case Builtin::BImemmove:
|
||||
return Builtin::BImemmove;
|
||||
|
||||
@ -53,9 +57,11 @@
|
||||
|
||||
case Builtin::BI__builtin_memcmp:
|
||||
case Builtin::BImemcmp:
|
||||
--- a/clang/lib/Sema/SemaChecking.cpp
|
||||
+++ b/clang/lib/Sema/SemaChecking.cpp
|
||||
@@ -975,8 +975,8 @@ Sema::CheckBuiltinFunctionCall(FunctionD
|
||||
Index: llvm-toolchain-7_7~+rc1/clang/lib/Sema/SemaChecking.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-7_7~+rc1.orig/clang/lib/Sema/SemaChecking.cpp
|
||||
+++ llvm-toolchain-7_7~+rc1/clang/lib/Sema/SemaChecking.cpp
|
||||
@@ -1224,8 +1224,8 @@ Sema::CheckBuiltinFunctionCall(FunctionD
|
||||
case Builtin::BI__builtin___memcpy_chk:
|
||||
case Builtin::BI__builtin___memmove_chk:
|
||||
case Builtin::BI__builtin___memset_chk:
|
||||
@ -66,7 +72,7 @@
|
||||
case Builtin::BI__builtin___strncat_chk:
|
||||
case Builtin::BI__builtin___strncpy_chk:
|
||||
case Builtin::BI__builtin___stpncpy_chk:
|
||||
@@ -2512,9 +2512,10 @@ bool Sema::CheckFunctionCall(FunctionDec
|
||||
@@ -4064,9 +4064,10 @@ bool Sema::CheckFunctionCall(FunctionDec
|
||||
return false;
|
||||
|
||||
// Handle memory setting and copying functions.
|
||||
@ -80,9 +86,11 @@
|
||||
CheckStrncatArguments(TheCall, FnInfo);
|
||||
else
|
||||
CheckMemaccessArguments(TheCall, CMId, FnInfo);
|
||||
--- a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||
+++ b/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||
@@ -237,9 +237,9 @@ GenericTaintChecker::TaintPropagationRul
|
||||
Index: llvm-toolchain-7_7~+rc1/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-7_7~+rc1.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||
+++ llvm-toolchain-7_7~+rc1/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||
@@ -240,9 +240,9 @@ GenericTaintChecker::TaintPropagationRul
|
||||
case Builtin::BIstrncpy:
|
||||
case Builtin::BIstrncat:
|
||||
return TaintPropagationRule(1, 2, 0, true);
|
||||
@ -95,8 +103,10 @@
|
||||
case Builtin::BIstrndup:
|
||||
return TaintPropagationRule(0, 1, ReturnValueIndex);
|
||||
|
||||
--- a/clang/test/Sema/builtins.c
|
||||
+++ b/clang/test/Sema/builtins.c
|
||||
Index: llvm-toolchain-7_7~+rc1/clang/test/Sema/builtins.c
|
||||
===================================================================
|
||||
--- llvm-toolchain-7_7~+rc1.orig/clang/test/Sema/builtins.c
|
||||
+++ llvm-toolchain-7_7~+rc1/clang/test/Sema/builtins.c
|
||||
@@ -190,11 +190,11 @@ void test18() {
|
||||
|
||||
ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
|
||||
@ -135,7 +145,9 @@
|
||||
}
|
||||
|
||||
// rdar://11076881
|
||||
--- a/clang/test/Sema/warn-strlcpycat-size.c
|
||||
Index: llvm-toolchain-7_7~+rc1/clang/test/Sema/warn-strlcpycat-size.c
|
||||
===================================================================
|
||||
--- llvm-toolchain-7_7~+rc1.orig/clang/test/Sema/warn-strlcpycat-size.c
|
||||
+++ /dev/null
|
||||
@@ -1,55 +0,0 @@
|
||||
-// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
|
||||
|
||||
41
debian/unpack.sh
vendored
41
debian/unpack.sh
vendored
@ -1,24 +1,23 @@
|
||||
set -e
|
||||
|
||||
MAJOR_VERSION=`ls -1 *svn*bz2 | tail -1|perl -ne 'print "$1\n" if /(\d+)~svn/;' | sort -ru`
|
||||
SVN_REV=`ls -1 *svn*bz2 | tail -1|perl -ne 'print "$1\n" if /svn(\d+)/;' | sort -ru`
|
||||
echo "Unpack of llvm"
|
||||
tar jxf llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig.tar.bz2
|
||||
cd llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV/ || ( echo "Bad SVN_REV:\"$SVN_REV\"" && exit 1 )
|
||||
for f in ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-clang.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-clang-tools-extra.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-compiler-rt.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-lld.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-lldb.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-polly.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-openmp.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-libcxx.tar.bz2 ../llvm-toolchain-snapshot_$MAJOR_VERSION~svn$SVN_REV.orig-libcxxabi.tar.bz2; do
|
||||
if test -e $f; then
|
||||
echo "unpack of $f"
|
||||
tar jxf $f
|
||||
fi
|
||||
MAJOR_VERSION=7
|
||||
SVN_REV=`ls -1 *$MAJOR_VERSION*svn*bz2 | tail -1|perl -ne 'print "$1\n" if /svn(\d+)/;' | sort -ru`
|
||||
#SVN_REV=288149
|
||||
#VERSION=svn$SVN_REV
|
||||
VERSION=+rc1
|
||||
tar jxvf llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig.tar.bz2
|
||||
cd llvm-toolchain-7_$MAJOR_VERSION~$VERSION/ || ( echo "Bad SVN_REV:\"$SVN_REV\"" && exit 1 )
|
||||
for f in ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-clang.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-clang-tools-extra.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-compiler-rt.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-lldb.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-polly.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-libcxxabi.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-libcxx.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-openmp.tar.bz2; do #2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-openmp.tar.bz2; do
|
||||
tar jxvf $f
|
||||
done
|
||||
ln -s clang_$MAJOR_VERSION~svn$SVN_REV clang
|
||||
ln -s clang-tools-extra_$MAJOR_VERSION~svn$SVN_REV clang-tools-extra
|
||||
ln -s compiler-rt_$MAJOR_VERSION~svn$SVN_REV compiler-rt
|
||||
ln -s polly_$MAJOR_VERSION~svn$SVN_REV polly
|
||||
ln -s lld_$MAJOR_VERSION~svn$SVN_REV lld
|
||||
ln -s lldb_$MAJOR_VERSION~svn$SVN_REV lldb
|
||||
ln -s openmp_$MAJOR_VERSION~svn$SVN_REV openmp
|
||||
ln -s libcxx_$MAJOR_VERSION~svn$SVN_REV libcxx
|
||||
ln -s libcxxabi_$MAJOR_VERSION~svn$SVN_REV libcxxabi
|
||||
cp -R ../snapshot/debian .
|
||||
|
||||
ln -s clang_$MAJOR_VERSION~$VERSION clang
|
||||
ln -s clang-tools-extra_$MAJOR_VERSION~$VERSION clang-tools-extra
|
||||
ln -s compiler-rt_$MAJOR_VERSION~$VERSION compiler-rt
|
||||
ln -s polly_$MAJOR_VERSION~$VERSION polly
|
||||
ln -s lldb_$MAJOR_VERSION~$VERSION lldb
|
||||
ln -s openmp_$MAJOR_VERSION~$VERSION openmp
|
||||
ln -s libcxx_$MAJOR_VERSION~$VERSION libcxx
|
||||
ln -s libcxxabi_$MAJOR_VERSION~$VERSION libcxxabi
|
||||
|
||||
cp -R ../$MAJOR_VERSION/debian .
|
||||
QUILT_PATCHES=debian/patches/ quilt push -a --fuzz=0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user