[llvm-commits] [parallel] CVS: llvm/include/llvm/Target/TargetMachine.h TargetMachineImpls.h

[Misha Brukman]

Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.42.2.1 -> 1.42.2.2
TargetMachineImpls.h updated: 1.8.2.1 -> 1.8.2.2

---
Log message:

Merge from trunk.

---
Diffs of the changes:  (+10 -0)

Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.42.2.1 llvm/include/llvm/Target/TargetMachine.h:1.42.2.2
--- llvm/include/llvm/Target/TargetMachine.h:1.42.2.1	Mon Mar  1 17:57:19 2004
+++ llvm/include/llvm/Target/TargetMachine.h	Wed Mar 10 19:23:07 2004
@@ -52,6 +52,12 @@
 		unsigned char DoubleAl = 8, unsigned char FloatAl = 4,
 		unsigned char LongAl = 8, unsigned char IntAl = 4,
 		unsigned char ShortAl = 2, unsigned char ByteAl = 1);
+
+  // This constructor is used for targets that support arbitrary TargetData
+  // layouts, like the C backend.  It initializes the TargetData to match that
+  // of the specified module.
+  TargetMachine(const std::string &name, IntrinsicLowering *IL,
+                const Module &M);
 public:
   virtual ~TargetMachine();
 


Index: llvm/include/llvm/Target/TargetMachineImpls.h
diff -u llvm/include/llvm/Target/TargetMachineImpls.h:1.8.2.1 llvm/include/llvm/Target/TargetMachineImpls.h:1.8.2.2
--- llvm/include/llvm/Target/TargetMachineImpls.h:1.8.2.1	Mon Mar  1 17:57:19 2004
+++ llvm/include/llvm/Target/TargetMachineImpls.h	Wed Mar 10 19:23:07 2004
@@ -16,6 +16,10 @@
 #define LLVM_TARGET_TARGETMACHINEIMPLS_H
 
 namespace llvm {
+  /// Command line options shared between TargetMachine implementations - 
+  /// these should go in their own header eventually.
+  ///
+  extern bool PrintMachineCode;
 
   class TargetMachine;
   class Module;