Prep for merging 3.4: Undo changes from 3.3 branch

lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp

 //===-- SystemZMCTargetDesc.cpp - SystemZ target descriptions -------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "SystemZMCTargetDesc.h"
@@ skipping 39 matching lines @@
 static MCSubtargetInfo *createSystemZMCSubtargetInfo(StringRef TT,
                                                      StringRef CPU,
                                                      StringRef FS) {
   MCSubtargetInfo *X = new MCSubtargetInfo();
   InitSystemZMCSubtargetInfo(X, TT, CPU, FS);
   return X;
 }
 
 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
   // separate DynamicNoPIC model.
   if (RM == Reloc::Default || RM == Reloc::DynamicNoPIC)
     RM = Reloc::Static;
 
   // For SystemZ we define the models as follows:
   //
   // Small:  BRASL can call any function and will use a stub if necessary.
@@ skipping 20 matching lines @@
   //
   // - When creating JIT code, stubs will be in range of BRASL if the
   //   image is less than 4GB in size.  GOT entries will likewise be
   //   in range of LARL.  However, the JIT environment has no equivalent
   //   of copy relocs, so locally-binding data symbols might not be in
   //   the range of LARL.  We need the Medium model in that case.
   if (CM == CodeModel::Default)
     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;
 }
 
 static MCInstPrinter *createSystemZMCInstPrinter(const Target &T,
                                                  unsigned SyntaxVariant,
                                                  const MCAsmInfo &MAI,
                                                  const MCInstrInfo &MII,
                                                  const MCRegisterInfo &MRI,
                                                  const MCSubtargetInfo &STI) {
   return new SystemZInstPrinter(MAI, MII, MRI);
@@ skipping 39 matching lines @@
                                        createSystemZMCAsmBackend);
 
   // Register the MCInstPrinter.
   TargetRegistry::RegisterMCInstPrinter(TheSystemZTarget,
                                         createSystemZMCInstPrinter);
 
   // Register the MCObjectStreamer;
   TargetRegistry::RegisterMCObjectStreamer(TheSystemZTarget,
                                            createSystemZMCObjectStreamer);
 }