Index: llvm/trunk/lib/MC/MachObjectWriter.cpp
===================================================================
--- llvm/trunk/lib/MC/MachObjectWriter.cpp
+++ llvm/trunk/lib/MC/MachObjectWriter.cpp
@@ -593,8 +593,8 @@
   }
 
   // External and undefined symbols are required to be in lexicographic order.
-  std::sort(ExternalSymbolData.begin(), ExternalSymbolData.end());
-  std::sort(UndefinedSymbolData.begin(), UndefinedSymbolData.end());
+  llvm::sort(ExternalSymbolData.begin(), ExternalSymbolData.end());
+  llvm::sort(UndefinedSymbolData.begin(), UndefinedSymbolData.end());
 
   // Set the symbol indices.
   Index = 0;
Index: llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp
===================================================================
--- llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp
+++ llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp
@@ -567,10 +567,10 @@
   std::vector<COFFSection *> Arr;
   for (auto &Section : Sections)
     Arr.push_back(Section.get());
-  std::sort(Arr.begin(), Arr.end(),
-            [](const COFFSection *A, const COFFSection *B) {
-              return A->Number < B->Number;
-            });
+  llvm::sort(Arr.begin(), Arr.end(),
+             [](const COFFSection *A, const COFFSection *B) {
+               return A->Number < B->Number;
+             });
 
   for (auto &Section : Arr) {
     if (Section->Number == -1)