From e00aede2904c1de1782aaf347f5472a743f1a571 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 27 Aug 2013 09:16:12 +0000
Subject: [PATCH] Remove ia64-fix.diff (applied upstream)

---
 debian/changelog             |  6 +++-
 debian/patches/ia64-fix.diff | 69 ------------------------------------
 debian/patches/series        |  1 -
 3 files changed, 5 insertions(+), 71 deletions(-)
 delete mode 100644 debian/patches/ia64-fix.diff

diff --git a/debian/changelog b/debian/changelog
index 1372028b..5aa06ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 llvm-toolchain-snapshot (1:3.4~svn188990-2) UNRELEASED; urgency=low
 
+  [ Luca Falavigna ]
   * debian/control:
     - Add llvm-3.4-dev to lldb-3.4 Depends field.
 
- -- Luca Falavigna <dktrkranz@debian.org>  Sun, 25 Aug 2013 13:54:46 +0200
+  [ Sylvestre Ledru ]
+  * Remove ia64-fix.diff (applied upstream)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 27 Aug 2013 11:16:45 +0200
 
 llvm-toolchain-snapshot (1:3.4~svn188990-1) unstable; urgency=low
 
diff --git a/debian/patches/ia64-fix.diff b/debian/patches/ia64-fix.diff
deleted file mode 100644
index c7f2ae67..00000000
--- a/debian/patches/ia64-fix.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: llvm-toolchain-snapshot_3.4~svn188990/lib/ExecutionEngine/JIT/JIT.cpp
-===================================================================
---- llvm-toolchain-snapshot_3.4~svn188990.orig/lib/ExecutionEngine/JIT/JIT.cpp	2013-08-22 09:11:27.680602668 +0200
-+++ llvm-toolchain-snapshot_3.4~svn188990/lib/ExecutionEngine/JIT/JIT.cpp	2013-08-22 09:11:27.672602668 +0200
-@@ -68,7 +68,7 @@
- }
- 
- // Determine whether we can register EH tables.
--#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \
-+#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
-      !defined(__USING_SJLJ_EXCEPTIONS__))
- #define HAVE_EHTABLE_SUPPORT 1
- #else
-Index: llvm-toolchain-snapshot_3.4~svn188990/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
-===================================================================
---- llvm-toolchain-snapshot_3.4~svn188990.orig/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp	2013-08-22 09:11:27.680602668 +0200
-+++ llvm-toolchain-snapshot_3.4~svn188990/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp	2013-08-22 09:11:27.672602668 +0200
-@@ -115,12 +115,14 @@
-                 verbose_log->Printf("PTRACE_SETREGS %s", buf.GetData());
-                 break;
-             }
-+#ifdef PTRACE_SETFPREGS
-         case PTRACE_SETFPREGS:
-             {
-                 DisplayBytes(buf, data, data_size);
-                 verbose_log->Printf("PTRACE_SETFPREGS %s", buf.GetData());
-                 break;
-             }
-+#endif
-         case PTRACE_SETSIGINFO:
-             {
-                 DisplayBytes(buf, data, sizeof(siginfo_t));
-@@ -583,9 +585,11 @@
- void
- ReadFPROperation::Execute(ProcessMonitor *monitor)
- {
-+#ifdef PTRACE_GETFPREGS
-     if (PTRACE(PTRACE_GETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
-         m_result = false;
-     else
-+#endif
-         m_result = true;
- }
- 
-@@ -668,9 +672,11 @@
- void
- WriteFPROperation::Execute(ProcessMonitor *monitor)
- {
-+#ifdef PTRACE_SETFPREGS
-     if (PTRACE(PTRACE_SETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
-         m_result = false;
-     else
-+#endif
-         m_result = true;
- }
- 
-Index: llvm-toolchain-snapshot_3.4~svn188990/lib/ExecutionEngine/RTDyldMemoryManager.cpp
-===================================================================
---- llvm-toolchain-snapshot_3.4~svn188990.orig/lib/ExecutionEngine/RTDyldMemoryManager.cpp	2013-08-22 09:11:27.680602668 +0200
-+++ llvm-toolchain-snapshot_3.4~svn188990/lib/ExecutionEngine/RTDyldMemoryManager.cpp	2013-08-22 09:11:27.672602668 +0200
-@@ -33,7 +33,7 @@
- RTDyldMemoryManager::~RTDyldMemoryManager() {}
- 
- // Determine whether we can register EH tables.
--#if (defined(__GNUC__) && !defined(__ARM_EABI__) && \
-+#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
-      !defined(__USING_SJLJ_EXCEPTIONS__))
- #define HAVE_EHTABLE_SUPPORT 1
- #else
diff --git a/debian/patches/series b/debian/patches/series
index 46464a70..adeaa209 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,6 @@ scan-build-clang-path.diff
 declare_clear_cache.diff
 31-powerpcspe.diff
 34-powerpc-no-altivec.diff
-ia64-fix.diff
 clang-format-version.diff
 kfreebsd.diff
 mipsel-ftbfs.diff