summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2018-05-15 22:01:54 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2018-05-15 22:01:54 +0000
commit5455038d98b7c48e21603ef86200847834c0a086 (patch)
treeef884dfad38138c4ef400b7ee1ba65f4b22502c0
parent919882638ed8d5d7e56ceacaa58d259b2421ae82 (diff)
downloadbcm5719-llvm-5455038d98b7c48e21603ef86200847834c0a086.tar.gz
bcm5719-llvm-5455038d98b7c48e21603ef86200847834c0a086.zip
[lld] Make helpers static. NFC.
llvm-svn: 332408
-rw-r--r--lld/ELF/Arch/X86_64.cpp2
-rw-r--r--lld/ELF/SymbolTable.cpp6
-rw-r--r--lld/wasm/Driver.cpp2
-rw-r--r--lld/wasm/InputChunks.cpp2
4 files changed, 7 insertions, 5 deletions
diff --git a/lld/ELF/Arch/X86_64.cpp b/lld/ELF/Arch/X86_64.cpp
index 8848345a3cf..cc506a157f3 100644
--- a/lld/ELF/Arch/X86_64.cpp
+++ b/lld/ELF/Arch/X86_64.cpp
@@ -573,7 +573,7 @@ void RetpolineZNow<ELFT>::writePlt(uint8_t *Buf, uint64_t GotPltEntryAddr,
write32le(Buf + 8, -TargetInfo::getPltEntryOffset(Index) - 12);
}
-template <class ELFT> TargetInfo *getTargetInfo() {
+template <class ELFT> static TargetInfo *getTargetInfo() {
if (Config->ZRetpolineplt) {
if (Config->ZNow) {
static RetpolineZNow<ELFT> T;
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp
index f7b03ee6739..4e2746f9731 100644
--- a/lld/ELF/SymbolTable.cpp
+++ b/lld/ELF/SymbolTable.cpp
@@ -598,9 +598,9 @@ Symbol *SymbolTable::find(StringRef Name) {
// This is used to handle lazy symbols. May replace existent
// symbol with lazy version or request to Fetch it.
template <class ELFT, typename LazyT, typename... ArgT>
-void replaceOrFetchLazy(StringRef Name, InputFile &File,
- llvm::function_ref<InputFile *()> Fetch,
- ArgT &&... Arg) {
+static void replaceOrFetchLazy(StringRef Name, InputFile &File,
+ llvm::function_ref<InputFile *()> Fetch,
+ ArgT &&... Arg) {
Symbol *S;
bool WasInserted;
std::tie(S, WasInserted) = Symtab->insert(Name);
diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
index 6f321daf471..7a836c55ed0 100644
--- a/lld/wasm/Driver.cpp
+++ b/lld/wasm/Driver.cpp
@@ -98,11 +98,13 @@ static const opt::OptTable::Info OptInfo[] = {
#undef OPTION
};
+namespace {
class WasmOptTable : public llvm::opt::OptTable {
public:
WasmOptTable() : OptTable(OptInfo) {}
opt::InputArgList parse(ArrayRef<const char *> Argv);
};
+} // namespace
// Set color diagnostics according to -color-diagnostics={auto,always,never}
// or -no-color-diagnostics flags.
diff --git a/lld/wasm/InputChunks.cpp b/lld/wasm/InputChunks.cpp
index 37f8b961a3b..925c623323d 100644
--- a/lld/wasm/InputChunks.cpp
+++ b/lld/wasm/InputChunks.cpp
@@ -23,7 +23,7 @@ using namespace llvm::support::endian;
using namespace lld;
using namespace lld::wasm;
-StringRef ReloctTypeToString(uint8_t RelocType) {
+static StringRef ReloctTypeToString(uint8_t RelocType) {
switch (RelocType) {
#define WASM_RELOC(NAME, REL) case REL: return #NAME;
#include "llvm/BinaryFormat/WasmRelocs.def"
OpenPOWER on IntegriCloud