proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-10 23:42:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adapt the patches for the trunk

Browse Source
This commit is contained in:
Sylvestre Ledru 2013-06-06 16:41:26 +00:00
parent df1ebf902e
commit 83c2b8f31b
19 changed files with 107 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/patches/0003-Debian-version-info-and-bugreport.patch vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/lib/Support/CommandLine.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/lib/Support/CommandLine.cpp
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/Support/CommandLine.cpp 2013-05-06 23:56:35.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/lib/Support/CommandLine.cpp 2013-05-08 20:26:00.000000000 +0200
@@ -1513,6 +1513,10 @@
--- llvm-toolchain-snapshot_3.4~svn183420.orig/lib/Support/CommandLine.cpp 2013-05-10 19:15:51.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/lib/Support/CommandLine.cpp 2013-06-06 18:37:07.000000000 +0200
@@ -1521,6 +1521,10 @@
OS << LLVM_VERSION_INFO;
#endif
OS << "\n ";

8
debian/patches/0021-shared-lib-debian.patch vendored
View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile
Index: llvm-toolchain-snapshot_3.4~svn183420/tools/llvm-shlib/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/tools/llvm-shlib/Makefile 2012-08-06 22:52:18.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile 2013-05-08 20:26:00.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/tools/llvm-shlib/Makefile 2013-06-04 17:26:37.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/tools/llvm-shlib/Makefile 2013-06-06 18:37:08.000000000 +0200
@@ -39,6 +39,12 @@
LLVMLibsPaths := $(IncludeInLibLlvm)
@ -15,7 +15,7 @@ Index: llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile
ifeq ($(HOST_OS),Darwin)
# set dylib internal version number to llvmCore submission number
@@ -71,7 +77,7 @@
@@ -70,7 +76,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
# Add soname to the library.

12
debian/patches/0023-link-libopagent.patch vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/configure
Index: llvm-toolchain-snapshot_3.4~svn183420/configure
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/configure 2013-05-07 22:31:28.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/configure 2013-05-08 20:26:01.000000000 +0200
@@ -13699,7 +13699,7 @@
--- llvm-toolchain-snapshot_3.4~svn183420.orig/configure 2013-05-22 02:35:47.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/configure 2013-06-06 18:37:09.000000000 +0200
@@ -13701,7 +13701,7 @@
case $llvm_cv_os_type in
Linux)
if test -n "$llvm_cv_oppath" ; then
@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_3.3~svn181457/configure
{ echo "$as_me:$LINENO: checking for library containing bfd_init" >&5
echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; }
if test "${ac_cv_search_bfd_init+set}" = set; then
@@ -13795,7 +13795,7 @@
@@ -13797,7 +13797,7 @@
echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; }
ac_res=$ac_cv_search_bfd_init
if test "$ac_res" != no; then
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.3~svn181457/configure
fi
@@ -13831,8 +13831,8 @@
@@ -13833,8 +13833,8 @@
if test -z "$ac_lib"; then
ac_res="none required"
else

8
debian/patches/0044-soname.diff vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile
Index: llvm-toolchain-snapshot_3.4~svn183420/tools/llvm-shlib/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/tools/llvm-shlib/Makefile 2013-05-08 20:26:00.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/tools/llvm-shlib/Makefile 2013-05-08 20:26:02.000000000 +0200
@@ -77,7 +77,7 @@
--- llvm-toolchain-snapshot_3.4~svn183420.orig/tools/llvm-shlib/Makefile 2013-06-06 18:37:08.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/tools/llvm-shlib/Makefile 2013-06-06 18:37:09.000000000 +0200
@@ -76,7 +76,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
# Add soname to the library.

14
debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch vendored
View File

