RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix nm on GCC 5.1 after the C++14 move

Browse Source 
Summary:
As in D66306, fix the invocation of std::sort with std::function by not using
std::function, since it's easier to read and is broken in libstdc++ from GCC 5.1
(see https://gcc.gnu.org/PR65942).

Reviewers: thakis

Subscribers: jkorous, mgrang, dexonsmith, rupprecht, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D66310

llvm-svn: 369045
This commit is contained in:
JF Bastien 2019-08-15 20:38:42 +00:00
parent f8a414589e
commit 3fcfd786dd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/llvm-nm/llvm-nm.cpp
View File

@ -711,17 +711,21 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName,
const std::string &ArchiveName, const std::string &ArchiveName,
const std::string &ArchitectureName) { const std::string &ArchitectureName) {
if (!NoSort) { if (!NoSort) {
std::function<bool(const NMSymbol &, const NMSymbol &)> Cmp; using Comparator = bool (*)(const NMSymbol &, const NMSymbol &);
Comparator Cmp;
if (NumericSort) if (NumericSort)
Cmp = compareSymbolAddress; Cmp = &compareSymbolAddress;
else if (SizeSort) else if (SizeSort)
Cmp = compareSymbolSize; Cmp = &compareSymbolSize;
else else
Cmp = compareSymbolName; Cmp = &compareSymbolName;
if (ReverseSort) if (ReverseSort)
Cmp = [=](const NMSymbol &A, const NMSymbol &B) { return Cmp(B, A); }; llvm::sort(SymbolList, [=](const NMSymbol &A, const NMSymbol &B) -> bool {
llvm::sort(SymbolList, Cmp); return Cmp(B, A);
});
else
llvm::sort(SymbolList, Cmp);
} }
if (!PrintFileName) { if (!PrintFileName) {