For PR780:

1. Move IncludeFile.h to System library
2. Move IncludeFile.cpp to System library
3. #1 and #2 required to prevent cyclic library dependencies for libSystem
4. Convert all existing uses of Support/IncludeFile.h to System/IncludeFile.h
5. Add IncludeFile support to various lib/System classes.
6. Add new lib/System classes to LinkAllVMCore.h
All this in an attempt to pull in lib/System to what's required for VMCore

llvm-svn: 29287

5 files changed, 13 insertions, 20 deletions

diff --git a/llvm/lib/Support/Dwarf.cpp b/llvm/lib/Support/Dwarf.cpp
index 409eadd5607..35862e84392 100644
--- a/llvm/lib/Support/Dwarf.cpp
+++ b/llvm/lib/Support/Dwarf.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Dwarf.h"
+#include "llvm/System/IncludeFile.h"
 
 #include <cassert>
 
@@ -580,3 +581,5 @@ const char *CallFrameString(unsigned Encoding) {
 } // End of namespace dwarf.
 
 } // End of namespace llvm.
+
+DEFINING_FILE_FOR(SupportDwarf)
diff --git a/llvm/lib/Support/IncludeFile.cpp b/llvm/lib/Support/IncludeFile.cpp
deleted file mode 100644
index d4729176f41..00000000000
--- a/llvm/lib/Support/IncludeFile.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===- lib/Support/IncludeFile.cpp - Ensure Linking Of Implementation -----===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the IncludeFile constructor.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/IncludeFile.h"
-
-using namespace llvm;
-
-// This constructor is used to ensure linking of other modules. See the
-// llvm/Support/IncludeFile.h header for details. 
-IncludeFile::IncludeFile(void*) {}
diff --git a/llvm/lib/Support/IsInf.cpp b/llvm/lib/Support/IsInf.cpp
index 39c11cd7a66..9b0556fcb09 100644
--- a/llvm/lib/Support/IsInf.cpp
+++ b/llvm/lib/Support/IsInf.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Config/config.h"
+#include "llvm/System/IncludeFile.h"
 
 #if HAVE_ISINF_IN_MATH_H
 # include <math.h>
@@ -43,3 +44,5 @@ int IsInf (float f)  { return isinf (f); }
 int IsInf (double d) { return isinf (d); }
 
 } // end namespace llvm;
+
+DEFINING_FILE_FOR(SupportIsInf)
diff --git a/llvm/lib/Support/IsNAN.cpp b/llvm/lib/Support/IsNAN.cpp
index 2ed2b284c7d..5ed3971254b 100644
--- a/llvm/lib/Support/IsNAN.cpp
+++ b/llvm/lib/Support/IsNAN.cpp
@@ -12,6 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Config/config.h"
+#include "llvm/System/IncludeFile.h"
+
 #if HAVE_ISNAN_IN_MATH_H
 # include <math.h>
 #elif HAVE_ISNAN_IN_CMATH
@@ -32,3 +34,5 @@ int IsNAN (float f)  { return isnan (f); }
 int IsNAN (double d) { return isnan (d); }
 
 } // end namespace llvm;
+
+DEFINING_FILE_FOR(SupportIsNAN)
diff --git a/llvm/lib/Support/SlowOperationInformer.cpp b/llvm/lib/Support/SlowOperationInformer.cpp
index bfdfe8808f4..c5f27187011 100644
--- a/llvm/lib/Support/SlowOperationInformer.cpp
+++ b/llvm/lib/Support/SlowOperationInformer.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/SlowOperationInformer.h"
+#include "llvm/System/IncludeFile.h"
 #include "llvm/System/Alarm.h"
 #include <iostream>
 #include <sstream>
@@ -64,3 +65,5 @@ bool SlowOperationInformer::progress(unsigned Amount) {
   std::cout << ToPrint+OS.str() << std::flush;
   return false;
 }
+
+DEFINING_FILE_FOR(SupportSlowOperationInformer)