Import LLVM 7.0.1 release including clang, lld and lldb.

1 files changed, 2 insertions, 2 deletions

diff --git a/gnu/llvm/tools/llvm-objdump/COFFDump.cpp b/gnu/llvm/tools/llvm-objdump/COFFDump.cpp
index 780d1e9e611..7ca5d04593f 100644
--- a/gnu/llvm/tools/llvm-objdump/COFFDump.cpp
+++ b/gnu/llvm/tools/llvm-objdump/COFFDump.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// \brief This file implements the COFF-specific dumper for llvm-objdump.
+/// This file implements the COFF-specific dumper for llvm-objdump.
 /// It outputs the Win64 EH data structures as plain text.
 /// The encoding of the unwind codes is described in MSDN:
 /// http://msdn.microsoft.com/en-us/library/ck9asaa9.aspx
@@ -453,7 +453,7 @@ static bool getPDataSection(const COFFObjectFile *Obj,
       Rels.push_back(Reloc);
 
     // Sort relocations by address.
-    std::sort(Rels.begin(), Rels.end(), RelocAddressLess);
+    llvm::sort(Rels.begin(), Rels.end(), RelocAddressLess);
 
     ArrayRef<uint8_t> Contents;
     error(Obj->getSectionContents(Pdata, Contents));