[PATCH] D22977: [LinkerScript] Support decimal values for filler

[Davide Italiano via llvm-commits]

davide updated this revision to Diff 66183.
davide added a comment.

Correct patch (missed one of your comments).


https://reviews.llvm.org/D22977

Files:
  ELF/LinkerScript.cpp
  test/ELF/linkerscript/linkerscript-sections-padding.s

Index: test/ELF/linkerscript/linkerscript-sections-padding.s
===================================================================
--- test/ELF/linkerscript/linkerscript-sections-padding.s
+++ test/ELF/linkerscript/linkerscript-sections-padding.s
@@ -19,13 +19,13 @@
 # RUN: hexdump -C %t.out | FileCheck -check-prefix=NO %s
 # NO: 00000120  66 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
-## Filler should be a hex value (1):
+## Decimal value.
 # RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =99 }" > %t.script
-# RUN: not ld.lld -o %t.out --script %t.script %t 2>&1 \
-# RUN:   | FileCheck --check-prefix=ERR %s
-# ERR: filler should be a hexadecimal value
+# RUN: ld.lld -o %t.out --script %t.script %t
+# RUN: hexdump -C %t.out | FileCheck -check-prefix=DEC %s
+# DEC: 00000120  66 63 63 63 63 63 63 63  63 63 63 63 63 63 63 63 
 
-## Filler should be a hex value (2):
+## Invalid hex value:
 # RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =0x99XX }" > %t.script
 # RUN: not ld.lld -o %t.out --script %t.script %t 2>&1 \
 # RUN:   | FileCheck --check-prefix=ERR2 %s
Index: ELF/LinkerScript.cpp
===================================================================
--- ELF/LinkerScript.cpp
+++ ELF/LinkerScript.cpp
@@ -799,13 +799,21 @@
   StringRef Tok = peek();
   if (!Tok.startswith("="))
     return {};
-  if (!Tok.startswith("=0x")) {
-    setError("filler should be a hexadecimal value");
+  if (Tok.startswith("=0x")) {
+    next();
+    return parseHex(Tok.substr(3));
+  }
+  // This must be a decimal.
+  Tok = Tok.substr(1);
+  unsigned char Value;
+  if (Tok.getAsInteger(10, Value)) {
+    setError("filler should be a decimal/hexadecimal value");
     return {};
   }
-  Tok = Tok.substr(3);
+  if (Value > 255)
+    setError("only single bytes decimal are supported for the filler now");
   next();
-  return parseHex(Tok);
+  return {Value};
 }
 
 void ScriptParser::readProvide(bool Hidden) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D22977.66183.patch
Type: text/x-patch
Size: 1917 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160729/9f2439c4/attachment.bin>