This is an archive of the discontinued LLVM Phabricator instance.

Differential D56911

[LLD][ELF]Fix tests for D56910
ClosedPublic

Authored by jhenderson on Jan 18 2019, 7:51 AM.

Details

Reviewers
ruiu
grimar
rupprecht
jakehehrlich
• espindola
Commits
rGb88d6fd7b8c0: [LLD][ELF]Fix tests for D56910
rLLD351790: [LLD][ELF]Fix tests for D56910
rL351790: [LLD][ELF]Fix tests for D56910
Summary

D56910 changes the output of llvm-readelf --dyn-symbols. This causes 3 LLD tests to break. This patch fixes them.

Diff Detail

Repository
rL LLVM

Event Timeline

jhenderson created this revision.Jan 18 2019, 7:51 AM
Herald added a reviewer: • espindola. · View Herald TranscriptJan 18 2019, 7:51 AM
Herald added subscribers: arichardson, emaste. · View Herald Transcript
ruiu accepted this revision.Jan 18 2019, 9:36 AM

LGTM

This revision is now accepted and ready to land.Jan 18 2019, 9:36 AM
Closed by commit rL351790: [LLD][ELF]Fix tests for D56910 (authored by jhenderson). · Explain WhyJan 22 2019, 1:35 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
test/
ELF/
7 lines
2 lines
linkerscript/
2 lines

Diff 182859

lld/trunk/test/ELF/as-needed-weak.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: echo '.globl foo; .type foo, @function; foo:' | \ # RUN: echo '.globl foo; .type foo, @function; foo:' | \
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t1.o # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t1.o
# RUN: ld.lld -shared -o %t1.so -soname libfoo %t1.o # RUN: ld.lld -shared -o %t1.so -soname libfoo %t1.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
# RUN: ld.lld -o %t.exe %t2.o --as-needed %t1.so # RUN: ld.lld -o %t.exe %t2.o --as-needed %t1.so
# RUN: llvm-readelf -dynamic-table -dyn-symbols %t.exe | FileCheck %s # RUN: llvm-readelf -dynamic-table -dyn-symbols %t.exe | FileCheck %s
# CHECK-NOT: libfoo # CHECK-NOT: libfoo
# CHECK: Symbol table of .hash for image: # CHECK: Symbol table '.dynsym' contains 2 entries:
# CHECK-NEXT: Num Buc: Value Size Type Bind Vis Ndx Name # CHECK-NEXT: Num: Value Size Type Bind Vis Ndx Name
# CHECK-NEXT: 1 1: 0000000000000000 0 FUNC WEAK DEFAULT UND foo # CHECK-NEXT: 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND
# CHECK-NEXT: 1: 0000000000000000 0 FUNC WEAK DEFAULT UND foo
.globl _start .globl _start
.weak foo .weak foo
_start: _start:
mov $foo, %eax mov $foo, %eax
callq foo callq foo

lld/trunk/test/ELF/icf-symbol-type.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
# RUN: ld.lld --hash-style=sysv %t.o -o %t --icf=all -shared # RUN: ld.lld --hash-style=sysv %t.o -o %t --icf=all -shared
# RUN: llvm-readelf --dyn-symbols --sections %t | FileCheck %s # RUN: llvm-readelf --dyn-symbols --sections %t | FileCheck %s
# We used to mark bar as absolute. # We used to mark bar as absolute.
# CHECK: .text PROGBITS 0000000000001000 # CHECK: .text PROGBITS 0000000000001000
# CHECK: 0000000000001001 0 NOTYPE GLOBAL DEFAULT 4 foo
# CHECK: 0000000000001001 0 NOTYPE GLOBAL DEFAULT 4 bar # CHECK: 0000000000001001 0 NOTYPE GLOBAL DEFAULT 4 bar
# CHECK: 0000000000001001 0 NOTYPE GLOBAL DEFAULT 4 foo
# The nop makes the test more interesting by making the offset of # The nop makes the test more interesting by making the offset of
# text.f non zero. # text.f non zero.
nop nop
.section .text.f,"ax",@progbits .section .text.f,"ax",@progbits
.globl foo .globl foo
foo: foo:
retq retq
.section .text.g,"ax",@progbits .section .text.g,"ax",@progbits
.globl bar .globl bar
bar: bar:
retq retq

lld/trunk/test/ELF/linkerscript/provide-shared2.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/provide-shared2.s -o %t2.o # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/provide-shared2.s -o %t2.o
# RUN: ld.lld %t2.o -o %t2.so -shared # RUN: ld.lld %t2.o -o %t2.so -shared
# RUN: echo "SECTIONS { . = . + SIZEOF_HEADERS; PROVIDE(foo = 42); }" > %t.script # RUN: echo "SECTIONS { . = . + SIZEOF_HEADERS; PROVIDE(foo = 42); }" > %t.script
# RUN: ld.lld -o %t --script %t.script %t.o %t2.so # RUN: ld.lld -o %t --script %t.script %t.o %t2.so
# RUN: llvm-readelf --dyn-symbols %t | FileCheck %s # RUN: llvm-readelf --dyn-symbols %t | FileCheck %s
# CHECK: 1 1: 000000000000002a 0 NOTYPE GLOBAL DEFAULT ABS foo # CHECK: 1: 000000000000002a 0 NOTYPE GLOBAL DEFAULT ABS foo
.global _start .global _start
_start: _start:
nop nop