Prep for merging 3.4: Undo changes from 3.3 branch

lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp

Index: lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
diff --git a/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp b/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
index 49a7f47e7d5fd388383459eb383079b19e70d9ff..20eb98d8d69f9fb454ab6d1e208edc35a2339201 100644
--- a/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
+++ b/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
@@ -57,7 +57,7 @@ static MCSubtargetInfo *createSystemZMCSubtargetInfo(StringRef TT,
 
 static MCCodeGenInfo *createSystemZMCCodeGenInfo(StringRef TT, Reloc::Model RM,
                                                  CodeModel::Model CM,
-                                                 CodeGenOpt::Level OL) {
+                                                 CodeGenOpt::Level) {
   MCCodeGenInfo *X = new MCCodeGenInfo();
 
   // Static code is suitable for use in a dynamic executable; there is no
@@ -98,7 +98,7 @@ static MCCodeGenInfo *createSystemZMCCodeGenInfo(StringRef TT, Reloc::Model RM,
     CM = CodeModel::Small;
   else if (CM == CodeModel::JITDefault)
     CM = RM == Reloc::PIC_ ? CodeModel::Small : CodeModel::Medium;
-  X->InitMCCodeGenInfo(RM, CM, OL);
+  X->InitMCCodeGenInfo(RM, CM);
   return X;
 }