[PATCH] D23142: Make filler expression compatible with gold.

[Rui Ueyama via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL277680: Make filler expression compatible with gold. (authored by ruiu).

Changed prior to commit:
  https://reviews.llvm.org/D23142?vs=66726&id=66736#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23142

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

Index: lld/trunk/test/ELF/linkerscript/linkerscript-sections-padding.s
===================================================================
--- lld/trunk/test/ELF/linkerscript/linkerscript-sections-padding.s
+++ lld/trunk/test/ELF/linkerscript/linkerscript-sections-padding.s
@@ -20,10 +20,10 @@
 # NO: 00000120  66 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 ## Decimal value.
-# RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =99 }" > %t.script
+# RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =777 }" > %t.script
 # 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
+# DEC: 00000120  66 00 03 09 00 00 03 09 00 00 03 09 00 00 03 09
 
 ## Invalid hex value:
 # RUN: echo "SECTIONS { .mysec : { *(.mysec*) } =0x99XX }" > %t.script
Index: lld/trunk/ELF/LinkerScript.cpp
===================================================================
--- lld/trunk/ELF/LinkerScript.cpp
+++ lld/trunk/ELF/LinkerScript.cpp
@@ -843,18 +843,19 @@
   if (!Tok.startswith("="))
     return {};
   next();
+
+  // Read a hexstring of arbitrary length.
   if (Tok.startswith("=0x"))
     return parseHex(Tok.substr(3));
 
-  // This must be a decimal.
-  unsigned int Value;
-  if (Tok.substr(1).getAsInteger(10, Value)) {
-    setError("filler should be a decimal/hexadecimal value");
+  // Read a decimal or octal value as a big-endian 32 bit value.
+  // Why do this? I don't know, but that's what gold does.
+  uint32_t V;
+  if (Tok.substr(1).getAsInteger(0, V)) {
+    setError("invalid filler expression: " + Tok);
     return {};
   }
-  if (Value > 255)
-    setError("only single bytes decimal are supported for the filler now");
-  return {static_cast<unsigned char>(Value)};
+  return { uint8_t(V >> 24), uint8_t(V >> 16), uint8_t(V >> 8), uint8_t(V) };
 }
 
 void ScriptParser::readProvide(bool Hidden) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23142.66736.patch
Type: text/x-patch
Size: 1919 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160803/2507fb5c/attachment.bin>