summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2016-03-14 19:37:58 +0000
committerRui Ueyama <ruiu@google.com>2016-03-14 19:37:58 +0000
commit71a8686244ad6b4393b88373f2ceba7bfb155b2a (patch)
tree76d3faf136fbed3687c670d425c99d17b778fae4
parent1dcbbcfc5cf06d2eacc68fbe9b6fc1fb12168d6f (diff)
downloadbcm5719-llvm-71a8686244ad6b4393b88373f2ceba7bfb155b2a.tar.gz
bcm5719-llvm-71a8686244ad6b4393b88373f2ceba7bfb155b2a.zip
Revert r263366: Cosmetic change to reduce repetitions. NFC.
This reverts commit r263366 because it caused link errors in some linkers. llvm-svn: 263471
-rw-r--r--lld/ELF/Symbols.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h
index 53b1a81eea9..b95d61ef0ab 100644
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -46,8 +46,6 @@ struct Symbol {
// The base class for real symbol classes.
class SymbolBody {
- template <class ELFT> using ELFFile = llvm::object::ELFFile<ELFT>;
-
public:
enum Kind {
DefinedFirst,
@@ -92,13 +90,17 @@ public:
bool isInGot() const { return GotIndex != -1U; }
bool isInPlt() const { return PltIndex != -1U; }
- template <class ELFT> typename ELFFile<ELFT>::uintX_t
- getVA(typename ELFFile<ELFT>::uintX_t Addend = 0) const;
-
- template <class ELFT> typename ELFFile<ELFT>::uintX_t getGotVA() const;
- template <class ELFT> typename ELFFile<ELFT>::uintX_t getGotPltVA() const;
- template <class ELFT> typename ELFFile<ELFT>::uintX_t getPltVA() const;
- template <class ELFT> typename ELFFile<ELFT>::uintX_t getSize() const;
+ template <class ELFT>
+ typename llvm::object::ELFFile<ELFT>::uintX_t
+ getVA(typename llvm::object::ELFFile<ELFT>::uintX_t Addend = 0) const;
+ template <class ELFT>
+ typename llvm::object::ELFFile<ELFT>::uintX_t getGotVA() const;
+ template <class ELFT>
+ typename llvm::object::ELFFile<ELFT>::uintX_t getGotPltVA() const;
+ template <class ELFT>
+ typename llvm::object::ELFFile<ELFT>::uintX_t getPltVA() const;
+ template <class ELFT>
+ typename llvm::object::ELFFile<ELFT>::uintX_t getSize() const;
// A SymbolBody has a backreference to a Symbol. Originally they are
// doubly-linked. A backreference will never change. But the pointer
OpenPOWER on IntegriCloud