@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850.
test/DebugInfo/X86/ending-run.ll | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
Index: llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- llvm.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-05-21 03:03:46.000000000 +0200
+++ llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-05-27 12:03:01.000000000 +0200
@@ -1316,15 +1316,12 @@
--- llvm-toolchain-snapshot_3.4~svn183420.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-06-05 07:39:59.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-06-06 18:37:10.000000000 +0200
@@ -1318,15 +1318,12 @@
if (!MI->isDebugValue()) {
DebugLoc DL = MI->getDebugLoc();
if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) {
@ -33,10 +33,10 @@ Index: llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
if (!DL.isUnknown()) {
const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags);
Index: llvm/test/DebugInfo/X86/ending-run.ll
Index: llvm-toolchain-snapshot_3.4~svn183420/test/DebugInfo/X86/ending-run.ll
===================================================================
--- llvm.orig/test/DebugInfo/X86/ending-run.ll 2013-04-22 08:12:31.000000000 +0200
+++ llvm/test/DebugInfo/X86/ending-run.ll 2013-05-27 12:03:01.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/test/DebugInfo/X86/ending-run.ll 2013-04-22 08:12:31.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/test/DebugInfo/X86/ending-run.ll 2013-06-06 18:37:10.000000000 +0200
@@ -1,11 +1,9 @@
; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s

12
debian/patches/0047-version-name.diff vendored
View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.3~svn181523/autoconf/configure.ac
Index: llvm-toolchain-snapshot_3.4~svn183420/autoconf/configure.ac
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181523.orig/autoconf/configure.ac 2013-05-07 22:31:28.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181523/autoconf/configure.ac 2013-05-09 19:30:33.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/autoconf/configure.ac 2013-05-22 02:35:47.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/autoconf/configure.ac 2013-06-06 18:37:11.000000000 +0200
@@ -31,7 +31,7 @@
dnl===-----------------------------------------------------------------------===
dnl Initialize autoconf and define the package name, version number and
@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.3~svn181523/autoconf/configure.ac
AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API])
AC_DEFINE([LLVM_VERSION_MINOR], [4], [Minor version of the LLVM API])
Index: llvm-toolchain-snapshot_3.3~svn181523/configure
Index: llvm-toolchain-snapshot_3.4~svn183420/configure
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181523.orig/configure 2013-05-09 19:30:31.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181523/configure 2013-05-09 19:30:33.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/configure 2013-06-06 18:37:09.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/configure 2013-06-06 18:37:11.000000000 +0200
@@ -561,8 +561,8 @@
# Identity of this package.
PACKAGE_NAME='LLVM'

6
debian/patches/0050-powerpcspe-fp.diff vendored
View File

@ -1,10 +1,10 @@
PPCJITInfo.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
Index: llvm-toolchain-snapshot_3.3~svn181457/lib/Target/PowerPC/PPCJITInfo.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/lib/Target/PowerPC/PPCJITInfo.cpp
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-02-17 15:30:32.000000000 +0100
+++ llvm-toolchain-snapshot_3.3~svn181457/lib/Target/PowerPC/PPCJITInfo.cpp 2013-05-08 20:27:19.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-02-17 15:30:32.000000000 +0100
+++ llvm-toolchain-snapshot_3.4~svn183420/lib/Target/PowerPC/PPCJITInfo.cpp 2013-06-06 18:37:13.000000000 +0200
@@ -99,6 +99,7 @@
"stw r8, 196(r1)\n" "stw r7, 192(r1)\n"
"stw r6, 188(r1)\n" "stw r5, 184(r1)\n"

26
debian/patches/23-strlcpy_strlcat_warning_removed.diff vendored
View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.4~svn183067/clang/include/clang/Basic/Builtins.def
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/include/clang/Basic/Builtins.def
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183067.orig/clang/include/clang/Basic/Builtins.def 2013-05-31 18:29:28.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183067/clang/include/clang/Basic/Builtins.def 2013-06-01 11:16:50.165871189 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/include/clang/Basic/Builtins.def 2013-05-31 18:29:28.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/include/clang/Basic/Builtins.def 2013-06-06 18:36:59.000000000 +0200
@@ -464,8 +464,8 @@
BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn183067/clang/include/clang/Basic/Builtins.
// id objc_msgSend(id, SEL, ...)
LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG)
// long double objc_msgSend_fpret(id self, SEL op, ...)
Index: llvm-toolchain-snapshot_3.4~svn183067/clang/lib/Sema/SemaChecking.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Sema/SemaChecking.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183067.orig/clang/lib/Sema/SemaChecking.cpp 2013-05-28 19:37:39.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183067/clang/lib/Sema/SemaChecking.cpp 2013-06-01 11:16:22.649871803 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/Sema/SemaChecking.cpp 2013-06-02 10:11:22.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Sema/SemaChecking.cpp 2013-06-06 18:36:59.000000000 +0200
@@ -575,9 +575,10 @@
return false;
@ -42,11 +42,11 @@ Index: llvm-toolchain-snapshot_3.4~svn183067/clang/lib/Sema/SemaChecking.cpp
CheckStrncatArguments(TheCall, FnInfo);
else
CheckMemaccessArguments(TheCall, CMId, FnInfo);
Index: llvm-toolchain-snapshot_3.4~svn183067/clang/lib/AST/Decl.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/AST/Decl.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183067.orig/clang/lib/AST/Decl.cpp 2013-05-30 23:23:15.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183067/clang/lib/AST/Decl.cpp 2013-06-01 11:16:22.653871803 +0200
@@ -2783,10 +2783,10 @@
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/AST/Decl.cpp 2013-06-04 15:43:35.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/AST/Decl.cpp 2013-06-06 18:36:59.000000000 +0200
@@ -2802,10 +2802,10 @@
case Builtin::BImemmove:
return Builtin::BImemmove;
@ -61,10 +61,10 @@ Index: llvm-toolchain-snapshot_3.4~svn183067/clang/lib/AST/Decl.cpp
case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_3.4~svn183067/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183067.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-20 23:23:23.000000000 +0100
+++ llvm-toolchain-snapshot_3.4~svn183067/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-06-01 11:16:22.653871803 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-20 23:23:23.000000000 +0100
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-06-06 18:36:59.000000000 +0200
@@ -238,9 +238,9 @@
case Builtin::BIstrncpy:
case Builtin::BIstrncat:

