summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2015-07-23 23:03:55 +0000
committerRui Ueyama <ruiu@google.com>2015-07-23 23:03:55 +0000
commit8abca7e7294352390af75a6a24d264a4a9c8643f (patch)
tree7f68c7f41ca3276ce4fda15309240bcdd93dc579
parent89696664506af0c118710825bbc11752b52d87c2 (diff)
downloadbcm5719-llvm-8abca7e7294352390af75a6a24d264a4a9c8643f.tar.gz
bcm5719-llvm-8abca7e7294352390af75a6a24d264a4a9c8643f.zip
Fix -Wextra-semi.
Patch from Eugene.Zelenko! llvm-svn: 243060
-rw-r--r--lld/include/lld/Core/LinkingContext.h2
-rw-r--r--lld/include/lld/ReaderWriter/ELFLinkingContext.h6
-rw-r--r--lld/lib/ReaderWriter/PECOFF/IdataPass.h2
-rw-r--r--lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h6
-rw-r--r--lld/unittests/DriverTests/GnuLdDriverTest.cpp3
5 files changed, 9 insertions, 10 deletions
diff --git a/lld/include/lld/Core/LinkingContext.h b/lld/include/lld/Core/LinkingContext.h
index bedf7d8e4a7..a723854b3c9 100644
--- a/lld/include/lld/Core/LinkingContext.h
+++ b/lld/include/lld/Core/LinkingContext.h
@@ -61,7 +61,7 @@ public:
/// should be marked live (along with all Atoms they reference). Usually
/// this method returns false for main executables, but true for dynamic
/// shared libraries.
- bool globalsAreDeadStripRoots() const { return _globalsAreDeadStripRoots; };
+ bool globalsAreDeadStripRoots() const { return _globalsAreDeadStripRoots; }
/// Only used if deadStrip() returns true. This method returns the names
/// of DefinedAtoms that should be marked live (along with all Atoms they
diff --git a/lld/include/lld/ReaderWriter/ELFLinkingContext.h b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
index 9cfc2f8d69b..acf6c3c088d 100644
--- a/lld/include/lld/ReaderWriter/ELFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
@@ -282,7 +282,7 @@ public:
void addSearchPath(StringRef ref) { _inputSearchPaths.push_back(ref); }
// Retrieve search path list.
- StringRefVector getSearchPaths() { return _inputSearchPaths; };
+ StringRefVector getSearchPaths() { return _inputSearchPaths; }
// By default, the linker would merge sections that are read only with
// segments that have read and execute permissions. When the user specifies a
@@ -336,8 +336,8 @@ public:
void addWrapForSymbol(StringRef sym) { _wrapCalls.insert(sym); }
// \brief Set DT_FLAGS flag.
- void setDTFlag(DTFlag f) { _dtFlags |= f; };
- bool getDTFlag(DTFlag f) { return (_dtFlags & f); };
+ void setDTFlag(DTFlag f) { _dtFlags |= f; }
+ bool getDTFlag(DTFlag f) { return (_dtFlags & f); }
const llvm::StringSet<> &wrapCalls() const { return _wrapCalls; }
diff --git a/lld/lib/ReaderWriter/PECOFF/IdataPass.h b/lld/lib/ReaderWriter/PECOFF/IdataPass.h
index 4bde49b27c6..959b3ba5d46 100644
--- a/lld/lib/ReaderWriter/PECOFF/IdataPass.h
+++ b/lld/lib/ReaderWriter/PECOFF/IdataPass.h
@@ -87,7 +87,7 @@ public:
StringRef customSectionName() const override {
return _sectionName;
- };
+ }
private:
std::vector<uint8_t> assembleRawContent(uint64_t contents, bool is64);
diff --git a/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h b/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
index cfa66bf2342..9bf2c0060fd 100644
--- a/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
+++ b/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
@@ -63,7 +63,7 @@ public:
_defined.addReference(std::unique_ptr<SimpleReference>(ref));
addAtom(_defined);
addAtom(_undefined);
- };
+ }
private:
SimpleUndefinedAtom _undefined;
@@ -79,7 +79,7 @@ public:
: SimpleFile("<symbol-rename>"), _fromSym(from), _toSym(to),
_from(*this, _fromSym, &_to), _to(*this, _toSym) {
addAtom(_from);
- };
+ }
private:
std::string _fromSym;
@@ -100,7 +100,7 @@ public:
_imageBaseAtom(*this, ctx.decorateSymbol("__ImageBase"),
Atom::scopeGlobal, ctx.getBaseAddress()) {
addAtom(_imageBaseAtom);
- };
+ }
private:
SimpleAbsoluteAtom _imageBaseAtom;
diff --git a/lld/unittests/DriverTests/GnuLdDriverTest.cpp b/lld/unittests/DriverTests/GnuLdDriverTest.cpp
index db8a48d4a34..5c2756331f4 100644
--- a/lld/unittests/DriverTests/GnuLdDriverTest.cpp
+++ b/lld/unittests/DriverTests/GnuLdDriverTest.cpp
@@ -42,7 +42,7 @@ protected:
std::error_code ec =
GnuLdDriver::evalLinkerScript(*_ctx, std::move(mb), out, nostdlib);
EXPECT_FALSE(ec);
- };
+ }
std::unique_ptr<ELFLinkingContext> _ctx;
};
@@ -281,4 +281,3 @@ TEST_F(LinkerScriptTest, ExprEval) {
EXPECT_EQ(0x14000, result);
EXPECT_EQ(0, sa2->symbol().compare(StringRef(".")));
}
-
OpenPOWER on IntegriCloud