[PATCH] D75100: [ELF] Support archive:file syntax in input section descriptions

[Fangrui Song via Phabricator via llvm-commits]

MaskRay updated this revision to Diff 246465.
MaskRay added a comment.

Add a comment.

Unsupport Windows (backslashes in a path)


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D75100/new/

https://reviews.llvm.org/D75100

Files:
  lld/ELF/LinkerScript.cpp
  lld/test/ELF/linkerscript/input-archive.s


Index: lld/test/ELF/linkerscript/input-archive.s
===================================================================
--- /dev/null
+++ lld/test/ELF/linkerscript/input-archive.s
@@ -0,0 +1,32 @@
+# REQUIRES: x86
+# UNSUPPORTED: system-windows
+## Test that archive:file is supported in an input section description.
+
+# RUN: mkdir -p %t.dir
+# RUN: echo '.data; .byte 1' | llvm-mc -filetype=obj -triple=x86_64 - -o %t.dir/a.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.dir/b.o
+# RUN: rm -f %t.a
+# RUN: llvm-ar rc %t.a %t.dir/a.o %t.dir/b.o
+
+## *.a:b.o matches /path/to/input-archive.s.tmp.a:b.o
+## *b.o matches /path/to/input-archive.s.tmp.a:b.o
+# RUN: echo 'SECTIONS { \
+# RUN:   .foo : { %t.a:a.o(.data) } \
+# RUN:   .bar : { *.a:b.o(.data) } \
+# RUN:   .qux : { *b.o(.data1) } \
+# RUN:   }' > %t.script
+# RUN: ld.lld -T %t.script --whole-archive %t.a -o %t
+# RUN: llvm-readelf -x .foo -x .bar -x .qux %t | FileCheck %s
+
+# CHECK:      Hex dump of section '.foo':
+# CHECK-NEXT: 0x00000000 01
+# CHECK:      Hex dump of section '.bar':
+# CHECK-NEXT: 0x00000001 02
+# CHECK:      Hex dump of section '.qux':
+# CHECK-NEXT: 0x00000002 03
+
+.data
+.byte 2
+
+.section .data1,"aw", at progbits
+.byte 3
Index: lld/ELF/LinkerScript.cpp
===================================================================
--- lld/ELF/LinkerScript.cpp
+++ lld/ELF/LinkerScript.cpp
@@ -323,7 +323,7 @@
     return "";
   if (file->archiveName.empty())
     return std::string(file->getName());
-  return (file->archiveName + "(" + file->getName() + ")").str();
+  return (file->archiveName + ':' + file->getName()).str();
 }
 
 bool LinkerScript::shouldKeep(InputSectionBase *s) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75100.246465.patch
Type: text/x-patch
Size: 1681 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200225/d257334e/attachment.bin>