[llvm-commits] [gcc-plugin] r75331 - /gcc-plugin/trunk/llvm-convert.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Jul 10 22:29:05 2009
New Revision: 75331

URL: http://llvm.org/viewvc/llvm-project?rev=75331&view=rev
Log:
Rearrange the headers list.  The gcc headers are
quite sensitive to the order in which they are
included.

Modified:
    gcc-plugin/trunk/llvm-convert.cpp

Modified: gcc-plugin/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-convert.cpp?rev=75331&r1=75330&r2=75331&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-convert.cpp (original)
+++ gcc-plugin/trunk/llvm-convert.cpp Fri Jul 10 22:29:05 2009
@@ -23,10 +23,8 @@
 // This is the code that converts GCC AST nodes into LLVM code.
 //===----------------------------------------------------------------------===//
 
+// LLVM headers
 #include "llvm/ValueSymbolTable.h"
-#include "llvm-abi.h"
-#include "llvm-internal.h"
-#include "llvm-debug.h"
 #include "llvm/CallingConv.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
@@ -42,16 +40,21 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/DenseMap.h"
+
+// System headers
 #include <iostream>
 
-extern "C" {
+// GCC headers
+#define IN_GCC
+
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tm_p.h"
+#include "target.h"
 #include "tree.h"
-#include "c-tree.h"  // FIXME: eliminate.
+
+#include "tm_p.h"
+//TODO#include "c-tree.h"  // FIXME: eliminate.
 #include "tree-iterator.h"
 #include "output.h"
 #include "diagnostic.h"
@@ -60,17 +63,21 @@
 #include "function.h"
 #include "toplev.h"
 #include "flags.h"
-#include "target.h"
 #include "hard-reg-set.h"
 #include "except.h"
-#include "rtl.h"
 #include "libfuncs.h"
 #include "tree-flow.h"
 #include "tree-gimple.h"
+extern "C" {
 extern int get_pointer_alignment (tree exp, unsigned int max_align);
 extern enum machine_mode reg_raw_mode[FIRST_PSEUDO_REGISTER];
 }
 
+// Plugin headers
+#include "llvm-abi.h"
+#include "llvm-internal.h"
+#include "llvm-debug.h"
+
 // Check for GCC bug 17347: C++ FE sometimes creates bogus ctor trees
 // which we should throw out
 #define BOGUS_CTOR(exp)                                                \