[ELF] - Implemented linkerscript ALIGN command
authorGeorge Rimar <grimar@accesssoftek.com>
Fri, 22 Apr 2016 11:40:53 +0000 (11:40 +0000)
committerGeorge Rimar <grimar@accesssoftek.com>
Fri, 22 Apr 2016 11:40:53 +0000 (11:40 +0000)
ALIGN(exp)
Return the location counter (.) aligned to the next exp boundary. (https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/4/html/Using_ld_the_GNU_Linker/expressions.html)

Patch implements this command.
This fixes PR27406.

Differential revision: http://reviews.llvm.org/D19364

llvm-svn: 267145

lld/ELF/LinkerScript.cpp
lld/test/ELF/linkerscript-align.s [new file with mode: 0644]

index 77ba023..1cfe358 100644 (file)
@@ -94,6 +94,14 @@ uint64_t LinkerScript<ELFT>::parsePrimary(ArrayRef<StringRef> &Tokens) {
       return 0;
     return V;
   }
+  if (Tok == "ALIGN") {
+    if (!expect(Tokens, "("))
+      return 0;
+    uint64_t V = parseExpr(Tokens);
+    if (!expect(Tokens, ")"))
+      return 0;
+    return alignTo(Dot, V);
+  }
   return getInteger(Tok);
 }
 
diff --git a/lld/test/ELF/linkerscript-align.s b/lld/test/ELF/linkerscript-align.s
new file mode 100644 (file)
index 0000000..5f6e6f7
--- /dev/null
@@ -0,0 +1,41 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+
+# RUN: echo "SECTIONS { \
+# RUN:  . = 0x10000; \
+# RUN:  .aaa : \
+# RUN:  { \
+# RUN:   *(.aaa) \
+# RUN:  } \
+# RUN:  . = ALIGN(4096); \
+# RUN:  .bbb : \
+# RUN:  { \
+# RUN:   *(.bbb) \
+# RUN:  } \
+# RUN:  . = ALIGN(4096 * 4); \
+# RUN:  .ccc : \
+# RUN:  { \
+# RUN:   *(.ccc) \
+# RUN:  } \
+# RUN: }" > %t.script
+# RUN: ld.lld -o %t1 --script %t.script %t
+# RUN: llvm-objdump -section-headers %t1 | FileCheck %s
+# CHECK:      Sections:
+# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT:   0               00000000 0000000000000000
+# CHECK-NEXT:   1 .aaa          00000008 0000000000010000 DATA
+# CHECK-NEXT:   2 .bbb          00000008 0000000000011000 DATA
+# CHECK-NEXT:   3 .ccc          00000008 0000000000014000 DATA
+
+.global _start
+_start:
+ nop
+
+.section .aaa, "a"
+.quad 0
+
+.section .bbb, "a"
+.quad 0
+
+.section .ccc, "a"
+.quad 0