diff options
| author | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-05 16:04:45 +0000 |
|---|---|---|
| committer | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-05 16:04:45 +0000 |
| commit | 7a0db9420ef9eabc8f9983b2b0529555cd49bff8 (patch) | |
| tree | 42569f6a4ff74658df2c49665911a2c7a6315234 | |
| parent | d683a4432b1a1f43d20dfe5faa6e5e25729b1155 (diff) | |
| download | llvm-toolchain-3.5-7a0db9420ef9eabc8f9983b2b0529555cd49bff8.tar.gz | |
remove obsolete or merged patches
git-svn-id: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.5@1319 670adf90-79fe-46c2-b027-9eb1e76e7c7d
| -rw-r--r-- | debian/patches/lldb-__linux__-ftbfs-powerpc.patch | 54 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
2 files changed, 0 insertions, 57 deletions
diff --git a/debian/patches/lldb-__linux__-ftbfs-powerpc.patch b/debian/patches/lldb-__linux__-ftbfs-powerpc.patch deleted file mode 100644 index 67f9493..0000000 --- a/debian/patches/lldb-__linux__-ftbfs-powerpc.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp -index a14ad04..382db07 100644 ---- llvm-toolchain-snapshot_3.5~svn201241.orig/tools/lldb-mi/MICmnLogMediumFile.cpp -+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp -@@ -28,7 +28,7 @@ - - #if defined( _MSC_VER ) - #include "MIUtilSystemWindows.h" --#elif defined( __FreeBSD__ ) || defined( __linux ) -+#elif defined( __FreeBSD__ ) || defined( __linux__ ) - #include "MIUtilSystemLinux.h" - #elif defined( __APPLE__ ) - #include "MIUtilSystemOsx.h" -diff --git llvm-toolchain-snapshot_3.5~svn201241.orig/lldb//tools/lldb-mi/MIUtilSystemLinux.cpp llvm-toolchain-snapshot_3.5~svn201241/lldb//tools/lldb-mi/MIUtilSystemLinux.cpp -index de14317..9c4deb4 100644 ---- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp -+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp -@@ -22,7 +22,7 @@ - // Include compiler configuration - #include "MICmnConfig.h" - --#if defined( __FreeBSD__ ) || defined( __linux ) -+#if defined( __FreeBSD__ ) || defined( __linux__ ) - - // In-house headers: - #include "MIUtilSystemLinux.h" -@@ -119,4 +119,4 @@ bool CMIUtilSystemLinux::GetLogFilesPath( CMIUtilString & vrwFileNamePath ) cons - return MIstatus::success; - } - --#endif // #if defined( __linux ) -+#endif // #if defined( __linux__ ) -diff --git llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.h llvm-toolchain-snapshot_3.5~svn201241/lldb//tools/lldb-mi/MIUtilSystemLinux.h -index c79bcfd..0d9062a 100644 ---- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/tools/lldb-mi/MIUtilSystemLinux.h -+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/tools/lldb-mi/MIUtilSystemLinux.h -@@ -24,7 +24,7 @@ - // Include compiler configuration - #include "MICmnConfig.h" - --#if defined( __FreeBSD__ ) || defined( __linux ) -+#if defined( __FreeBSD__ ) || defined( __linux__ ) - - // In-house headers: - #include "MIUtilString.h" -@@ -57,4 +57,4 @@ public: - - typedef CMIUtilSystemLinux CMIUtilSystem; - --#endif // #if defined( __linux ) -+#endif // #if defined( __linux__ ) --- -2.0.1 - diff --git a/debian/patches/series b/debian/patches/series index cc6e123..926f5fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,7 +9,6 @@ 0021-shared-lib-debian.patch 0023-link-libopagent.patch 0044-soname.diff -0047-version-name.diff scan-build-clang-path.diff 0050-powerpcspe-fp.diff declare_clear_cache.diff @@ -34,11 +33,9 @@ silent-more-tests.diff disable-display-PASS-UNSUPPORTED-XFAIL.diff lldb-link-atomic.diff fix-llvm-config-obj-src-root.patch -suffixsvn.diff compiler-rt-path.diff lldb-soname.diff force-link-pass.o.diff follow-parallel-var.diff lldb-kfreebsd.diff hurd-EIEIO-undef.diff -lldb-__linux__-ftbfs-powerpc.patch |