[llvm-commits] CVS: llvm-gcc/gcc/llvm-macros.h varasm.c

[Misha Brukman]

Changes in directory llvm-gcc/gcc:

llvm-macros.h added (r1.1)
varasm.c updated: 1.4 -> 1.5
---
Log message:

If ASM_OUTPUT_DEF is *still* not defined due to ifdef/ifndef madness, make it
default to nothing to avoid missing a definition.  Fixes compilation on AIX.


---
Diffs of the changes:  (+16 -0)

Index: llvm-gcc/gcc/llvm-macros.h
diff -c /dev/null llvm-gcc/gcc/llvm-macros.h:1.1
*** /dev/null	Mon Aug  9 14:38:50 2004
--- llvm-gcc/gcc/llvm-macros.h	Mon Aug  9 14:38:40 2004
***************
*** 0 ****
--- 1,15 ----
+ /*
+  * The GCC #ifdef soup prevents some #defines to be actually #defined.
+  * Since we don't really use assembly emission from GCC, we can #define the
+  * missing macros to empty, so we do it here to avoid polluting GCC headers,
+  * to make it easier to sync up to CVs.
+  */ 
+ 
+ #ifndef LLVM_MACROS_H
+ #define LLVM_MACROS_H
+ 
+ #ifndef ASM_OUTPUT_DEF
+ #define ASM_OUTPUT_DEF(a,b,c)
+ #endif
+ 
+ #endif


Index: llvm-gcc/gcc/varasm.c
diff -u llvm-gcc/gcc/varasm.c:1.4 llvm-gcc/gcc/varasm.c:1.5
--- llvm-gcc/gcc/varasm.c:1.4	Tue Jun  8 02:34:54 2004
+++ llvm-gcc/gcc/varasm.c	Mon Aug  9 14:38:40 2004
@@ -51,6 +51,7 @@
 #include "cgraph.h"
 
 #include "llvm-out.h"
+#include "llvm-macros.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"		/* Needed for external data