12
debian/patches/30-kfreebsd.diff vendored
View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.h
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Driver/ToolChains.h
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/ToolChains.h 2013-04-30 03:21:43.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.h 2013-05-08 20:25:59.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/Driver/ToolChains.h 2013-06-05 06:28:55.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Driver/ToolChains.h 2013-06-06 18:37:07.000000000 +0200
@@ -125,6 +125,8 @@
virtual bool isPICDefault() const;
virtual bool isPIEDefault() const;
@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.h
protected:
virtual Tool *getTool(Action::ActionClass AC) const;
Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/ToolChains.cpp 2013-05-08 20:25:56.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/ToolChains.cpp 2013-05-08 20:25:59.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/Driver/ToolChains.cpp 2013-06-06 18:36:59.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Driver/ToolChains.cpp 2013-06-06 18:37:07.000000000 +0200
@@ -952,6 +952,13 @@
return GoodVersion;
}

6
debian/patches/31-powerpcspe.diff vendored
View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Lex/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Lex/Makefile 2010-07-18 02:14:47.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile 2013-05-08 20:27:20.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/Lex/Makefile 2010-07-18 02:14:47.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Lex/Makefile 2013-06-06 18:37:14.000000000 +0200
@@ -17,8 +17,10 @@
LIBRARYNAME := clangLex

6
debian/patches/33-armhf-defaults.diff vendored
View File

