diff --git a/include/llvm/CodeGen/MachineCodeForInstruction.h b/include/llvm/CodeGen/MachineCodeForInstruction.h
index bc457f39579..213a736ff5e 100644
--- a/include/llvm/CodeGen/MachineCodeForInstruction.h
+++ b/include/llvm/CodeGen/MachineCodeForInstruction.h
@@ -7,6 +7,9 @@
 // 
 //===----------------------------------------------------------------------===//
 //
+// FIXME: This file is SparcV9 specific.  Do not rely on this class for new 
+// targets, it will go away in the future.
+//
 // Representation of the sequence of machine instructions created for a single
 // VM instruction.  Additionally records information about hidden and implicit
 // values used by the machine instructions: about hidden values used by the
diff --git a/lib/Target/SparcV9/MachineCodeForInstruction.h b/lib/Target/SparcV9/MachineCodeForInstruction.h
index bc457f39579..213a736ff5e 100644
--- a/lib/Target/SparcV9/MachineCodeForInstruction.h
+++ b/lib/Target/SparcV9/MachineCodeForInstruction.h
@@ -7,6 +7,9 @@
 // 
 //===----------------------------------------------------------------------===//
 //
+// FIXME: This file is SparcV9 specific.  Do not rely on this class for new 
+// targets, it will go away in the future.
+//
 // Representation of the sequence of machine instructions created for a single
 // VM instruction.  Additionally records information about hidden and implicit
 // values used by the machine instructions: about hidden values used by the