From f351ffe2e34f04e29c563f74686a972ea325c80b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 21 Feb 2014 10:29:35 +0000 Subject: [PATCH] Disable profile_rt.diff for now --- debian/changelog | 1 + debian/patches/hurd-pathmax.diff | 24 +++++++++++----------- debian/patches/series | 2 +- debian/patches/unwind-chain-inclusion.diff | 6 +++--- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index cdba3e49..b4124964 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-snapshot (1:3.5~svn200375-3) UNRELEASED; urgency=medium * Fix the cmake install patch + * Disable profile_rt.diff for now -- Sylvestre Ledru Wed, 19 Feb 2014 22:57:27 +0100 diff --git a/debian/patches/hurd-pathmax.diff b/debian/patches/hurd-pathmax.diff index f5f35ec2..267635e1 100644 --- a/debian/patches/hurd-pathmax.diff +++ b/debian/patches/hurd-pathmax.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn201783/clang/lib/Basic/FileManager.cpp +Index: llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Basic/FileManager.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn201783.orig/clang/lib/Basic/FileManager.cpp 2014-02-20 14:46:40.801809058 +0100 -+++ llvm-toolchain-snapshot_3.5~svn201783/clang/lib/Basic/FileManager.cpp 2014-02-20 14:46:40.797809058 +0100 -@@ -56,6 +56,10 @@ +--- llvm-toolchain-snapshot_3.5~svn201843.orig/clang/lib/Basic/FileManager.cpp 2014-02-21 11:13:02.574417177 +0100 ++++ llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Basic/FileManager.cpp 2014-02-21 11:13:02.570417177 +0100 +@@ -43,6 +43,10 @@ /// represent a filename that doesn't exist on the disk. #define NON_EXISTENT_FILE reinterpret_cast((intptr_t)-1) @@ -11,12 +11,12 @@ Index: llvm-toolchain-snapshot_3.5~svn201783/clang/lib/Basic/FileManager.cpp +# define PATH_MAX 4096 +#endif - FileEntry::~FileEntry() { - // If this FileEntry owns an open file descriptor that never got used, close -Index: llvm-toolchain-snapshot_3.5~svn201783/lldb/include/lldb/lldb-defines.h + class FileManager::UniqueDirContainer { + /// UniqueDirs - Cache from ID's to existing directories/files. +Index: llvm-toolchain-snapshot_3.5~svn201843/lldb/include/lldb/lldb-defines.h =================================================================== ---- llvm-toolchain-snapshot_3.5~svn201783.orig/lldb/include/lldb/lldb-defines.h 2014-02-20 14:46:40.801809058 +0100 -+++ llvm-toolchain-snapshot_3.5~svn201783/lldb/include/lldb/lldb-defines.h 2014-02-20 14:46:40.797809058 +0100 +--- llvm-toolchain-snapshot_3.5~svn201843.orig/lldb/include/lldb/lldb-defines.h 2014-02-21 11:13:02.574417177 +0100 ++++ llvm-toolchain-snapshot_3.5~svn201843/lldb/include/lldb/lldb-defines.h 2014-02-21 11:13:02.570417177 +0100 @@ -12,6 +12,11 @@ #include "lldb/lldb-types.h" @@ -29,10 +29,10 @@ Index: llvm-toolchain-snapshot_3.5~svn201783/lldb/include/lldb/lldb-defines.h #if !defined(UINT32_MAX) #define UINT32_MAX 4294967295U #endif -Index: llvm-toolchain-snapshot_3.5~svn201783/lib/Support/Unix/Path.inc +Index: llvm-toolchain-snapshot_3.5~svn201843/lib/Support/Unix/Path.inc =================================================================== ---- llvm-toolchain-snapshot_3.5~svn201783.orig/lib/Support/Unix/Path.inc 2014-02-20 14:46:40.801809058 +0100 -+++ llvm-toolchain-snapshot_3.5~svn201783/lib/Support/Unix/Path.inc 2014-02-20 14:46:40.797809058 +0100 +--- llvm-toolchain-snapshot_3.5~svn201843.orig/lib/Support/Unix/Path.inc 2014-02-21 11:13:02.574417177 +0100 ++++ llvm-toolchain-snapshot_3.5~svn201843/lib/Support/Unix/Path.inc 2014-02-21 11:13:02.570417177 +0100 @@ -58,6 +58,7 @@ // For GNU Hurd #if defined(__GNU__) && !defined(PATH_MAX) diff --git a/debian/patches/series b/debian/patches/series index cd7f4874..75e815cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,7 @@ 23-strlcpy_strlcat_warning_removed.diff 27-fix_clang_stdint.diff 26-set-correct-float-abi.diff -profile_rt.diff +#profile_rt.diff 0003-Debian-version-info-and-bugreport.patch 0021-shared-lib-debian.patch 0023-link-libopagent.patch diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff index f8ee0f1b..b035bf79 100644 --- a/debian/patches/unwind-chain-inclusion.diff +++ b/debian/patches/unwind-chain-inclusion.diff @@ -4,10 +4,10 @@ # Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration # from the system. -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Headers/unwind.h +Index: llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Headers/unwind.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Headers/unwind.h 2013-10-10 13:38:48.446082093 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Headers/unwind.h 2013-10-10 13:38:48.438082094 +0200 +--- llvm-toolchain-snapshot_3.5~svn201843.orig/clang/lib/Headers/unwind.h 2014-02-21 11:12:42.154418157 +0100 ++++ llvm-toolchain-snapshot_3.5~svn201843/clang/lib/Headers/unwind.h 2014-02-21 11:12:42.150418157 +0100 @@ -23,9 +23,6 @@ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/