From d81438ec64a1737785ef246ceb5c7d613e521d71 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 9 Apr 2013 15:51:52 +0000 Subject: [PATCH] Refresh of the patches --- ...set-is_stmt-a-little-better-for-prol.patch | 14 +++++----- .../23-strlcpy_strlcat_warning_removed.diff | 28 +++++++++---------- debian/patches/30-kfreebsd.diff | 18 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) 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 8cd80e37..72ca9a3b 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-build/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +Index: llvm-toolchain_3.3~svn179098/lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== ---- llvm-toolchain-build.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-03-15 09:40:14.000000000 +0100 -+++ llvm-toolchain-build/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-03-15 09:43:14.000000000 +0100 -@@ -1313,15 +1313,12 @@ +--- 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 @@ if (!MI->isDebugValue()) { DebugLoc DL = MI->getDebugLoc(); if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { @@ -33,10 +33,10 @@ Index: llvm-toolchain-build/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-build/test/DebugInfo/X86/ending-run.ll +Index: llvm-toolchain_3.3~svn179098/test/DebugInfo/X86/ending-run.ll =================================================================== ---- llvm-toolchain-build.orig/test/DebugInfo/X86/ending-run.ll 2013-03-15 09:40:14.000000000 +0100 -+++ llvm-toolchain-build/test/DebugInfo/X86/ending-run.ll 2013-03-15 09:43:14.000000000 +0100 +--- 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 @@ -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/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 418b7438..4cf78621 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-build/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain_3.3~svn179098/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-build.orig/clang/include/clang/Basic/Builtins.def 2013-03-15 09:40:17.000000000 +0100 -+++ llvm-toolchain-build/clang/include/clang/Basic/Builtins.def 2013-03-15 09:43:01.000000000 +0100 +--- 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 @@ -464,8 +464,8 @@ BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") @@ -24,11 +24,11 @@ Index: llvm-toolchain-build/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-build/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain_3.3~svn179098/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Sema/SemaChecking.cpp 2013-03-15 09:40:17.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Sema/SemaChecking.cpp 2013-03-15 09:43:01.000000000 +0100 -@@ -574,9 +574,10 @@ +--- 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 +@@ -575,9 +575,10 @@ return false; // Handle memory setting and copying functions. @@ -42,11 +42,11 @@ Index: llvm-toolchain-build/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-build/clang/lib/AST/Decl.cpp +Index: llvm-toolchain_3.3~svn179098/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/AST/Decl.cpp 2013-03-15 09:40:17.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/AST/Decl.cpp 2013-03-15 09:43:01.000000000 +0100 -@@ -2421,10 +2421,10 @@ +--- 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 +@@ -2681,10 +2681,10 @@ case Builtin::BImemmove: return Builtin::BImemmove; @@ -61,10 +61,10 @@ Index: llvm-toolchain-build/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-build/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain_3.3~svn179098/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-03-15 09:40:17.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-03-15 09:43:01.000000000 +0100 +--- 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 @@ -238,9 +238,9 @@ case Builtin::BIstrncpy: case Builtin::BIstrncat: diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff index afc963f2..ac243406 100644 --- a/debian/patches/30-kfreebsd.diff +++ b/debian/patches/30-kfreebsd.diff @@ -1,21 +1,21 @@ -Index: llvm-toolchain-build/clang/lib/Driver/ToolChains.h +Index: llvm-toolchain_3.3~svn179098/clang/lib/Driver/ToolChains.h =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Driver/ToolChains.h 2013-03-20 08:53:53.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Driver/ToolChains.h 2013-03-20 08:53:56.000000000 +0100 -@@ -124,6 +124,8 @@ - virtual bool IsUnwindTablesDefault() const; +--- 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 +@@ -125,6 +125,8 @@ virtual bool isPICDefault() const; + virtual bool isPIEDefault() const; virtual bool isPICDefaultForced() const; + virtual void AddClangSystemIncludeArgs(const ArgList &DriverArgs, + ArgStringList &CC1Args) const; protected: virtual Tool *getTool(Action::ActionClass AC) const; -Index: llvm-toolchain-build/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain_3.3~svn179098/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-build.orig/clang/lib/Driver/ToolChains.cpp 2013-03-20 08:53:53.000000000 +0100 -+++ llvm-toolchain-build/clang/lib/Driver/ToolChains.cpp 2013-03-20 08:53:56.000000000 +0100 -@@ -937,6 +937,13 @@ +--- 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 +@@ -952,6 +952,13 @@ return GoodVersion; }