mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-24 19:52:54 +01:00
d701db82cf
In r287786, a bug was introduced into llvm-readelf where it didn't print the static symbol table if both --symbols and --dyn-symbols were specified, even if there was no dynamic symbol table. This is obviously incorrect. This patch fixes this issue, by delegating the decision of which symbol tables should be printed to the final dumper, rather than trying to decide in the command-line option handling layer. The decision was made to follow the approach taken in this patch because the LLVM style dumper uses a different order to the original GNU style behaviour (and GNU readelf) for ELF output. Other approaches resulted in behaviour changes for other dumpers which felt wrong. In particular, I wanted to avoid changing the order of the output for --symbols --dyn-symbols for LLVM style, keep what is emitted by --symbols unchanged for all dumpers, and avoid having different orders of .dynsym and .symtab dumping for GNU "--symbols" and "--symbols --dyn-symbols". Reviewed by: grimar, rupprecht Differential Revision: https://reviews.llvm.org/D57016 llvm-svn: 351960
69 lines
2.0 KiB
C++
69 lines
2.0 KiB
C++
//===-- llvm-readobj.h ----------------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_TOOLS_LLVM_READOBJ_LLVM_READOBJ_H
|
|
#define LLVM_TOOLS_LLVM_READOBJ_LLVM_READOBJ_H
|
|
|
|
#include "llvm/Support/CommandLine.h"
|
|
#include "llvm/Support/Compiler.h"
|
|
#include "llvm/Support/ErrorOr.h"
|
|
#include "llvm/Support/Error.h"
|
|
#include <string>
|
|
|
|
namespace llvm {
|
|
namespace object {
|
|
class RelocationRef;
|
|
}
|
|
|
|
// Various helper functions.
|
|
LLVM_ATTRIBUTE_NORETURN void reportError(Twine Msg);
|
|
void error(std::error_code EC);
|
|
void error(llvm::Error EC);
|
|
template <typename T> T error(llvm::Expected<T> &&E) {
|
|
error(E.takeError());
|
|
return std::move(*E);
|
|
}
|
|
|
|
template <class T> T unwrapOrError(ErrorOr<T> EO) {
|
|
if (EO)
|
|
return *EO;
|
|
reportError(EO.getError().message());
|
|
}
|
|
template <class T> T unwrapOrError(Expected<T> EO) {
|
|
if (EO)
|
|
return *EO;
|
|
std::string Buf;
|
|
raw_string_ostream OS(Buf);
|
|
logAllUnhandledErrors(EO.takeError(), OS);
|
|
OS.flush();
|
|
reportError(Buf);
|
|
}
|
|
bool relocAddressLess(object::RelocationRef A,
|
|
object::RelocationRef B);
|
|
} // namespace llvm
|
|
|
|
namespace opts {
|
|
extern llvm::cl::opt<bool> SectionRelocations;
|
|
extern llvm::cl::opt<bool> SectionSymbols;
|
|
extern llvm::cl::opt<bool> SectionData;
|
|
extern llvm::cl::opt<bool> ExpandRelocs;
|
|
extern llvm::cl::opt<bool> RawRelr;
|
|
extern llvm::cl::opt<bool> CodeViewSubsectionBytes;
|
|
extern llvm::cl::opt<bool> Demangle;
|
|
enum OutputStyleTy { LLVM, GNU };
|
|
extern llvm::cl::opt<OutputStyleTy> Output;
|
|
} // namespace opts
|
|
|
|
#define LLVM_READOBJ_ENUM_ENT(ns, enum) \
|
|
{ #enum, ns::enum }
|
|
|
|
#define LLVM_READOBJ_ENUM_CLASS_ENT(enum_class, enum) \
|
|
{ #enum, std::underlying_type<enum_class>::type(enum_class::enum) }
|
|
|
|
#endif
|