From 02b7dd6f8207e26d315c4973900ff49f8752e4b2 Mon Sep 17 00:00:00 2001 From: Marina Yatsina Date: Tue, 22 Mar 2016 11:23:15 +0000 Subject: [PATCH] [ELF][gcc compatibility]: support section names with special characters (e.g. "/") Adding support for section names with special characters in them (e.g. "/"). GCC successfully compiles such section names. This also fixes PR24520. Differential Revision: http://reviews.llvm.org/D15678 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@264038 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCParser/ELFAsmParser.cpp | 17 +++++++++-------- test/MC/ELF/section.s | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/MC/MCParser/ELFAsmParser.cpp b/lib/MC/MCParser/ELFAsmParser.cpp index 6cbcdec5e27..1e02f05abc4 100644 --- a/lib/MC/MCParser/ELFAsmParser.cpp +++ b/lib/MC/MCParser/ELFAsmParser.cpp @@ -229,22 +229,23 @@ bool ELFAsmParser::ParseSectionName(StringRef &SectionName) { } for (;;) { - unsigned CurSize; - + SMLoc PrevLoc = getLexer().getLoc(); - if (getLexer().is(AsmToken::Minus)) { - CurSize = 1; - Lex(); // Consume the "-". - } else if (getLexer().is(AsmToken::String)) { + if (getLexer().is(AsmToken::Comma) || + getLexer().is(AsmToken::EndOfStatement)) + break; + + unsigned CurSize; + if (getLexer().is(AsmToken::String)) { CurSize = getTok().getIdentifier().size() + 2; Lex(); } else if (getLexer().is(AsmToken::Identifier)) { CurSize = getTok().getIdentifier().size(); Lex(); } else { - break; + CurSize = getTok().getString().size(); + Lex(); } - Size += CurSize; SectionName = StringRef(FirstLoc.getPointer(), Size); diff --git a/test/MC/ELF/section.s b/test/MC/ELF/section.s index 008c4605552..0277be52236 100644 --- a/test/MC/ELF/section.s +++ b/test/MC/ELF/section.s @@ -6,11 +6,15 @@ .section .note.GNU-stack2,"",%progbits .section .note.GNU-,"",@progbits .section -.note.GNU,"","progbits" +.section src/stack.c,"",@progbits +.section ~!@$%^&*()_-+={[}]|\\:<>,"",@progbits // CHECK: Name: .note.GNU-stack // CHECK: Name: .note.GNU-stack2 // CHECK: Name: .note.GNU- // CHECK: Name: -.note.GNU +// CHECK: Name: src/stack.c +// CHECK: Name: ~!@$%^&*()_-+={[}]|\\:<> // Test that the defaults are used