[llvm-commits] CVS: llvm/include/llvm/InlineAsm.h LinkAllVMCore.h

[Reid Spencer]

Changes in directory llvm/include/llvm:

InlineAsm.h updated: 1.11 -> 1.12
LinkAllVMCore.h updated: 1.2 -> 1.3
---
Log message:

For PR780: http://llvm.cs.uiuc.edu/PR780 :
1. Add #includes to LinkAllVMCore.h to get Mangler.o and InlineAsm.o
2. Make Mangler.h and InlineAsm.h use the macros to ensure linkage
3. Make each of the tools with --load options include LinkAllVMCore.h
This should be the last set of changes for this bug and 800.


---
Diffs of the changes:  (+7 -1)

 InlineAsm.h     |    6 +++++-
 LinkAllVMCore.h |    2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/InlineAsm.h
diff -u llvm/include/llvm/InlineAsm.h:1.11 llvm/include/llvm/InlineAsm.h:1.12
--- llvm/include/llvm/InlineAsm.h:1.11	Wed Jun  7 17:47:44 2006
+++ llvm/include/llvm/InlineAsm.h	Wed Jun  7 18:03:13 2006
@@ -17,6 +17,7 @@
 #define LLVM_INLINEASM_H
 
 #include "llvm/Value.h"
+#include "llvm/Support/IncludeFile.h"
 #include <vector>
 
 namespace llvm {
@@ -35,7 +36,7 @@
   
   InlineAsm(const FunctionType *Ty, const std::string &AsmString,
             const std::string &Constraints, bool hasSideEffects);
-  ~InlineAsm();
+  virtual ~InlineAsm();
 public:
 
   /// InlineAsm::get - Return the the specified uniqued inline asm string.
@@ -128,4 +129,7 @@
 
 } // End llvm namespace
 
+// Make sure the InlineAsm.cpp file is linked when this one is #included.
+FORCE_DEFINING_FILE_TO_BE_LINKED(InlineAsm)
+
 #endif


Index: llvm/include/llvm/LinkAllVMCore.h
diff -u llvm/include/llvm/LinkAllVMCore.h:1.2 llvm/include/llvm/LinkAllVMCore.h:1.3
--- llvm/include/llvm/LinkAllVMCore.h:1.2	Wed Jun  7 17:09:38 2006
+++ llvm/include/llvm/LinkAllVMCore.h	Wed Jun  7 18:03:13 2006
@@ -17,9 +17,11 @@
 #define LLVM_LINKALLVMCORE_H
 
 #include "llvm/Support/IncludeFile.h"
+#include "llvm/Support/Mangler.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
 #include "llvm/IntrinsicInst.h"
+#include "llvm/InlineAsm.h"
 #include "llvm/Analysis/Verifier.h"
 
 namespace {