From 6ba6e554c7bb796215d6565d887f504b7aae15d6 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 6 Apr 2015 16:34:41 +0000 Subject: [PATCH] Use a comma after the unique keyword. H.J. Lu noted that all .section options are separated by a comma. This patch changes the syntax of unique to require one. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234174 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/Extensions.rst | 4 ++-- lib/MC/MCParser/ELFAsmParser.cpp | 3 +++ lib/MC/MCSectionELF.cpp | 2 +- test/MC/ELF/section-unique-err1.s | 2 +- test/MC/ELF/section-unique-err2.s | 2 +- test/MC/ELF/section-unique-err3.s | 2 +- test/MC/ELF/section-unique-err4.s | 5 +++++ test/MC/ELF/section-unique.s | 8 ++++---- 8 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 test/MC/ELF/section-unique-err4.s diff --git a/docs/Extensions.rst b/docs/Extensions.rst index 12eac5e0ed8..c8ff07c2b0c 100644 --- a/docs/Extensions.rst +++ b/docs/Extensions.rst @@ -178,10 +178,10 @@ For example, the following code creates two sections named ``.text``. .. code-block:: gas - .section .text,"ax",@progbits,unique 1 + .section .text,"ax",@progbits,unique,1 nop - .section .text,"ax",@progbits,unique 2 + .section .text,"ax",@progbits,unique,2 nop diff --git a/lib/MC/MCParser/ELFAsmParser.cpp b/lib/MC/MCParser/ELFAsmParser.cpp index 4cb3dfe9308..a19339da3ed 100644 --- a/lib/MC/MCParser/ELFAsmParser.cpp +++ b/lib/MC/MCParser/ELFAsmParser.cpp @@ -470,6 +470,9 @@ bool ELFAsmParser::ParseSectionArguments(bool IsPush, SMLoc loc) { return TokError("expected identifier in directive"); if (UniqueStr != "unique") return TokError("expected 'unique'"); + if (getLexer().isNot(AsmToken::Comma)) + return TokError("expected commma"); + Lex(); if (getParser().parseAbsoluteExpression(UniqueID)) return true; if (UniqueID < 0) diff --git a/lib/MC/MCSectionELF.cpp b/lib/MC/MCSectionELF.cpp index 2b9b8c63007..3cd84538425 100644 --- a/lib/MC/MCSectionELF.cpp +++ b/lib/MC/MCSectionELF.cpp @@ -149,7 +149,7 @@ void MCSectionELF::PrintSwitchToSection(const MCAsmInfo &MAI, } if (isUnique()) - OS << ",unique " << UniqueID; + OS << ",unique," << UniqueID; OS << '\n'; diff --git a/test/MC/ELF/section-unique-err1.s b/test/MC/ELF/section-unique-err1.s index 0b4985ba1d6..3a997d17766 100644 --- a/test/MC/ELF/section-unique-err1.s +++ b/test/MC/ELF/section-unique-err1.s @@ -2,4 +2,4 @@ // CHECK: error: expected absolute expression - .section .text,"ax",@progbits,unique "abc" + .section .text,"ax",@progbits,unique, "abc" diff --git a/test/MC/ELF/section-unique-err2.s b/test/MC/ELF/section-unique-err2.s index b2ac4f8aecf..7b7cd5f79d9 100644 --- a/test/MC/ELF/section-unique-err2.s +++ b/test/MC/ELF/section-unique-err2.s @@ -2,4 +2,4 @@ // CHECK: error: unique id must be positive - .section .text,"ax",@progbits,unique -1 + .section .text,"ax",@progbits,unique, -1 diff --git a/test/MC/ELF/section-unique-err3.s b/test/MC/ELF/section-unique-err3.s index 67e962bfac7..bbccd24b4af 100644 --- a/test/MC/ELF/section-unique-err3.s +++ b/test/MC/ELF/section-unique-err3.s @@ -2,4 +2,4 @@ // CHECK: error: unique id is too large - .section .text,"ax",@progbits,unique 4294967295 + .section .text,"ax",@progbits,unique, 4294967295 diff --git a/test/MC/ELF/section-unique-err4.s b/test/MC/ELF/section-unique-err4.s new file mode 100644 index 00000000000..3c82682e15a --- /dev/null +++ b/test/MC/ELF/section-unique-err4.s @@ -0,0 +1,5 @@ +// RUN: not llvm-mc -triple x86_64-pc-linux-gnu %s -o - 2>&1 | FileCheck %s + +// CHECK: error: expected commma + + .section .text,"ax",@progbits,unique 1 diff --git a/test/MC/ELF/section-unique.s b/test/MC/ELF/section-unique.s index ffd11d944c5..3fe727127af 100644 --- a/test/MC/ELF/section-unique.s +++ b/test/MC/ELF/section-unique.s @@ -1,22 +1,22 @@ // RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -o - | FileCheck %s // RUN: llvm-mc -triple x86_64-pc-linux-gnu %s -filetype=obj -o - | llvm-readobj -t | FileCheck %s --check-prefix=OBJ - .section .text,"ax",@progbits,unique 4294967293 + .section .text,"ax",@progbits,unique, 4294967293 .globl f f: nop - .section .text,"ax",@progbits,unique 4294967294 + .section .text,"ax",@progbits,unique, 4294967294 .globl g g: nop // test that f and g are in different sections. -// CHECK: .section .text,"ax",@progbits,unique 4294967293 +// CHECK: .section .text,"ax",@progbits,unique,4294967293 // CHECK: f: -// CHECK: .section .text,"ax",@progbits,unique 4294967294 +// CHECK: .section .text,"ax",@progbits,unique,4294967294 // CHECK: g: // OBJ: Symbol {