diff --git a/include/llvm/CodeGen/ELFWriter.h b/include/llvm/CodeGen/ELFWriter.h
index 4e94ee9be8b..456f3b2eceb 100644
--- a/include/llvm/CodeGen/ELFWriter.h
+++ b/include/llvm/CodeGen/ELFWriter.h
@@ -19,12 +19,22 @@
 namespace llvm {
   class GlobalVariable;
   class Mangler;
+  class MachineCodeEmitter;
+  class ELFCodeEmitter;
 
   /// ELFWriter - This class implements the common target-independent code for
   /// writing ELF files.  Targets should derive a class from this to
   /// parameterize the output format.
   ///
   class ELFWriter : public MachineFunctionPass {
+    friend class ELFCodeEmitter;
+  public:
+    MachineCodeEmitter &getMachineCodeEmitter() const {
+      return *(MachineCodeEmitter*)MCE;
+    }
+
+    ~ELFWriter();
+
   protected:
     ELFWriter(std::ostream &O, TargetMachine &TM);
 
@@ -40,6 +50,10 @@ namespace llvm {
     ///
     Mangler *Mang;
 
+    /// MCE - The MachineCodeEmitter object that we are exposing to emit machine
+    /// code for functions to the .o file.
+    ELFCodeEmitter *MCE;
+
     //===------------------------------------------------------------------===//
     // Properties to be set by the derived class ctor, used to configure the
     // ELFWriter.
@@ -143,7 +157,6 @@ namespace llvm {
     /// the local symbols first in the list).
     std::vector<ELFSym> SymbolTable;
 
-
     // As we accumulate the ELF file into OutputBuffer, we occasionally need to
     // keep track of locations to update later (e.g. the location of the section
     // table in the ELF header.  These members keep track of the offset in