From 53da465631cc3f9f4e69ec92fc51afdd333cd205 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 17 Mar 2013 12:42:07 +0000 Subject: [PATCH] Remove 0041-undef-PPC-macro.diff. Patch applied upstream --- debian/patches/0041-undef-PPC-macro.diff | 43 ------------------------ debian/patches/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 debian/patches/0041-undef-PPC-macro.diff diff --git a/debian/patches/0041-undef-PPC-macro.diff b/debian/patches/0041-undef-PPC-macro.diff deleted file mode 100644 index df967f49..00000000 --- a/debian/patches/0041-undef-PPC-macro.diff +++ /dev/null @@ -1,43 +0,0 @@ -Index: llvm-toolchain-build/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h -=================================================================== ---- llvm-toolchain-build.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2013-03-15 09:40:15.000000000 +0100 -+++ llvm-toolchain-build/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2013-03-15 09:43:12.000000000 +0100 -@@ -47,6 +47,10 @@ - uint8_t OSABI); - } // End llvm namespace - -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - // Defines symbolic names for PowerPC registers. This defines a mapping from - // register name to register number. - // -Index: llvm-toolchain-build/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h -=================================================================== ---- llvm-toolchain-build.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2013-03-15 09:40:15.000000000 +0100 -+++ llvm-toolchain-build/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2013-03-15 09:43:12.000000000 +0100 -@@ -17,6 +17,10 @@ - // GCC #defines PPC on Linux but we use it as our namespace name - #undef PPC - -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - namespace llvm { - namespace PPC { - /// Predicate - These are "(BI << 5) | BO" for various predicates. -Index: llvm-toolchain-build/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h -=================================================================== ---- llvm-toolchain-build.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2013-03-15 09:40:15.000000000 +0100 -+++ llvm-toolchain-build/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2013-03-15 09:43:12.000000000 +0100 -@@ -12,6 +12,8 @@ - - #include "llvm/MC/MCFixup.h" - -+#undef PPC -+ - namespace llvm { - namespace PPC { - enum Fixups { diff --git a/debian/patches/series b/debian/patches/series index 688c098a..69b1b5d8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,6 @@ profile_rt.diff 0003-Debian-version-info-and-bugreport.patch 0021-shared-lib-debian.patch 0023-link-libopagent.patch -0041-undef-PPC-macro.diff 0044-soname.diff 0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch 0047-version-name.diff