From 7cab8fafe628c89b126802493dddaef1f0524a96 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 29 Jan 2014 06:50:39 +0000 Subject: [PATCH] refresh of the patches --- ...03-Debian-version-info-and-bugreport.patch | 8 ++--- debian/patches/0023-link-libopagent.patch | 12 +++---- .../23-strlcpy_strlcat_warning_removed.diff | 36 +++++++++---------- debian/patches/26-set-correct-float-abi.diff | 8 ++--- debian/patches/atomic_library_1.diff | 14 ++++---- debian/patches/atomic_library_2.diff | 14 ++++---- .../patches/debian-mips64-n32-multiarch.diff | 21 +++++------ debian/patches/disable-execinfo-usage.diff | 8 ++--- debian/patches/fix-clang-path-and-build.diff | 8 ++--- debian/patches/force-gcc-header-obj.diff | 8 ++--- debian/patches/include-target.diff | 8 ++--- debian/patches/lldb-link-atomic.diff | 10 +++--- .../patches/removeduplicatedeclaration.diff | 8 ++--- 13 files changed, 82 insertions(+), 81 deletions(-) diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch index cd188b78..5c530539 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-snapshot_3.5~svn199197/lib/Support/CommandLine.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/lib/Support/CommandLine.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/lib/Support/CommandLine.cpp 2014-01-14 11:30:41.540868855 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/lib/Support/CommandLine.cpp 2014-01-14 11:30:41.536868855 +0100 -@@ -1692,6 +1692,10 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/lib/Support/CommandLine.cpp 2014-01-29 07:45:46.092720538 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/lib/Support/CommandLine.cpp 2014-01-29 07:45:46.092720538 -0800 +@@ -1691,6 +1691,10 @@ OS << LLVM_VERSION_INFO; #endif OS << "\n "; diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch index 826f658b..37466fcf 100644 --- a/debian/patches/0023-link-libopagent.patch +++ b/debian/patches/0023-link-libopagent.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/configure +Index: llvm-toolchain-snapshot_3.5~svn200375/configure =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/configure 2014-01-14 11:30:45.488868777 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/configure 2014-01-14 11:30:45.484868777 +0100 -@@ -13335,7 +13335,7 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/configure 2014-01-29 07:45:49.420720434 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/configure 2014-01-29 07:45:49.416720434 -0800 +@@ -13392,7 +13392,7 @@ case $llvm_cv_os_type in Linux) if test -n "$llvm_cv_oppath" ; then @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/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 -@@ -13431,7 +13431,7 @@ +@@ -13488,7 +13488,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.5~svn199197/configure fi -@@ -13467,8 +13467,8 @@ +@@ -13524,8 +13524,8 @@ if test -z "$ac_lib"; then ac_res="none required" else diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 3d532da9..119f9651 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-snapshot_3.5~svn199197/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/include/clang/Basic/Builtins.def 2014-01-14 11:30:31.712869048 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/include/clang/Basic/Builtins.def 2014-01-14 11:30:31.700869048 +0100 +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/include/clang/Basic/Builtins.def 2014-01-29 07:45:35.840720859 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/include/clang/Basic/Builtins.def 2014-01-29 07:45:35.832720859 -0800 @@ -471,8 +471,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-snapshot_3.5~svn199197/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.5~svn199197/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Sema/SemaChecking.cpp 2014-01-14 11:30:31.712869048 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Sema/SemaChecking.cpp 2014-01-14 11:30:31.704869048 +0100 -@@ -817,9 +817,10 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Sema/SemaChecking.cpp 2014-01-29 07:45:35.840720859 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Sema/SemaChecking.cpp 2014-01-29 07:45:35.836720859 -0800 +@@ -872,9 +872,10 @@ return false; // Handle memory setting and copying functions. @@ -42,11 +42,11 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/AST/Decl.cpp 2014-01-14 11:30:31.712869048 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/AST/Decl.cpp 2014-01-14 11:30:31.704869048 +0100 -@@ -3027,10 +3027,10 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/AST/Decl.cpp 2014-01-29 07:45:35.840720859 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/AST/Decl.cpp 2014-01-29 07:45:35.836720859 -0800 +@@ -3025,10 +3025,10 @@ case Builtin::BImemmove: return Builtin::BImemmove; @@ -61,10 +61,10 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2014-01-14 11:30:31.712869048 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2014-01-14 11:30:31.704869048 +0100 +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2014-01-29 07:45:35.840720859 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2014-01-29 07:45:35.836720859 -0800 @@ -238,9 +238,9 @@ case Builtin::BIstrncpy: case Builtin::BIstrncat: @@ -78,9 +78,9 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/StaticAnalyzer/Checkers/G case Builtin::BIstrndup: return TaintPropagationRule(0, 1, ReturnValueIndex); -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/Sema/builtins.c 2014-01-14 11:30:31.712869048 +0100 +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/test/Sema/builtins.c 2014-01-29 07:45:35.840720859 -0800 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,199 +0,0 @@ -// RUN: %clang_cc1 %s -fsyntax-only -verify -pedantic -Wno-string-plus-int -triple=i686-apple-darwin9 @@ -282,9 +282,9 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/Sema/builtins.c - __noop(1); // expected-warning {{implicit declaration}} - __debugbreak(); // expected-warning {{implicit declaration}} -} -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/Sema/warn-strlcpycat-size.c 2014-01-14 11:30:31.712869048 +0100 +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/test/Sema/warn-strlcpycat-size.c 2014-01-29 07:45:35.840720859 -0800 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index 71906ac6..520d7f23 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-snapshot_3.5~svn199197/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/Tools.cpp 2014-01-14 11:31:55.328867405 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/Tools.cpp 2014-01-14 11:31:55.324867405 +0100 -@@ -653,7 +653,7 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/Tools.cpp 2014-01-29 07:45:42.592720648 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/Tools.cpp 2014-01-29 07:45:42.592720648 -0800 +@@ -649,7 +649,7 @@ FloatABI = "hard"; break; case llvm::Triple::GNUEABI: diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff index 47551b71..3c2a1d40 100644 --- a/debian/patches/atomic_library_1.diff +++ b/debian/patches/atomic_library_1.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Targets.cpp 2014-01-14 11:31:14.036868217 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp 2014-01-14 11:31:14.032868217 +0100 -@@ -3747,6 +3747,20 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:20.388719463 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:20.384719463 -0800 +@@ -3746,6 +3746,20 @@ // FIXME: Override "preferred align" for double and long long. } @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp public: ARMTargetInfo(const llvm::Triple &Triple) : TargetInfo(Triple), CPU("arm1136j-s"), FPMath(FP_Default), -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-01-14 11:31:14.036868217 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c 2014-01-14 11:31:14.032868217 +0100 +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:20.388719463 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:20.384719463 -0800 @@ -1,5 +1,15 @@ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s diff --git a/debian/patches/atomic_library_2.diff b/debian/patches/atomic_library_2.diff index cfaba121..b0a7619c 100644 --- a/debian/patches/atomic_library_2.diff +++ b/debian/patches/atomic_library_2.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-01-14 11:31:16.356868171 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic.c 2014-01-14 11:31:16.352868171 +0100 +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:27.220719249 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/test/CodeGen/linux-arm-atomic.c 2014-01-29 07:46:27.180719250 -0800 @@ -1,5 +1,6 @@ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s @@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/test/CodeGen/linux-arm-atomic typedef int _Atomic_word; _Atomic_word exchange_and_add(volatile _Atomic_word *__mem, int __val) { -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Targets.cpp 2014-01-14 11:31:16.356868171 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp 2014-01-14 11:31:16.352868171 +0100 -@@ -3756,9 +3756,23 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:27.220719249 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:27.180719250 -0800 +@@ -3755,9 +3755,23 @@ if (T.getOS() != llvm::Triple::Linux) return false; StringRef ArchName = T.getArchName(); diff --git a/debian/patches/debian-mips64-n32-multiarch.diff b/debian/patches/debian-mips64-n32-multiarch.diff index e0be4352..4c09f674 100644 --- a/debian/patches/debian-mips64-n32-multiarch.diff +++ b/debian/patches/debian-mips64-n32-multiarch.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:30.336867896 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:30.336867896 +0100 -@@ -1184,10 +1184,12 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:57.392718304 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:48:33.364715296 -0800 +@@ -1312,11 +1312,13 @@ static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" }; static const char *const MIPS64Triples[] = { "mips64-linux-gnu", @@ -11,13 +11,14 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp + "mips64-linux-gnuabi64" }; static const char *const MIPS64ELLibDirs[] = { "/lib64", "/lib" }; static const char *const MIPS64ELTriples[] = { "mips64el-linux-gnu", -- "mips-mti-linux-gnu" }; -+ "mips-mti-linux-gnu", + "mips-mti-linux-gnu", +- "mips64el-linux-android" }; ++ "mips64el-linux-android", + "mips64el-linux-gnuabi64" }; static const char *const PPCLibDirs[] = { "/lib32", "/lib" }; static const char *const PPCTriples[] = { -@@ -1374,9 +1376,9 @@ +@@ -1503,9 +1505,9 @@ } static bool isMipsArch(llvm::Triple::ArchType Arch) { @@ -30,7 +31,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp Arch == llvm::Triple::mips64el; } -@@ -2388,6 +2390,14 @@ +@@ -2522,6 +2524,14 @@ if (llvm::sys::fs::exists(SysRoot + "/lib/mipsel-linux-gnu")) return "mipsel-linux-gnu"; return TargetTriple.str(); @@ -45,7 +46,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp case llvm::Triple::ppc: if (llvm::sys::fs::exists(SysRoot + "/lib/powerpc-linux-gnuspe")) return "powerpc-linux-gnuspe"; -@@ -2727,6 +2737,12 @@ +@@ -2881,6 +2891,12 @@ const StringRef MIPSELMultiarchIncludeDirs[] = { "/usr/include/mipsel-linux-gnu" }; @@ -58,7 +59,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp const StringRef PPCMultiarchIncludeDirs[] = { "/usr/include/powerpc-linux-gnu" }; -@@ -2749,6 +2765,10 @@ +@@ -2903,6 +2919,10 @@ MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; } else if (getTriple().getArch() == llvm::Triple::mipsel) { MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; diff --git a/debian/patches/disable-execinfo-usage.diff b/debian/patches/disable-execinfo-usage.diff index 2597a9eb..4fff74d4 100644 --- a/debian/patches/disable-execinfo-usage.diff +++ b/debian/patches/disable-execinfo-usage.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.5~svn200375/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/lldb/lib/Makefile 2014-01-14 11:31:05.712868380 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile 2014-01-14 11:31:05.708868380 +0100 -@@ -159,5 +159,6 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/lldb/lib/Makefile 2014-01-29 07:46:02.284720030 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/lldb/lib/Makefile 2014-01-29 07:46:02.256720031 -0800 +@@ -160,5 +160,6 @@ # Allow unresolved symbols. LLVMLibsOptions += -Wl,--allow-shlib-undefined # Link in python diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff index 50fce5d5..60dd73ff 100644 --- a/debian/patches/fix-clang-path-and-build.diff +++ b/debian/patches/fix-clang-path-and-build.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199370/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199370.orig/clang/lib/Driver/ToolChains.cpp 2014-01-16 11:58:00.985443502 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199370/clang/lib/Driver/ToolChains.cpp 2014-01-16 11:58:00.985443502 +0100 -@@ -2108,6 +2108,8 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:36.492718958 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:36.448718960 -0800 +@@ -2107,6 +2107,8 @@ DriverArgs.hasArg(options::OPT_nostdincxx)) return; diff --git a/debian/patches/force-gcc-header-obj.diff b/debian/patches/force-gcc-header-obj.diff index 2d36f3fc..9f9a1fe5 100644 --- a/debian/patches/force-gcc-header-obj.diff +++ b/debian/patches/force-gcc-header-obj.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:32.412867856 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:32.412867856 +0100 -@@ -2685,6 +2685,11 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:48:48.964714807 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:48:48.936714808 -0800 +@@ -2839,6 +2839,11 @@ return; } diff --git a/debian/patches/include-target.diff b/debian/patches/include-target.diff index cb347610..7b6bcc92 100644 --- a/debian/patches/include-target.diff +++ b/debian/patches/include-target.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:26.080867980 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Driver/ToolChains.cpp 2014-01-14 11:31:26.076867980 +0100 -@@ -2835,7 +2835,7 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:42.012718786 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/ToolChains.cpp 2014-01-29 07:46:41.972718787 -0800 +@@ -3004,7 +3004,7 @@ #ifdef __i386__ // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him diff --git a/debian/patches/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff index 86fbee72..a8b71d01 100644 --- a/debian/patches/lldb-link-atomic.diff +++ b/debian/patches/lldb-link-atomic.diff @@ -3,14 +3,14 @@ Author: Adam Conrad Forwarded: no Last-Update: 2013-08-21 -Index: llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.5~svn200375/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/lldb/lib/Makefile 2014-01-14 11:31:38.652867733 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/lldb/lib/Makefile 2014-01-14 11:31:38.652867733 +0100 -@@ -149,6 +149,10 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/lldb/lib/Makefile 2014-01-29 07:49:00.508714445 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/lldb/lib/Makefile 2014-01-29 07:49:46.396713007 -0800 +@@ -150,6 +150,10 @@ LLVMLibsOptions += -Wl,--no-undefined # Link in python - LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel + ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel)) + # Link GCC atomic helper library + LLVMLibsOptions += -latomic diff --git a/debian/patches/removeduplicatedeclaration.diff b/debian/patches/removeduplicatedeclaration.diff index 25b3306b..77240b97 100644 --- a/debian/patches/removeduplicatedeclaration.diff +++ b/debian/patches/removeduplicatedeclaration.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Targets.cpp 2014-01-14 11:31:20.680868086 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Targets.cpp 2014-01-14 11:31:20.676868086 +0100 -@@ -3747,33 +3747,6 @@ +--- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:32.840719073 -0800 ++++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Basic/Targets.cpp 2014-01-29 07:46:32.816719074 -0800 +@@ -3746,33 +3746,6 @@ // FIXME: Override "preferred align" for double and long long. }