maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

Fixes https://bugs.llvm.org/show_bug.cgi?id=44450

https://sourceware.org/binutils/docs/ld/Input-Section-Basics.html#Input-Section-Basics
The following two rules are not implemented.

* `archive:` matches every file in the archive.
* `:file` matches a file not in an archive.

Reviewed By: grimar, ruiu

Differential Revision: https://reviews.llvm.org/D75100
This commit is contained in:
Fangrui Song 2020-02-24 21:52:47 -08:00
parent e6d0bad843
commit 93331a17e8
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/LinkerScript.cpp
View File

@ -323,7 +323,7 @@ static std::string getFilename(InputFile *file) {
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) {

32
lld/test/ELF/linkerscript/input-archive.s Normal file
View File

@ -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",@progbits
.byte 3