[llvm-commits] [gcc-plugin] r76192 - in /gcc-plugin/trunk: llvm-debug.cpp llvm-debug.h

[Duncan Sands]

Author: baldrick
Date: Fri Jul 17 12:48:22 2009
New Revision: 76192

URL: http://llvm.org/viewvc/llvm-project?rev=76192&view=rev
Log:
This arrangement of headers for llvm-debug means
that it mostly compiles.  I plan to do this more
optimally later.

Modified:
    gcc-plugin/trunk/llvm-debug.cpp
    gcc-plugin/trunk/llvm-debug.h

Modified: gcc-plugin/trunk/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-debug.cpp?rev=76192&r1=76191&r2=76192&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-debug.cpp (original)
+++ gcc-plugin/trunk/llvm-debug.cpp Fri Jul 17 12:48:22 2009
@@ -23,26 +23,38 @@
 // This is a C++ source file that implements the debug information gathering.
 //===----------------------------------------------------------------------===//
 
-#include "llvm-debug.h"
-
-#include "llvm-abi.h"
-#include "llvm-internal.h"
+// LLVM headers
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
 #include "llvm/Module.h"
+#include "llvm/Analysis/DebugInfo.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/SmallVector.h"
 
-extern "C" {
+// GCC headers
+#undef VISIBILITY_HIDDEN
+#define IN_GCC
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "target.h"
+#include "tree.h"
+
+#include "flags.h"
 #include "langhooks.h"
 #include "toplev.h"
-#include "tree.h"
 #include "version.h"
-}
+
+// Plugin headers
+#include "llvm-abi.h"
+#include "llvm-debug.h"
+#include "llvm-internal.h"
+#include "bits_and_bobs.h"
 
 using namespace llvm;
 using namespace llvm::dwarf;

Modified: gcc-plugin/trunk/llvm-debug.h
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-debug.h?rev=76192&r1=76191&r2=76192&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-debug.h (original)
+++ gcc-plugin/trunk/llvm-debug.h Fri Jul 17 12:48:22 2009
@@ -30,10 +30,6 @@
 #include "llvm/Analysis/DebugInfo.h"
 #include "llvm/Support/Dwarf.h"
 
-extern "C" {
-#include "llvm.h"
-}  
-
 #include <string>
 #include <map>
 #include <vector>