diff --git a/include/llvm/CodeGen/MachineFunctionInfo.h b/include/llvm/CodeGen/MachineFunctionInfo.h
index 1d3c668a6ca..8afdc719e22 100644
--- a/include/llvm/CodeGen/MachineFunctionInfo.h
+++ b/include/llvm/CodeGen/MachineFunctionInfo.h
@@ -9,25 +9,29 @@
 // 
 // This class keeps track of information about the stack frame and about the
 // per-function constant pool.
+//
+// FIXME: This class is completely SparcV9 specific.  Do not use it for future
+// targets.  This file will be eliminated in future versions of LLVM.
 //   
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_MACHINEFUNCTIONINFO_H
 #define LLVM_CODEGEN_MACHINEFUNCTIONINFO_H
 
+#include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
 
 namespace llvm {
 
 class MachineFunction;
-class Value;
 class Constant;
 class Type;
 
 class MachineFunctionInfo {
   hash_set<const Constant*> constantsForConstPool;
   hash_map<const Value*, int> offsets;
+
   unsigned	staticStackSize;
   unsigned	automaticVarsSize;
   unsigned	regSpillsSize;
@@ -41,6 +45,8 @@ class MachineFunctionInfo {
 
   MachineFunction &MF;
 public:
+  hash_map<const Instruction*, MachineCodeForInstruction> MCFIEntries;
+
   MachineFunctionInfo(MachineFunction &mf) : MF(mf) {
     staticStackSize = automaticVarsSize = regSpillsSize = 0;
     maxOptionalArgsSize = maxOptionalNumArgs = currentTmpValuesSize = 0;
diff --git a/lib/Target/SparcV9/MachineFunctionInfo.h b/lib/Target/SparcV9/MachineFunctionInfo.h
index 1d3c668a6ca..8afdc719e22 100644
--- a/lib/Target/SparcV9/MachineFunctionInfo.h
+++ b/lib/Target/SparcV9/MachineFunctionInfo.h
@@ -9,25 +9,29 @@
 // 
 // This class keeps track of information about the stack frame and about the
 // per-function constant pool.
+//
+// FIXME: This class is completely SparcV9 specific.  Do not use it for future
+// targets.  This file will be eliminated in future versions of LLVM.
 //   
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CODEGEN_MACHINEFUNCTIONINFO_H
 #define LLVM_CODEGEN_MACHINEFUNCTIONINFO_H
 
+#include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
 
 namespace llvm {
 
 class MachineFunction;
-class Value;
 class Constant;
 class Type;
 
 class MachineFunctionInfo {
   hash_set<const Constant*> constantsForConstPool;
   hash_map<const Value*, int> offsets;
+
   unsigned	staticStackSize;
   unsigned	automaticVarsSize;
   unsigned	regSpillsSize;
@@ -41,6 +45,8 @@ class MachineFunctionInfo {
 
   MachineFunction &MF;
 public:
+  hash_map<const Instruction*, MachineCodeForInstruction> MCFIEntries;
+
   MachineFunctionInfo(MachineFunction &mf) : MF(mf) {
     staticStackSize = automaticVarsSize = regSpillsSize = 0;
     maxOptionalArgsSize = maxOptionalNumArgs = currentTmpValuesSize = 0;