summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lld/include/lld/Common/LLVM.h25
-rw-r--r--lld/wasm/Driver.cpp1
-rw-r--r--lld/wasm/InputChunks.h11
-rw-r--r--lld/wasm/InputFiles.h16
-rw-r--r--lld/wasm/InputGlobal.h2
-rw-r--r--lld/wasm/OutputSections.h6
-rw-r--r--lld/wasm/SymbolTable.cpp1
-rw-r--r--lld/wasm/SymbolTable.h7
-rw-r--r--lld/wasm/Symbols.h12
-rw-r--r--lld/wasm/WriterUtils.h3
10 files changed, 39 insertions, 45 deletions
diff --git a/lld/include/lld/Common/LLVM.h b/lld/include/lld/Common/LLVM.h
index b5d0e2bffb0..3c237c622e7 100644
--- a/lld/include/lld/Common/LLVM.h
+++ b/lld/include/lld/Common/LLVM.h
@@ -44,6 +44,21 @@ namespace llvm {
class raw_ostream;
// TODO: DenseMap, ...
+
+ namespace object {
+ class WasmObjectFile;
+ struct WasmSection;
+ struct WasmSegment;
+ class WasmSymbol;
+ }
+
+ namespace wasm {
+ struct WasmFunction;
+ struct WasmGlobal;
+ struct WasmGlobalType;
+ struct WasmRelocation;
+ struct WasmSignature;
+ }
}
namespace lld {
@@ -69,6 +84,16 @@ namespace lld {
using llvm::Expected;
using llvm::raw_ostream;
+
+ using llvm::object::WasmObjectFile;
+ using llvm::object::WasmSection;
+ using llvm::object::WasmSegment;
+ using llvm::object::WasmSymbol;
+ using llvm::wasm::WasmFunction;
+ using llvm::wasm::WasmGlobal;
+ using llvm::wasm::WasmGlobalType;
+ using llvm::wasm::WasmRelocation;
+ using llvm::wasm::WasmSignature;
} // end namespace lld.
namespace std {
diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
index c86e0b107cf..a8ec982bd60 100644
--- a/lld/wasm/Driver.cpp
+++ b/lld/wasm/Driver.cpp
@@ -31,6 +31,7 @@
#define DEBUG_TYPE "lld"
using namespace llvm;
+using namespace llvm::object;
using namespace llvm::sys;
using namespace llvm::wasm;
diff --git a/lld/wasm/InputChunks.h b/lld/wasm/InputChunks.h
index f899d697c6d..a3bcbb266ec 100644
--- a/lld/wasm/InputChunks.h
+++ b/lld/wasm/InputChunks.h
@@ -24,18 +24,9 @@
#include "Config.h"
#include "InputFiles.h"
#include "lld/Common/ErrorHandler.h"
+#include "lld/Common/LLVM.h"
#include "llvm/Object/Wasm.h"
-using llvm::object::WasmSection;
-using llvm::object::WasmSegment;
-using llvm::wasm::WasmFunction;
-using llvm::wasm::WasmRelocation;
-using llvm::wasm::WasmSignature;
-
-namespace llvm {
-class raw_ostream;
-}
-
namespace lld {
namespace wasm {
diff --git a/lld/wasm/InputFiles.h b/lld/wasm/InputFiles.h
index 948cf91fb70..d9384bd1082 100644
--- a/lld/wasm/InputFiles.h
+++ b/lld/wasm/InputFiles.h
@@ -20,18 +20,6 @@
#include "llvm/Support/MemoryBuffer.h"
#include <vector>
-using llvm::object::Archive;
-using llvm::object::WasmObjectFile;
-using llvm::object::WasmSection;
-using llvm::object::WasmSymbol;
-using llvm::wasm::WasmRelocation;
-
-namespace llvm {
-namespace lto {
-class InputFile;
-}
-} // namespace llvm
-
namespace lld {
namespace wasm {
@@ -81,12 +69,12 @@ public:
explicit ArchiveFile(MemoryBufferRef M) : InputFile(ArchiveKind, M) {}
static bool classof(const InputFile *F) { return F->kind() == ArchiveKind; }
- void addMember(const Archive::Symbol *Sym);
+ void addMember(const llvm::object::Archive::Symbol *Sym);
void parse() override;
private:
- std::unique_ptr<Archive> File;
+ std::unique_ptr<llvm::object::Archive> File;
llvm::DenseSet<uint64_t> Seen;
};
diff --git a/lld/wasm/InputGlobal.h b/lld/wasm/InputGlobal.h
index fd534307340..3b20600b22e 100644
--- a/lld/wasm/InputGlobal.h
+++ b/lld/wasm/InputGlobal.h
@@ -16,8 +16,6 @@
#include "lld/Common/ErrorHandler.h"
#include "llvm/Object/Wasm.h"
-using llvm::wasm::WasmGlobal;
-
namespace lld {
namespace wasm {
diff --git a/lld/wasm/OutputSections.h b/lld/wasm/OutputSections.h
index 46916f334c1..6c5baa309a9 100644
--- a/lld/wasm/OutputSections.h
+++ b/lld/wasm/OutputSections.h
@@ -13,11 +13,9 @@
#include "InputChunks.h"
#include "WriterUtils.h"
#include "lld/Common/ErrorHandler.h"
+#include "lld/Common/LLVM.h"
#include "llvm/ADT/DenseMap.h"
-using llvm::raw_ostream;
-using llvm::raw_string_ostream;
-
namespace lld {
namespace wasm {
@@ -82,7 +80,7 @@ public:
std::string Body;
protected:
- raw_string_ostream BodyOutputStream;
+ llvm::raw_string_ostream BodyOutputStream;
};
class CodeSection : public OutputSection {
diff --git a/lld/wasm/SymbolTable.cpp b/lld/wasm/SymbolTable.cpp
index a42e36389a1..9c967ffa81d 100644
--- a/lld/wasm/SymbolTable.cpp
+++ b/lld/wasm/SymbolTable.cpp
@@ -20,6 +20,7 @@
using namespace llvm;
using namespace llvm::wasm;
+using namespace llvm::object;
using namespace lld;
using namespace lld::wasm;
diff --git a/lld/wasm/SymbolTable.h b/lld/wasm/SymbolTable.h
index de4b716974e..b8284ac9386 100644
--- a/lld/wasm/SymbolTable.h
+++ b/lld/wasm/SymbolTable.h
@@ -13,12 +13,9 @@
#include "InputFiles.h"
#include "LTO.h"
#include "Symbols.h"
+#include "lld/Common/LLVM.h"
#include "llvm/ADT/CachedHashString.h"
#include "llvm/ADT/DenseSet.h"
-#include "llvm/Support/raw_ostream.h"
-
-using llvm::wasm::WasmGlobalType;
-using llvm::wasm::WasmSignature;
namespace lld {
namespace wasm {
@@ -66,7 +63,7 @@ public:
Symbol *addUndefinedGlobal(StringRef Name, uint32_t Flags, InputFile *File,
const WasmGlobalType *Type);
- void addLazy(ArchiveFile *F, const Archive::Symbol *Sym);
+ void addLazy(ArchiveFile *F, const llvm::object::Archive::Symbol *Sym);
bool addComdat(StringRef Name);
diff --git a/lld/wasm/Symbols.h b/lld/wasm/Symbols.h
index 06ed0fe5770..52cc4c6f5f7 100644
--- a/lld/wasm/Symbols.h
+++ b/lld/wasm/Symbols.h
@@ -15,14 +15,11 @@
#include "llvm/Object/Archive.h"
#include "llvm/Object/Wasm.h"
-using llvm::object::Archive;
-using llvm::wasm::WasmGlobalType;
-using llvm::wasm::WasmSignature;
-using llvm::wasm::WasmSymbolType;
-
namespace lld {
namespace wasm {
+using llvm::wasm::WasmSymbolType;
+
class InputFile;
class InputChunk;
class InputSegment;
@@ -272,14 +269,15 @@ public:
class LazySymbol : public Symbol {
public:
- LazySymbol(StringRef Name, InputFile *File, const Archive::Symbol &Sym)
+ LazySymbol(StringRef Name, InputFile *File,
+ const llvm::object::Archive::Symbol &Sym)
: Symbol(Name, LazyKind, 0, File), ArchiveSymbol(Sym) {}
static bool classof(const Symbol *S) { return S->kind() == LazyKind; }
void fetch();
private:
- Archive::Symbol ArchiveSymbol;
+ llvm::object::Archive::Symbol ArchiveSymbol;
};
// linker-generated symbols
diff --git a/lld/wasm/WriterUtils.h b/lld/wasm/WriterUtils.h
index 6f11cca3865..2754479fc69 100644
--- a/lld/wasm/WriterUtils.h
+++ b/lld/wasm/WriterUtils.h
@@ -13,9 +13,6 @@
#include "lld/Common/LLVM.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Object/Wasm.h"
-#include "llvm/Support/raw_ostream.h"
-
-using llvm::raw_ostream;
namespace lld {
namespace wasm {
OpenPOWER on IntegriCloud