[llvm-commits] [dragonegg] r145131 - /dragonegg/trunk/src/Backend.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Nov 25 08:22:25 2011
New Revision: 145131

URL: http://llvm.org/viewvc/llvm-project?rev=145131&view=rev
Log:
Don't include ManagedStatic.h because it includes LLVM's configure
information which clashes with GCC's (which we can't not include).
They both define things the same way, but that doesn't stop GCC from
warning about it.

Modified:
    dragonegg/trunk/src/Backend.cpp

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=145131&r1=145130&r2=145131&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Fri Nov 25 08:22:25 2011
@@ -40,7 +40,6 @@
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/CodeGen/RegAllocRegistry.h"
 #include "llvm/MC/SubtargetFeature.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetLibraryInfo.h"
@@ -82,6 +81,9 @@
 #error Unsupported GCC major version
 #endif
 
+// llvm_shutdown - Declared in llvm/Support/ManagedStatic.h.
+extern void llvm_shutdown();
+
 // Non-zero if libcalls should not be simplified.
 int flag_no_simplify_libcalls;