# HG changeset patch
# User Benjamin Kramer <benny.kra@gmail.com>
# Date 1248106571 -7200
# Node ID 259b031f3d22b9fe7187ab5577d2c20caf386916
# Parent  f9660d9cf2ba847a6e0ec0b9ef5e2443c57dc148
Some minor cleanups

* remove an #ifdef USE_METADATA I accidently left in
* remove now unneeded llvm-version includes
* fix indentation in metadata.h
* prevent the "Found native target" message from interrupting ccmake

diff -r f9660d9cf2ba -r 259b031f3d22 CMakeLists.txt
--- a/CMakeLists.txt	Mon Jul 20 17:55:05 2009 +0200
+++ b/CMakeLists.txt	Mon Jul 20 18:16:11 2009 +0200
@@ -150,7 +150,7 @@
         file(STRINGS ${LLVM_CONFIG_FILE_PATH}/config.h LLVM_NATIVE_ARCH REGEX "^#define LLVM_NATIVE_ARCH")
         if(LLVM_NATIVE_ARCH)
                 string(REGEX REPLACE "^#define LLVM_NATIVE_ARCH (.*)Target$" "\\1" LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH})
-                message("Found native target ${LLVM_NATIVE_ARCH}")
+                message(STATUS "Found native target ${LLVM_NATIVE_ARCH}")
                 set(LLVM_MODULES_DEFINE "LLVM_TARGET(${LLVM_NATIVE_ARCH})")
         else(LLVM_NATIVE_ARCH)
                 message("Couldn't find the LLVM_NATIVE_ARCH define in ${LLVM_CONFIG_FILE_PATH}/config.h. Probably you have an older LLVM and can ignore this warning.")
diff -r f9660d9cf2ba -r 259b031f3d22 gen/metadata.h
--- a/gen/metadata.h	Mon Jul 20 17:55:05 2009 +0200
+++ b/gen/metadata.h	Mon Jul 20 18:16:11 2009 +0200
@@ -1,19 +1,18 @@
 #ifndef LDC_GEN_METADATA_H
 #define LDC_GEN_METADATA_H
 
-#include "gen/llvm-version.h"
+// MDNode was moved into its own header, and contains Value*s
+#include "llvm/MDNode.h"
+typedef llvm::Value MDNodeField;
 
-    // MDNode was moved into its own header, and contains Value*s
-    #include "llvm/MDNode.h"
-    typedef llvm::Value MDNodeField;
-    
-    // Use getNumElements() and getElement() to access elements.
-    inline unsigned MD_GetNumElements(llvm::MDNode* N) {
-        return N->getNumElements();
-    }
-    inline MDNodeField* MD_GetElement(llvm::MDNode* N, unsigned i) {
-        return N->getElement(i);
-    }
+// Use getNumElements() and getElement() to access elements.
+inline unsigned MD_GetNumElements(llvm::MDNode* N) {
+    return N->getNumElements();
+}
+
+inline MDNodeField* MD_GetElement(llvm::MDNode* N, unsigned i) {
+    return N->getElement(i);
+}
 
 #define METADATA_LINKAGE_TYPE  llvm::GlobalValue::WeakODRLinkage
 
diff -r f9660d9cf2ba -r 259b031f3d22 gen/optimizer.cpp
--- a/gen/optimizer.cpp	Mon Jul 20 17:55:05 2009 +0200
+++ b/gen/optimizer.cpp	Mon Jul 20 18:16:11 2009 +0200
@@ -159,11 +159,9 @@
         if (!disableLangSpecificPasses) {
             if (!disableSimplifyRuntimeCalls)
                 addPass(pm, createSimplifyDRuntimeCalls());
-            
-#ifdef USE_METADATA
+
             if (!disableGCToStack)
                 addPass(pm, createGarbageCollect2Stack());
-#endif
         }
         // Run some clean-up passes
         addPass(pm, createInstructionCombiningPass());
diff -r f9660d9cf2ba -r 259b031f3d22 gen/passes/StripExternals.cpp
--- a/gen/passes/StripExternals.cpp	Mon Jul 20 17:55:05 2009 +0200
+++ b/gen/passes/StripExternals.cpp	Mon Jul 20 18:16:11 2009 +0200
@@ -15,8 +15,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "gen/llvm-version.h"
-
 #define DEBUG_TYPE "strip-externals"
 
 #include "Passes.h"
diff -r f9660d9cf2ba -r 259b031f3d22 gen/runtime.cpp
--- a/gen/runtime.cpp	Mon Jul 20 17:55:05 2009 +0200
+++ b/gen/runtime.cpp	Mon Jul 20 18:16:11 2009 +0200
@@ -1,5 +1,4 @@
 #include "gen/llvm.h"
-#include "gen/llvm-version.h"
 #include "llvm/Module.h"
 #include "llvm/Attributes.h"
 #include "llvm/Bitcode/ReaderWriter.h"
diff -r f9660d9cf2ba -r 259b031f3d22 gen/tollvm.cpp
--- a/gen/tollvm.cpp	Mon Jul 20 17:55:05 2009 +0200
+++ b/gen/tollvm.cpp	Mon Jul 20 18:16:11 2009 +0200
@@ -20,7 +20,6 @@
 #include "gen/complex.h"
 #include "gen/llvmhelpers.h"
 #include "gen/linkage.h"
-#include "gen/llvm-version.h"
 
 #include "ir/irtype.h"
 #include "ir/irtypeclass.h"
diff -r f9660d9cf2ba -r 259b031f3d22 gen/toobj.cpp
--- a/gen/toobj.cpp	Mon Jul 20 17:55:05 2009 +0200
+++ b/gen/toobj.cpp	Mon Jul 20 18:16:11 2009 +0200
@@ -11,7 +11,6 @@
 #include <fstream>
 
 #include "gen/llvm.h"
-#include "gen/llvm-version.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Module.h"
diff -r f9660d9cf2ba -r 259b031f3d22 gen/typinf.cpp
--- a/gen/typinf.cpp	Mon Jul 20 17:55:05 2009 +0200
+++ b/gen/typinf.cpp	Mon Jul 20 18:16:11 2009 +0200
@@ -42,7 +42,6 @@
 #include "gen/linkage.h"
 #include "gen/metadata.h"
 #include "gen/rttibuilder.h"
-#include "gen/llvm-version.h"
 
 #include "ir/irvar.h"
 #include "ir/irtype.h"