From cb72a3b5ff9763e1c244add3268be0c37c5b1f11 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 13 Apr 2013 08:31:32 +0000 Subject: [PATCH] Refresh of the patches --- ...03-Debian-version-info-and-bugreport.patch | 8 +++---- debian/patches/0021-shared-lib-debian.patch | 6 ++--- debian/patches/0023-link-libopagent.patch | 6 ++--- debian/patches/0044-soname.diff | 6 ++--- ...set-is_stmt-a-little-better-for-prol.patch | 14 +++++------ debian/patches/0047-version-name.diff | 12 +++++----- debian/patches/0050-powerpcspe-fp.diff | 6 ++--- debian/patches/19-clang_debian_version.patch | 8 +++---- debian/patches/20-vendor.patch | 6 ++--- debian/patches/21-searchPathHeaders.diff | 8 +++---- .../23-strlcpy_strlcat_warning_removed.diff | 24 +++++++++---------- debian/patches/26-disable_SplitsOnSpaces.diff | 6 ++--- debian/patches/26-set-correct-float-abi.diff | 8 +++---- debian/patches/27-fix_clang_stdint.diff | 14 +++++------ debian/patches/29-hurd.diff | 14 +++++------ debian/patches/30-kfreebsd.diff | 12 +++++----- debian/patches/31-powerpcspe.diff | 6 ++--- debian/patches/33-armhf-defaults.diff | 6 ++--- debian/patches/34-powerpc-no-altivec.diff | 6 ++--- debian/patches/declare_clear_cache.diff | 6 ++--- debian/patches/profile_rt.diff | 6 ++--- debian/patches/scan-build-clang-path.diff | 8 +++---- 22 files changed, 98 insertions(+), 98 deletions(-) diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch index cc6dd001..ffba89a3 100644 --- a/debian/patches/0003-Debian-version-info-and-bugreport.patch +++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-build/lib/Support/CommandLine.cpp +Index: llvm-toolchain_3.3~svn179457/lib/Support/CommandLine.cpp =================================================================== ---- llvm-toolchain-build.orig/lib/Support/CommandLine.cpp 2013-03-15 09:40:15.000000000 +0100 -+++ llvm-toolchain-build/lib/Support/CommandLine.cpp 2013-03-15 09:43:09.000000000 +0100 -@@ -1347,6 +1347,10 @@ +--- llvm-toolchain_3.3~svn179457.orig/lib/Support/CommandLine.cpp 2013-03-10 00:29:37.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/lib/Support/CommandLine.cpp 2013-04-13 10:29:35.189932201 +0200 +@@ -1343,6 +1343,10 @@ OS << LLVM_VERSION_INFO; #endif OS << "\n "; diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch index c9ad7c4e..67b20f37 100644 --- a/debian/patches/0021-shared-lib-debian.patch +++ b/debian/patches/0021-shared-lib-debian.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/tools/llvm-shlib/Makefile +Index: llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile =================================================================== ---- llvm-toolchain-build.orig/tools/llvm-shlib/Makefile 2013-03-15 09:40:15.000000000 +0100 -+++ llvm-toolchain-build/tools/llvm-shlib/Makefile 2013-03-15 09:43:10.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/tools/llvm-shlib/Makefile 2012-08-06 22:52:18.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile 2013-04-13 10:29:38.697932065 +0200 @@ -39,6 +39,12 @@ LLVMLibsPaths := $(IncludeInLibLlvm) diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch index 69cb88db..61974399 100644 --- a/debian/patches/0023-link-libopagent.patch +++ b/debian/patches/0023-link-libopagent.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/configure +Index: llvm-toolchain_3.3~svn179457/configure =================================================================== ---- llvm-toolchain-build.orig/configure 2013-03-15 09:42:49.000000000 +0100 -+++ llvm-toolchain-build/configure 2013-03-15 09:43:11.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/configure 2013-03-25 14:13:33.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/configure 2013-04-13 10:29:39.953932017 +0200 @@ -13571,7 +13571,7 @@ case $llvm_cv_os_type in Linux) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index f1d4a1bf..5fbfea7e 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/tools/llvm-shlib/Makefile +Index: llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile =================================================================== ---- llvm-toolchain-build.orig/tools/llvm-shlib/Makefile 2013-03-15 09:43:10.000000000 +0100 -+++ llvm-toolchain-build/tools/llvm-shlib/Makefile 2013-03-15 09:43:13.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/tools/llvm-shlib/Makefile 2013-04-13 10:29:38.697932065 +0200 ++++ llvm-toolchain_3.3~svn179457/tools/llvm-shlib/Makefile 2013-04-13 10:29:40.997931976 +0200 @@ -77,7 +77,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) diff --git a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch index 72ca9a3b..3a8cfecf 100644 --- a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch +++ b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch @@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. test/DebugInfo/X86/ending-run.ll | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) -Index: llvm-toolchain_3.3~svn179098/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +Index: llvm-toolchain_3.3~svn179457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-04-09 17:50:14.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-04-09 17:50:44.000000000 +0200 -@@ -1236,15 +1236,12 @@ +--- llvm-toolchain_3.3~svn179457.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-04-09 21:23:15.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-04-13 10:29:42.077931934 +0200 +@@ -1244,15 +1244,12 @@ if (!MI->isDebugValue()) { DebugLoc DL = MI->getDebugLoc(); if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { @@ -33,10 +33,10 @@ Index: llvm-toolchain_3.3~svn179098/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-toolchain_3.3~svn179098/test/DebugInfo/X86/ending-run.ll +Index: llvm-toolchain_3.3~svn179457/test/DebugInfo/X86/ending-run.ll =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/test/DebugInfo/X86/ending-run.ll 2013-04-09 17:50:14.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/test/DebugInfo/X86/ending-run.ll 2013-04-09 17:50:44.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/test/DebugInfo/X86/ending-run.ll 2013-03-28 03:44:59.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/test/DebugInfo/X86/ending-run.ll 2013-04-13 10:29:42.081931934 +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 diff --git a/debian/patches/0047-version-name.diff b/debian/patches/0047-version-name.diff index e5079609..03cd24f5 100644 --- a/debian/patches/0047-version-name.diff +++ b/debian/patches/0047-version-name.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/autoconf/configure.ac +Index: llvm-toolchain_3.3~svn179457/autoconf/configure.ac =================================================================== ---- llvm-toolchain-build.orig/autoconf/configure.ac 2013-03-15 09:40:27.000000000 +0100 -+++ llvm-toolchain-build/autoconf/configure.ac 2013-03-15 09:43:15.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/autoconf/configure.ac 2013-03-25 14:13:33.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/autoconf/configure.ac 2013-04-13 10:29:43.485931880 +0200 @@ -31,7 +31,7 @@ dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and @@ -11,10 +11,10 @@ Index: llvm-toolchain-build/autoconf/configure.ac AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API]) AC_DEFINE([LLVM_VERSION_MINOR], [3], [Minor version of the LLVM API]) -Index: llvm-toolchain-build/configure +Index: llvm-toolchain_3.3~svn179457/configure =================================================================== ---- llvm-toolchain-build.orig/configure 2013-03-15 09:43:11.000000000 +0100 -+++ llvm-toolchain-build/configure 2013-03-15 09:43:15.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/configure 2013-04-13 10:29:39.953932017 +0200 ++++ llvm-toolchain_3.3~svn179457/configure 2013-04-13 10:29:43.493931880 +0200 @@ -561,8 +561,8 @@ # Identity of this package. PACKAGE_NAME='LLVM' diff --git a/debian/patches/0050-powerpcspe-fp.diff b/debian/patches/0050-powerpcspe-fp.diff index 3e9ee7e8..7f98871b 100644 --- a/debian/patches/0050-powerpcspe-fp.diff +++ b/debian/patches/0050-powerpcspe-fp.diff @@ -1,10 +1,10 @@ PPCJITInfo.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) -Index: llvm-toolchain-build/lib/Target/PowerPC/PPCJITInfo.cpp +Index: llvm-toolchain_3.3~svn179457/lib/Target/PowerPC/PPCJITInfo.cpp =================================================================== ---- llvm-toolchain-build.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-03-15 09:40:10.000000000 +0100 -+++ llvm-toolchain-build/lib/Target/PowerPC/PPCJITInfo.cpp 2013-03-15 09:43:17.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-02-17 15:30:32.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/lib/Target/PowerPC/PPCJITInfo.cpp 2013-04-13 10:29:45.613931797 +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" diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch index fc4d0740..8438696f 100644 --- a/debian/patches/19-clang_debian_version.patch +++ b/debian/patches/19-clang_debian_version.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain_3.3~svn176083/clang/lib/Basic/Version.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Basic/Version.cpp =================================================================== ---- llvm-toolchain_3.3~svn176083.orig/clang/lib/Basic/Version.cpp 2012-12-04 10:13:33.000000000 +0100 -+++ llvm-toolchain_3.3~svn176083/clang/lib/Basic/Version.cpp 2013-02-26 14:09:55.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Basic/Version.cpp 2013-03-26 00:16:38.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Basic/Version.cpp 2013-04-13 10:29:09.869933183 +0200 @@ -15,6 +15,7 @@ #include "clang/Basic/LLVM.h" #include "llvm/Config/config.h" @@ -10,7 +10,7 @@ Index: llvm-toolchain_3.3~svn176083/clang/lib/Basic/Version.cpp #include #include -@@ -117,7 +118,8 @@ +@@ -121,7 +122,8 @@ #ifdef CLANG_VENDOR OS << CLANG_VENDOR; #endif diff --git a/debian/patches/20-vendor.patch b/debian/patches/20-vendor.patch index fb5ea1ba..6164c179 100644 --- a/debian/patches/20-vendor.patch +++ b/debian/patches/20-vendor.patch @@ -1,7 +1,7 @@ -Index: clang-3.2~rc1/clang/Makefile +Index: llvm-toolchain_3.3~svn179457/clang/Makefile =================================================================== ---- clang-3.2~rc1.orig/clang/Makefile 2012-11-13 21:13:57.000000000 +0100 -+++ clang-3.2~rc1/clang/Makefile 2012-11-17 15:43:15.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/clang/Makefile 2012-10-03 10:39:19.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/Makefile 2013-04-13 10:29:14.857932989 +0200 @@ -47,9 +47,7 @@ # Set common Clang build flags. diff --git a/debian/patches/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff index 5a587fa2..ff399c4f 100644 --- a/debian/patches/21-searchPathHeaders.diff +++ b/debian/patches/21-searchPathHeaders.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-build/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Driver/ToolChains.cpp 2013-03-15 09:40:17.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Driver/ToolChains.cpp 2013-03-15 09:42:55.000000000 +0100 -@@ -2467,6 +2467,11 @@ +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/ToolChains.cpp 2013-04-12 00:55:55.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp 2013-04-13 10:29:16.117932941 +0200 +@@ -2254,6 +2254,11 @@ addSystemInclude(DriverArgs, CC1Args, P.str()); } diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 4cf78621..fc7012d4 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain_3.3~svn179098/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain_3.3~svn179457/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/clang/include/clang/Basic/Builtins.def 2013-04-09 17:50:14.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/clang/include/clang/Basic/Builtins.def 2013-04-09 17:50:18.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/clang/include/clang/Basic/Builtins.def 2013-01-18 00:46:04.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/clang/include/clang/Basic/Builtins.def 2013-04-13 10:29:23.869932640 +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_3.3~svn179098/clang/include/clang/Basic/Builtins.def // 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_3.3~svn179098/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/clang/lib/Sema/SemaChecking.cpp 2013-04-09 17:50:14.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/clang/lib/Sema/SemaChecking.cpp 2013-04-09 17:50:18.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Sema/SemaChecking.cpp 2013-04-10 08:26:26.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Sema/SemaChecking.cpp 2013-04-13 10:29:23.873932640 +0200 @@ -575,9 +575,10 @@ return false; @@ -42,10 +42,10 @@ Index: llvm-toolchain_3.3~svn179098/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain_3.3~svn179098/clang/lib/AST/Decl.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/clang/lib/AST/Decl.cpp 2013-04-09 17:50:14.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/clang/lib/AST/Decl.cpp 2013-04-09 17:50:18.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/AST/Decl.cpp 2013-04-04 06:40:17.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/AST/Decl.cpp 2013-04-13 10:29:23.873932640 +0200 @@ -2681,10 +2681,10 @@ case Builtin::BImemmove: return Builtin::BImemmove; @@ -61,10 +61,10 @@ Index: llvm-toolchain_3.3~svn179098/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain_3.3~svn179098/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-04-09 17:50:14.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-04-09 17:50:18.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-02-20 23:23:23.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-04-13 10:29:23.877932640 +0200 @@ -238,9 +238,9 @@ case Builtin::BIstrncpy: case Builtin::BIstrncat: diff --git a/debian/patches/26-disable_SplitsOnSpaces.diff b/debian/patches/26-disable_SplitsOnSpaces.diff index d1e8eacf..a84ef3de 100644 --- a/debian/patches/26-disable_SplitsOnSpaces.diff +++ b/debian/patches/26-disable_SplitsOnSpaces.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/clang/unittests/Tooling/CompilationDatabaseTest.cpp +Index: llvm-toolchain_3.3~svn179457/clang/unittests/Tooling/CompilationDatabaseTest.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-03-15 09:40:16.000000000 +0100 -+++ llvm-toolchain-build/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-03-15 09:43:03.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-03-02 07:00:16.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/clang/unittests/Tooling/CompilationDatabaseTest.cpp 2013-04-13 10:29:26.733932529 +0200 @@ -302,19 +302,6 @@ return FoundCommand.CommandLine; } diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index 0ae1d12b..50e07d4f 100644 --- a/debian/patches/26-set-correct-float-abi.diff +++ b/debian/patches/26-set-correct-float-abi.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain-build/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Driver/Tools.cpp 2013-03-15 09:40:16.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Driver/Tools.cpp 2013-03-15 09:43:05.000000000 +0100 -@@ -676,7 +676,7 @@ +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/Tools.cpp 2013-04-13 08:43:15.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp 2013-04-13 10:29:30.445932385 +0200 +@@ -666,7 +666,7 @@ FloatABI = "hard"; break; case llvm::Triple::GNUEABI: diff --git a/debian/patches/27-fix_clang_stdint.diff b/debian/patches/27-fix_clang_stdint.diff index 139f99a1..8b1d9f1d 100644 --- a/debian/patches/27-fix_clang_stdint.diff +++ b/debian/patches/27-fix_clang_stdint.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/clang/lib/Headers/stdint.h +Index: llvm-toolchain_3.3~svn179457/clang/lib/Headers/stdint.h =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Headers/stdint.h 2013-03-15 09:40:16.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Headers/stdint.h 2013-03-15 09:43:04.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Headers/stdint.h 2013-04-13 01:24:56.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Headers/stdint.h 2013-04-13 10:29:28.077932477 +0200 @@ -22,8 +22,6 @@ * \*===----------------------------------------------------------------------===*/ @@ -11,16 +11,16 @@ Index: llvm-toolchain-build/clang/lib/Headers/stdint.h /* If we're hosted, fall back to the system's stdint.h, which might have * additional definitions. -@@ -32,6 +30,8 @@ - defined(__has_include_next) && __has_include_next() - # include_next +@@ -73,6 +71,8 @@ + # endif + #else +#ifndef __CLANG_STDINT_H +#define __CLANG_STDINT_H /* C99 7.18.1.1 Exact-width integer types. * C99 7.18.1.2 Minimum-width integer types. -@@ -657,5 +657,5 @@ +@@ -704,5 +704,5 @@ #define INTMAX_C(v) __INTN_C(__INTMAX_WIDTH__, v) #define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v) diff --git a/debian/patches/29-hurd.diff b/debian/patches/29-hurd.diff index a1fb597a..c303debe 100644 --- a/debian/patches/29-hurd.diff +++ b/debian/patches/29-hurd.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/clang/lib/Lex/HeaderSearch.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Lex/HeaderSearch.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Lex/HeaderSearch.cpp 2013-03-15 09:40:16.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Lex/HeaderSearch.cpp 2013-03-15 09:43:07.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Lex/HeaderSearch.cpp 2013-03-21 02:08:50.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Lex/HeaderSearch.cpp 2013-04-13 10:29:33.101932282 +0200 @@ -28,6 +28,11 @@ #endif using namespace clang; @@ -14,11 +14,11 @@ Index: llvm-toolchain-build/clang/lib/Lex/HeaderSearch.cpp const IdentifierInfo * HeaderFileInfo::getControllingMacro(ExternalIdentifierLookup *External) { if (ControllingMacro) -Index: llvm-toolchain-build/clang/lib/Lex/ModuleMap.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Lex/ModuleMap.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Lex/ModuleMap.cpp 2013-03-15 09:40:16.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Lex/ModuleMap.cpp 2013-03-15 09:43:07.000000000 +0100 -@@ -33,6 +33,11 @@ +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Lex/ModuleMap.cpp 2013-03-20 22:10:35.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Lex/ModuleMap.cpp 2013-04-13 10:29:33.101932282 +0200 +@@ -35,6 +35,11 @@ #endif using namespace clang; diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff index ac243406..fff4bb7d 100644 --- a/debian/patches/30-kfreebsd.diff +++ b/debian/patches/30-kfreebsd.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain_3.3~svn179098/clang/lib/Driver/ToolChains.h +Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.h =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/clang/lib/Driver/ToolChains.h 2013-04-09 17:50:14.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/clang/lib/Driver/ToolChains.h 2013-04-09 17:50:29.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/ToolChains.h 2013-04-09 06:35:11.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.h 2013-04-13 10:29:34.213932239 +0200 @@ -125,6 +125,8 @@ virtual bool isPICDefault() const; virtual bool isPIEDefault() const; @@ -11,10 +11,10 @@ Index: llvm-toolchain_3.3~svn179098/clang/lib/Driver/ToolChains.h protected: virtual Tool *getTool(Action::ActionClass AC) const; -Index: llvm-toolchain_3.3~svn179098/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain_3.3~svn179098.orig/clang/lib/Driver/ToolChains.cpp 2013-04-09 17:50:17.000000000 +0200 -+++ llvm-toolchain_3.3~svn179098/clang/lib/Driver/ToolChains.cpp 2013-04-09 17:50:29.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/ToolChains.cpp 2013-04-13 10:29:16.117932941 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/ToolChains.cpp 2013-04-13 10:29:34.217932239 +0200 @@ -952,6 +952,13 @@ return GoodVersion; } diff --git a/debian/patches/31-powerpcspe.diff b/debian/patches/31-powerpcspe.diff index b219f2a1..fa2b8224 100644 --- a/debian/patches/31-powerpcspe.diff +++ b/debian/patches/31-powerpcspe.diff @@ -1,7 +1,7 @@ -Index: llvm-3.2.src/clang/lib/Lex/Makefile +Index: llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile =================================================================== ---- llvm-3.2.src.orig/clang/lib/Lex/Makefile 2010-07-18 02:14:47.000000000 +0200 -+++ llvm-3.2.src/clang/lib/Lex/Makefile 2013-03-16 12:16:22.806998380 +0100 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Lex/Makefile 2010-07-18 02:14:47.000000000 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile 2013-04-13 10:29:49.861931633 +0200 @@ -17,8 +17,10 @@ LIBRARYNAME := clangLex diff --git a/debian/patches/33-armhf-defaults.diff b/debian/patches/33-armhf-defaults.diff index 9e13f974..5d6cf48a 100644 --- a/debian/patches/33-armhf-defaults.diff +++ b/debian/patches/33-armhf-defaults.diff @@ -18,10 +18,10 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain_3.3~svn178632/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain_3.3~svn178632.orig/clang/lib/Driver/Tools.cpp 2013-04-03 13:09:56.000000000 +0200 -+++ llvm-toolchain_3.3~svn178632/clang/lib/Driver/Tools.cpp 2013-04-03 13:11:39.000000000 +0200 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/Tools.cpp 2013-04-13 10:29:31.945932327 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp 2013-04-13 10:29:51.505931569 +0200 @@ -489,6 +489,9 @@ if (Arg *A = Args.getLastArg(options::OPT_march_EQ)) { // Otherwise, if we have -march= choose the base CPU for that arch. diff --git a/debian/patches/34-powerpc-no-altivec.diff b/debian/patches/34-powerpc-no-altivec.diff index de1dada3..2f31f785 100644 --- a/debian/patches/34-powerpc-no-altivec.diff +++ b/debian/patches/34-powerpc-no-altivec.diff @@ -6,10 +6,10 @@ Reviewed-By: Colin Watson Last-Update: 2013-04-01 -Index: clang-3.2.new/clang/lib/Lex/Makefile +Index: llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile =================================================================== ---- clang-3.2.new.orig/clang/lib/Lex/Makefile 2013-04-01 02:32:35.000000000 +0000 -+++ clang-3.2.new/clang/lib/Lex/Makefile 2013-04-01 02:32:03.000000000 +0000 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Lex/Makefile 2013-04-13 10:29:49.861931633 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Lex/Makefile 2013-04-13 10:29:57.785931326 +0200 @@ -16,11 +16,5 @@ LIBRARYNAME := clangLex diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff index 03211b1d..9a127d5d 100644 --- a/debian/patches/declare_clear_cache.diff +++ b/debian/patches/declare_clear_cache.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/lib/Support/Unix/Memory.inc +Index: llvm-toolchain_3.3~svn179457/lib/Support/Unix/Memory.inc =================================================================== ---- llvm-toolchain-build.orig/lib/Support/Unix/Memory.inc 2013-03-15 09:41:15.000000000 +0100 -+++ llvm-toolchain-build/lib/Support/Unix/Memory.inc 2013-03-15 09:43:18.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/lib/Support/Unix/Memory.inc 2013-03-14 20:01:00.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/lib/Support/Unix/Memory.inc 2013-04-13 10:29:48.745931676 +0200 @@ -329,7 +329,7 @@ // FIXME: Can we safely always call this for __GNUC__ everywhere? const char *Start = static_cast(Addr); diff --git a/debian/patches/profile_rt.diff b/debian/patches/profile_rt.diff index 4ef58be0..fabe5be0 100644 --- a/debian/patches/profile_rt.diff +++ b/debian/patches/profile_rt.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-build/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Driver/Tools.cpp 2013-03-15 09:43:05.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Driver/Tools.cpp 2013-03-15 09:43:06.000000000 +0100 +--- llvm-toolchain_3.3~svn179457.orig/clang/lib/Driver/Tools.cpp 2013-04-13 10:29:30.445932385 +0200 ++++ llvm-toolchain_3.3~svn179457/clang/lib/Driver/Tools.cpp 2013-04-13 10:29:31.945932327 +0200 @@ -33,6 +33,7 @@ #include "llvm/Support/Host.h" #include "llvm/Support/Process.h" diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 834a9191..6ec06374 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-build/clang/tools/scan-build/scan-build +Index: llvm-toolchain_3.3~svn179457/clang/tools/scan-build/scan-build =================================================================== ---- llvm-toolchain-build.orig/clang/tools/scan-build/scan-build 2013-03-15 09:41:33.000000000 +0100 -+++ llvm-toolchain-build/clang/tools/scan-build/scan-build 2013-03-15 09:43:16.000000000 +0100 -@@ -1514,7 +1514,7 @@ +--- llvm-toolchain_3.3~svn179457.orig/clang/tools/scan-build/scan-build 2013-03-22 00:14:26.000000000 +0100 ++++ llvm-toolchain_3.3~svn179457/clang/tools/scan-build/scan-build 2013-04-13 10:29:44.525931840 +0200 +@@ -1522,7 +1522,7 @@ # Find 'clang' if (!defined $AnalyzerDiscoveryMethod) {