@ -18,10 +18,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Driver/Tools.cpp
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Driver/Tools.cpp 2013-05-08 20:25:58.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Driver/Tools.cpp 2013-05-08 20:27:21.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/Driver/Tools.cpp 2013-06-06 18:37:04.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Driver/Tools.cpp 2013-06-06 18:37:15.000000000 +0200
@@ -490,6 +490,9 @@
if (Arg *A = Args.getLastArg(options::OPT_march_EQ)) {
// Otherwise, if we have -march= choose the base CPU for that arch.

6
debian/patches/34-powerpc-no-altivec.diff vendored
View File

@ -6,10 +6,10 @@ Reviewed-By: Colin Watson <cjwatson@ubuntu.com>
Last-Update: 2013-04-01
Index: llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Lex/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/lib/Lex/Makefile 2013-05-08 20:27:20.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/clang/lib/Lex/Makefile 2013-05-08 20:27:21.000000000 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/lib/Lex/Makefile 2013-06-06 18:37:14.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/lib/Lex/Makefile 2013-06-06 18:37:15.000000000 +0200
@@ -16,11 +16,5 @@
LIBRARYNAME := clangLex

44
debian/patches/clang-format-version.diff vendored
View File

@ -1,39 +1,39 @@
Index: llvm-toolchain-3.3-3.3~+rc3/clang/tools/clang-format/clang-format.py
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/tools/clang-format/clang-format.py
===================================================================
--- llvm-toolchain-3.3-3.3~+rc3.orig/clang/tools/clang-format/clang-format.py 2013-04-09 17:23:04.000000000 +0200
+++ llvm-toolchain-3.3-3.3~+rc3/clang/tools/clang-format/clang-format.py 2013-06-06 15:39:16.284119121 +0200
@@ -21,7 +21,7 @@
import subprocess
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/tools/clang-format/clang-format.py 2013-05-21 14:21:39.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/tools/clang-format/clang-format.py 2013-06-06 18:39:36.000000000 +0200
@@ -22,7 +22,7 @@
import vim
# Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-3.3'
+binary = 'clang-format-3.4'
# Change this to format according to other formatting styles (see
# clang-format -help)
Index: llvm-toolchain-3.3-3.3~+rc3/clang/tools/clang-format/clang-format-diff.py
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/tools/clang-format/clang-format-diff.py
===================================================================
--- llvm-toolchain-3.3-3.3~+rc3.orig/clang/tools/clang-format/clang-format-diff.py 2013-04-17 09:55:02.000000000 +0200
+++ llvm-toolchain-3.3-3.3~+rc3/clang/tools/clang-format/clang-format-diff.py 2013-06-06 15:39:50.820117303 +0200
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/tools/clang-format/clang-format-diff.py 2013-05-30 13:50:20.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/tools/clang-format/clang-format-diff.py 2013-06-06 18:39:36.000000000 +0200
@@ -28,7 +28,7 @@
# Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-3.3'
+binary = 'clang-format-3.4'
def getOffsetLength(filename, line_number, line_count):
Index: llvm-toolchain-3.3-3.3~+rc3/clang/tools/clang-format/clang-format.el
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/tools/clang-format/clang-format.el
===================================================================
--- llvm-toolchain-3.3-3.3~+rc3.orig/clang/tools/clang-format/clang-format.el 2013-05-08 02:29:53.000000000 +0200
+++ llvm-toolchain-3.3-3.3~+rc3/clang/tools/clang-format/clang-format.el 2013-06-06 15:39:02.512116254 +0200
@@ -14,7 +14,7 @@
(let* ((orig-windows (get-buffer-window-list (current-buffer)))
(orig-window-starts (mapcar #'window-start orig-windows))
(orig-point (point))
- (binary "clang-format")
+ (binary "clang-format-3.3")
(style "LLVM"))
(if mark-active
(setq beg (region-beginning)
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/tools/clang-format/clang-format.el 2013-05-21 19:05:40.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/tools/clang-format/clang-format.el 2013-06-06 18:39:55.000000000 +0200
@@ -13,7 +13,7 @@
;; *Location of the clang-format binary. If it is on your PATH, a full path name
;; need not be specified.
-(defvar clang-format-binary "clang-format")
+(defvar clang-format-binary "clang-format-3.4")
(defun clang-format-region ()
"Use clang-format to format the currently active region."

8
debian/patches/declare_clear_cache.diff vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/lib/Support/Unix/Memory.inc
Index: llvm-toolchain-snapshot_3.4~svn183420/lib/Support/Unix/Memory.inc
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/lib/Support/Unix/Memory.inc 2013-05-04 20:52:44.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/lib/Support/Unix/Memory.inc 2013-05-08 20:27:20.000000000 +0200
@@ -329,7 +329,7 @@
--- llvm-toolchain-snapshot_3.4~svn183420.orig/lib/Support/Unix/Memory.inc 2013-05-19 22:33:51.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/lib/Support/Unix/Memory.inc 2013-06-06 18:37:13.000000000 +0200
@@ -336,7 +336,7 @@
// FIXME: Can we safely always call this for __GNUC__ everywhere?
const char *Start = static_cast<const char *>(Addr);
const char *End = Start + Len;

13
debian/patches/hurd-endian.diff vendored
View File

@ -1,13 +0,0 @@
Index: llvm-toolchain-3.3-3.3~0rc2/include/llvm/Support/Host.h
===================================================================
--- llvm-toolchain-3.3-3.3~0rc2.orig/include/llvm/Support/Host.h 2013-04-15 22:13:59.000000000 +0200
+++ llvm-toolchain-3.3-3.3~0rc2/include/llvm/Support/Host.h 2013-06-05 11:13:28.000000000 +0200
@@ -16,7 +16,7 @@
#include "llvm/ADT/StringMap.h"
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GNU__)
#include <endian.h>
#else
#ifndef LLVM_ON_WIN32

13
debian/patches/ia64-fix.diff vendored
View File

@ -11,16 +11,3 @@ Index: llvm-toolchain-3.3-3.3~+rc3/lib/ExecutionEngine/JIT/JIT.cpp
!defined(__USING_SJLJ_EXCEPTIONS__))
#define HAVE_EHTABLE_SUPPORT 1
#else
Index: llvm-toolchain-3.3-3.3~+rc3/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp
===================================================================
--- llvm-toolchain-3.3-3.3~+rc3.orig/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp 2013-05-05 20:43:10.000000000 +0000
+++ llvm-toolchain-3.3-3.3~+rc3/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp 2013-06-06 08:29:46.000000000 +0000
@@ -147,7 +147,7 @@
}
// Determine whether we can register EH tables.
-#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \
+#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
!defined(__USING_SJLJ_EXCEPTIONS__))
#define HAVE_EHTABLE_SUPPORT 1
#else

35
debian/patches/kfreebsd.diff vendored
View File

@ -1,5 +1,7 @@
--- test/llvm-toolchain-3.3-3.3~+rc3/lldb/include/lldb/Host/Config.h 2011-04-01 18:18:34.000000000 +0000
+++ llvm-toolchain-3.3-3.3~+rc3/lldb/include/lldb/Host/Config.h 2013-06-06 07:59:19.000000000 +0000
Index: llvm-toolchain-snapshot_3.4~svn183420/lldb/include/lldb/Host/Config.h
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183420.orig/lldb/include/lldb/Host/Config.h 2011-04-01 20:18:34.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/lldb/include/lldb/Host/Config.h 2013-06-06 18:40:04.000000000 +0200
@@ -18,7 +18,7 @@
#include "lldb/Host/linux/Config.h"
@ -9,18 +11,22 @@
#include "lldb/Host/freebsd/Config.h"
--- test/llvm-toolchain-3.3-3.3~+rc3/lldb/source/Core/Mangled.cpp 2012-09-11 18:11:12.000000000 +0000
+++ llvm-toolchain-3.3-3.3~+rc3/lldb/source/Core/Mangled.cpp 2013-06-06 07:58:59.000000000 +0000
@@ -30,6 +30,7 @@
#include "lldb/Core/Timer.h"
Index: llvm-toolchain-snapshot_3.4~svn183420/lldb/source/Core/Mangled.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183420.orig/lldb/source/Core/Mangled.cpp 2013-05-31 22:21:38.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/lldb/source/Core/Mangled.cpp 2013-06-06 18:40:28.000000000 +0200
@@ -31,6 +31,7 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
+#include <cstdlib>
using namespace lldb_private;
--- test/llvm-toolchain-3.3-3.3~+rc3/lldb/source/Host/common/Host.cpp 2013-05-15 18:27:08.000000000 +0000
+++ llvm-toolchain-3.3-3.3~+rc3/lldb/source/Host/common/Host.cpp 2013-06-06 07:59:01.000000000 +0000
Index: llvm-toolchain-snapshot_3.4~svn183420/lldb/source/Host/common/Host.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn183420.orig/lldb/source/Host/common/Host.cpp 2013-06-01 00:00:07.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/lldb/source/Host/common/Host.cpp 2013-06-06 18:40:04.000000000 +0200
@@ -151,7 +151,7 @@
delete info;
@ -30,7 +36,7 @@
#define __WALL 0
#endif
const int options = __WALL;
@@ -1441,7 +1441,11 @@
@@ -1460,7 +1460,11 @@
g_num_cores = 0;
int num_cores = 0;
size_t num_cores_len = sizeof(num_cores);
@ -42,14 +48,3 @@
/* get the number of CPUs from the system */
if (sysctl(mib, sizeof(mib)/sizeof(int), &num_cores, &num_cores_len, NULL, 0) == 0 && (num_cores > 0))
--- test/llvm-toolchain-3.3-3.3~+rc3/lldb/source/Plugins/Process/FreeBSD/CMakeLists.txt 2013-02-21 20:58:22.000000000 +0000
+++ llvm-toolchain-3.3-3.3~+rc3/lldb/source/Plugins/Process/FreeBSD/CMakeLists.txt 2013-06-06 07:59:04.000000000 +0000
@@ -1,5 +1,8 @@
set(LLVM_NO_RTTI 1)
+include_directories(.)
+include_directories(../POSIX)
+
add_lldb_library(lldbPluginProcessFreeBSD
ProcessFreeBSD.cpp
ProcessMonitor.cpp

8
debian/patches/scan-build-clang-path.diff vendored
View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.3~svn181457/clang/tools/scan-build/scan-build
Index: llvm-toolchain-snapshot_3.4~svn183420/clang/tools/scan-build/scan-build
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/clang/tools/scan-build/scan-build 2013-05-02 02:52:46.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/clang/tools/scan-build/scan-build 2013-05-08 20:27:18.000000000 +0200
@@ -1524,7 +1524,7 @@
--- llvm-toolchain-snapshot_3.4~svn183420.orig/clang/tools/scan-build/scan-build 2013-05-31 04:31:07.000000000 +0200
+++ llvm-toolchain-snapshot_3.4~svn183420/clang/tools/scan-build/scan-build 2013-06-06 18:37:12.000000000 +0200
@@ -1538,7 +1538,7 @@
# Find 'clang'
if (!defined $AnalyzerDiscoveryMethod) {

1
debian/patches/series vendored
View File

@ -20,7 +20,6 @@ declare_clear_cache.diff
33-armhf-defaults.diff
34-powerpc-no-altivec.diff
ia64-fix.diff
hurd-endian.diff
clang-format-version.diff
kfreebsd.diff