Index: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h
===================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h
@@ -82,9 +82,9 @@
     UNIMPLEMENTED_RELOC(MachO::ARM_RELOC_HALF);
     default:
       if (RelType > MachO::ARM_RELOC_HALF_SECTDIFF)
-        return make_error<RuntimeDyldError>("MachO ARM relocation type " +
-                                            std::to_string(RelType) +
-                                            " is out of range");
+        return make_error<RuntimeDyldError>(("MachO ARM relocation type " +
+                                             Twine(RelType) +
+                                             " is out of range").str());
       break;
     }
 
Index: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOI386.h
===================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOI386.h
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOI386.h
@@ -49,8 +49,8 @@
                                          ObjSectionToID);
       else if (RelType == MachO::GENERIC_RELOC_VANILLA)
         return processScatteredVANILLA(SectionID, RelI, Obj, ObjSectionToID);
-      return make_error<RuntimeDyldError>("Unhandled I386 scattered relocation "
-                                          "type: " + std::to_string(RelType));
+      return make_error<RuntimeDyldError>(("Unhandled I386 scattered relocation "
+                                           "type: " + Twine(RelType)).str());
     }
 
     switch (RelType) {
@@ -59,9 +59,9 @@
     UNIMPLEMENTED_RELOC(MachO::GENERIC_RELOC_TLV);
     default:
       if (RelType > MachO::GENERIC_RELOC_TLV)
-        return make_error<RuntimeDyldError>("MachO I386 relocation type " +
-                                            std::to_string(RelType) +
-                                            " is out of range");
+        return make_error<RuntimeDyldError>(("MachO I386 relocation type " +
+                                             Twine(RelType) +
+                                             " is out of range").str());
       break;
     }
 
Index: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOX86_64.h
===================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOX86_64.h
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOX86_64.h
@@ -64,9 +64,9 @@
     UNIMPLEMENTED_RELOC(MachO::X86_64_RELOC_TLV);
     default:
       if (RelType > MachO::X86_64_RELOC_TLV)
-        return make_error<RuntimeDyldError>("MachO X86_64 relocation type " +
-                                            std::to_string(RelType) +
-                                            " is out of range");
+        return make_error<RuntimeDyldError>(("MachO X86_64 relocation type " +
+                                             Twine(RelType) +
+                                             " is out of range").str());
       break;
     }