Prep for merging 3.4: Undo changes from 3.3 branch

lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp

Index: lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
index 61d70bb3429257b91ac39584ef0c287244457c22..45d009c2a04f0cc62cf2173fa226f01ae47359b1 100644
--- a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
@@ -78,7 +78,7 @@ static MCCodeEmitter *createAMDGPUMCCodeEmitter(const MCInstrInfo &MCII,
   if (STI.getFeatureBits() & AMDGPU::Feature64BitPtr) {
     return createSIMCCodeEmitter(MCII, MRI, STI, Ctx);
   } else {
-    return createR600MCCodeEmitter(MCII, MRI, STI);
+    return createR600MCCodeEmitter(MCII, MRI, STI, Ctx);
   }
 }