summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2015-03-27 22:47:44 +0000
committerRui Ueyama <ruiu@google.com>2015-03-27 22:47:44 +0000
commita57f619133827a440fdbadc0c0de24886a64ae75 (patch)
tree9fa9a3e6bd6f2b82558d323c771c559c9af7dc11
parent0de4ab513fb0c43800a2c97797420440e4ceb63f (diff)
downloadbcm5719-llvm-a57f619133827a440fdbadc0c0de24886a64ae75.tar.gz
bcm5719-llvm-a57f619133827a440fdbadc0c0de24886a64ae75.zip
Remove virtual from some ELFLinkingContext member functions.
I expected that these functions are overridden somewhere in the LLD code base, but they are actually not. Removing virtual for readability (and performance). llvm-svn: 233441
-rw-r--r--lld/include/lld/ReaderWriter/ELFLinkingContext.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/lld/include/lld/ReaderWriter/ELFLinkingContext.h b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
index 1640613481f..5b580c3d5c6 100644
--- a/lld/include/lld/ReaderWriter/ELFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
@@ -102,7 +102,7 @@ public:
/// \brief Does the linker allow dynamic libraries to be linked with?
/// This is true when the output mode of the executable is set to be
/// having NMAGIC/OMAGIC
- virtual bool allowLinkWithDynamicLibraries() const {
+ bool allowLinkWithDynamicLibraries() const {
if (_outputMagic == OutputMagic::NMAGIC ||
_outputMagic == OutputMagic::OMAGIC || _noAllowDynamicLibraries)
return false;
@@ -127,19 +127,17 @@ public:
}
/// \brief The dynamic linker path set by the --dynamic-linker option
- virtual StringRef getInterpreter() const {
+ StringRef getInterpreter() const {
if (_dynamicLinkerArg)
return _dynamicLinkerPath;
return getDefaultInterpreter();
}
/// \brief Does the output have dynamic sections.
- virtual bool isDynamic() const;
+ bool isDynamic() const;
/// \brief Are we creating a shared library?
- virtual bool isDynamicLibrary() const {
- return _outputELFType == llvm::ELF::ET_DYN;
- }
+ bool isDynamicLibrary() const { return _outputELFType == llvm::ELF::ET_DYN; }
/// \brief Is the relocation a relative relocation
virtual bool isRelativeReloc(const Reference &r) const;
@@ -177,10 +175,10 @@ public:
/// or -n in the command line
/// Set OMAGIC output kind when the linker specifies --omagic
/// or -N in the command line
- virtual void setOutputMagic(OutputMagic magic) { _outputMagic = magic; }
+ void setOutputMagic(OutputMagic magic) { _outputMagic = magic; }
/// \brief Disallow dynamic libraries during linking
- virtual void setNoAllowDynamicLibraries() { _noAllowDynamicLibraries = true; }
+ void setNoAllowDynamicLibraries() { _noAllowDynamicLibraries = true; }
/// Searches directories for a match on the input File
ErrorOr<StringRef> searchLibrary(StringRef libName) const;
OpenPOWER on IntegriCloud