[llvm-commits] [llvm-gcc-4.2] r75415 - in /llvm-gcc-4.2/trunk/gcc: llvm-abi.h llvm-types.cpp

[Nick Lewycky]

Author: nicholas
Date: Sun Jul 12 01:25:56 2009
New Revision: 75415

URL: http://llvm.org/viewvc/llvm-project?rev=75415&view=rev
Log:
Fix this by undefining VISIBILITY_HIDDEN like we do in llvm-backend, and move
the headers back the way they were.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-abi.h
    llvm-gcc-4.2/trunk/gcc/llvm-types.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-abi.h?rev=75415&r1=75414&r2=75415&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-abi.h (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-abi.h Sun Jul 12 01:25:56 2009
@@ -31,14 +31,6 @@
 
 #include "llvm-internal.h"
 
-extern "C" {
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
-}  
-
 #include "llvm/Attributes.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
@@ -48,6 +40,16 @@
   class BasicBlock;
 }
 
+#undef VISIBILITY_HIDDEN
+
+extern "C" {
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "tree.h"
+}  
+
 /// DefaultABIClient - This is a simple implementation of the ABI client
 /// interface that can be subclassed.
 struct DefaultABIClient {

Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=75415&r1=75414&r2=75415&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Sun Jul 12 01:25:56 2009
@@ -25,15 +25,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm-internal.h"
-
-extern "C" {
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tree.h"
-}
-#include "llvm-abi.h"
-
 #include "llvm/CallingConv.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
@@ -46,6 +37,15 @@
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/raw_ostream.h"
 #include <map>
+#undef VISIBILITY_HIDDEN
+
+extern "C" {
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tree.h"
+}
+#include "llvm-abi.h"
 
 //===----------------------------------------------------------------------===//
 //                   Matching LLVM types with GCC trees