projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert a series of commits starting at r228886 which is triggering some
[oota-llvm.git]
/
lib
/
MC
/
MCParser
/
ELFAsmParser.cpp
diff --git
a/lib/MC/MCParser/ELFAsmParser.cpp
b/lib/MC/MCParser/ELFAsmParser.cpp
index 7a120a105d2bd96d507c9e635dbae2aed83c36e9..21c65ce0b830199ec86d1cbd717f98a3382061d3 100644
(file)
--- a/
lib/MC/MCParser/ELFAsmParser.cpp
+++ b/
lib/MC/MCParser/ELFAsmParser.cpp
@@
-378,8
+378,6
@@
bool ELFAsmParser::ParseSectionArguments(bool IsPush, SMLoc loc) {
unsigned Flags = 0;
const MCExpr *Subsection = nullptr;
bool UseLastGroup = false;
unsigned Flags = 0;
const MCExpr *Subsection = nullptr;
bool UseLastGroup = false;
- StringRef UniqueStr;
- bool Unique = false;
// Set the defaults first.
if (SectionName == ".fini" || SectionName == ".init" ||
// Set the defaults first.
if (SectionName == ".fini" || SectionName == ".init" ||
@@
-464,14
+462,6
@@
bool ELFAsmParser::ParseSectionArguments(bool IsPush, SMLoc loc) {
return TokError("Linkage must be 'comdat'");
}
}
return TokError("Linkage must be 'comdat'");
}
}
- if (getLexer().is(AsmToken::Comma)) {
- Lex();
- if (getParser().parseIdentifier(UniqueStr))
- return TokError("expected identifier in directive");
- if (UniqueStr != "unique")
- return TokError("expected 'unique'");
- Unique = true;
- }
}
}
}
}
@@
-519,8
+509,8
@@
EndStmt:
}
}
}
}
- const MCSection *ELFSection =
getContext().getELFSection(
-
SectionName, Type, Flags, Size, GroupName, Uniqu
e);
+ const MCSection *ELFSection =
+
getContext().getELFSection(SectionName, Type, Flags, Size, GroupNam
e);
getStreamer().SwitchSection(ELFSection, Subsection);
if (getContext().getGenDwarfForAssembly()) {
getStreamer().SwitchSection(ELFSection, Subsection);
if (getContext().getGenDwarfForAssembly()) {