diff --git a/lib/CodeGen/MachineCodeEmitter.cpp b/lib/CodeGen/MachineCodeEmitter.cpp
index 224c8c37ccf..d9e8c88b9ee 100644
--- a/lib/CodeGen/MachineCodeEmitter.cpp
+++ b/lib/CodeGen/MachineCodeEmitter.cpp
@@ -48,7 +48,7 @@ namespace {
     }
 
     uint64_t getGlobalValueAddress(GlobalValue *V) { return 0; }
-    uint64_t getGlobalValueAddress(const std::string &Name) { return 0; }
+    uint64_t getGlobalValueAddress(const char *Name) { return 0; }
     uint64_t getConstantPoolEntryAddress(unsigned Num) { return 0; }
     uint64_t getCurrentPCValue() { return 0; }
 
@@ -148,7 +148,7 @@ namespace {
     uint64_t getGlobalValueAddress(GlobalValue *V) {
       return MCE.getGlobalValueAddress(V);
     }
-    uint64_t getGlobalValueAddress(const std::string &Name) {
+    uint64_t getGlobalValueAddress(const char *Name) {
       return MCE.getGlobalValueAddress(Name);
     }
     uint64_t getConstantPoolEntryAddress(unsigned Num) {
diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp
index 878c3c33bb5..8c1de8806f1 100644
--- a/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -114,7 +114,7 @@ namespace {
     virtual void emitWordAt(unsigned W, unsigned *Ptr);
 
     virtual uint64_t getGlobalValueAddress(GlobalValue *V);
-    virtual uint64_t getGlobalValueAddress(const std::string &Name);
+    virtual uint64_t getGlobalValueAddress(const char *Name);
     virtual uint64_t getConstantPoolEntryAddress(unsigned Entry);
     virtual uint64_t getCurrentPCValue();
 
@@ -224,7 +224,7 @@ uint64_t Emitter::getGlobalValueAddress(GlobalValue *V) {
     return (intptr_t)TheJIT->getOrEmitGlobalVariable(cast<GlobalVariable>(V));
   }
 }
-uint64_t Emitter::getGlobalValueAddress(const std::string &Name) {
+uint64_t Emitter::getGlobalValueAddress(const char *Name) {
   return (intptr_t)TheJIT->getPointerToNamedFunction(Name);
 }