Prep for merging 3.4: Undo changes from 3.3 branch

lib/Target/NVPTX/NVPTX.h

 //===-- NVPTX.h - Top-level interface for NVPTX representation --*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains the entry points for global functions defined in
 // the LLVM NVPTX back-end.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_TARGET_NVPTX_H
 #define LLVM_TARGET_NVPTX_H
 
 #include "MCTargetDesc/NVPTXBaseInfo.h"
-#include "llvm/ADT/StringMap.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Target/TargetMachine.h"
 #include <cassert>
 #include <iosfwd>
 
 namespace llvm {
 class NVPTXTargetMachine;
 class FunctionPass;
@@ skipping 26 matching lines @@
     return "ge";
   }
   llvm_unreachable("Unknown condition code");
 }
 
 FunctionPass *
 createNVPTXISelDag(NVPTXTargetMachine &TM, llvm::CodeGenOpt::Level OptLevel);
 FunctionPass *createLowerStructArgsPass(NVPTXTargetMachine &);
 FunctionPass *createNVPTXReMatPass(NVPTXTargetMachine &);
 FunctionPass *createNVPTXReMatBlockPass(NVPTXTargetMachine &);
-ModulePass *createGenericToNVVMPass();
-ModulePass *createNVVMReflectPass();
-ModulePass *createNVVMReflectPass(const StringMap<int>& Mapping);
 
 bool isImageOrSamplerVal(const Value *, const Module *);
 
 extern Target TheNVPTXTarget32;
 extern Target TheNVPTXTarget64;
 
 namespace NVPTX {
 enum DrvInterface {
   NVCL,
   CUDA,
@@ skipping 57 matching lines @@
 // Defines symbolic names for NVPTX registers.  This defines a mapping from
 // register name to register number.
 #define GET_REGINFO_ENUM
 #include "NVPTXGenRegisterInfo.inc"
 
 // Defines symbolic names for the NVPTX instructions.
 #define GET_INSTRINFO_ENUM
 #include "NVPTXGenInstrInfo.inc"
 
 #endif