llvm-3.0 (3.0-10) 0041-undef-PPC-macro.diff

Summary

 lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h   |    2 ++
 lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h |    4 ++++
 lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h   |    4 ++++
 3 files changed, 10 insertions(+)

    
download this patch

Patch contents

Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h
===================================================================
--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h	2011-07-25 23:24:55.000000000 +0000
+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h	2011-12-02 13:06:48.000000000 +0000
@@ -34,6 +34,10 @@
   
 } // 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-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h
===================================================================
--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h	2011-07-26 00:24:13.000000000 +0000
+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h	2011-12-02 13:06:48.000000000 +0000
@@ -14,6 +14,10 @@
 #ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H
 #define LLVM_TARGET_POWERPC_PPCPREDICATES_H
 
+// 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-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h
===================================================================
--- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h	2011-07-25 19:53:23.000000000 +0000
+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h	2011-12-02 16:21:23.000000000 +0000
@@ -12,6 +12,8 @@
 
 #include "llvm/MC/MCFixup.h"
 
+#undef PPC
+
 namespace llvm {
 namespace PPC {
 enum Fixups {