summaryrefslogtreecommitdiffstats
path: root/lld/ELF/SymbolListFile.cpp
diff options
context:
space:
mode:
authorGeorge Rimar <grimar@accesssoftek.com>2016-07-13 08:19:04 +0000
committerGeorge Rimar <grimar@accesssoftek.com>2016-07-13 08:19:04 +0000
commitdd64bb38bd8126f647672d7ab6f79682bef18106 (patch)
tree7fcda34c345d8901e5c03b6502fcc87539a32b57 /lld/ELF/SymbolListFile.cpp
parente05103ea11f797a6f210fe11dfaf46289cceba24 (diff)
downloadbcm5719-llvm-dd64bb38bd8126f647672d7ab6f79682bef18106.tar.gz
bcm5719-llvm-dd64bb38bd8126f647672d7ab6f79682bef18106.zip
Reverted r275257 "[ELF] - Implement extern "c++" version script tag"
It broke build bots: http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/8204 http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/19432 llvm-svn: 275258
Diffstat (limited to 'lld/ELF/SymbolListFile.cpp')
-rw-r--r--lld/ELF/SymbolListFile.cpp26
1 files changed, 4 insertions, 22 deletions
diff --git a/lld/ELF/SymbolListFile.cpp b/lld/ELF/SymbolListFile.cpp
index 1525540e259..68867cf8ae6 100644
--- a/lld/ELF/SymbolListFile.cpp
+++ b/lld/ELF/SymbolListFile.cpp
@@ -77,7 +77,6 @@ public:
void run();
private:
- void parseExtern(std::vector<SymbolVersion> *Globals);
void parseVersion(StringRef Version);
void parseLocal();
void parseVersionSymbols(StringRef Version);
@@ -121,38 +120,21 @@ void VersionScriptParser::parseLocal() {
Config->VersionScriptGlobalByDefault = false;
}
-void VersionScriptParser::parseExtern(std::vector<SymbolVersion> *Globals) {
- expect("extern");
- expect("C++");
- expect("{");
-
- for (;;) {
- if (peek() == "}" || Error)
- break;
- Globals->push_back({next(), true});
- expect(";");
- }
-
- expect("}");
- expect(";");
-}
-
void VersionScriptParser::parseVersionSymbols(StringRef Version) {
- std::vector<SymbolVersion> *Globals;
+ std::vector<StringRef> *Globals;
if (Version.empty())
Globals = &Config->VersionScriptGlobals;
else
Globals = &Config->SymbolVersions.back().Globals;
for (;;) {
- if (peek() == "extern")
- parseExtern(Globals);
-
StringRef Cur = peek();
+ if (Cur == "extern")
+ setError("extern keyword is not supported");
if (Cur == "}" || Cur == "local:" || Error)
return;
next();
- Globals->push_back({Cur, false});
+ Globals->push_back(Cur);
expect(";");
}
}
OpenPOWER on IntegriCloud