This is an archive of the discontinued LLVM Phabricator instance.

Differential D68053

[OpenMP] Don't assume Type from `readelf -d` has parentheses
ClosedPublic

Authored by jbeich on Sep 25 2019, 2:40 PM.

Details

Reviewers
jdoerfert
AndreyChurbanov
Group Reviewers
Restricted Project
Commits
rOMP374038: Don't assume Type from `readelf -d` has parentheses
rGca2973bb2024: Don't assume Type from `readelf -d` has parentheses
rL374038: Don't assume Type from `readelf -d` has parentheses
Summary

FreeBSD uses readelf from ELFToolChain which has slightly different output.
See https://sourceforge.net/p/elftoolchain/tickets/544/

$ mv /usr/local/bin/readelf{,.orig}
$ cmake .
$ make libomp-micro-tests
[...]
check-depends.pl: (x) Fail to parse readelf output:
check-depends.pl: (x)
check-depends.pl: (x)     Dynamic section at offset 0xad3f0 contains 30 entries:
check-depends.pl: (x)       Tag                Type                  Name/Value
check-depends.pl: (x) >>>  0x0000000000000001 NEEDED               Shared library: [libm.so.5]
check-depends.pl: (x)      0x0000000000000001 NEEDED               Shared library: [libthr.so.3]
check-depends.pl: (x)      0x0000000000000001 NEEDED               Shared library: [libc.so.7]
check-depends.pl: (x)      0x000000000000000e SONAME               Library soname: [libomp.so]
check-depends.pl: (x)      0x0000000000000007 RELA                 0x115e8
check-depends.pl: (x)      0x0000000000000008 RELASZ               45048 (bytes)
check-depends.pl: (x)      0x0000000000000009 RELAENT              24 (bytes)
check-depends.pl: (x)      0x000000006ffffff9 RELACOUNT            1841
check-depends.pl: (x)      0x0000000000000017 JMPREL               0x1c5e0
check-depends.pl: (x)      0x0000000000000002 PLTRELSZ             4320 (bytes)
check-depends.pl: (x)      0x0000000000000003 PLTGOT               0xb3810
check-depends.pl: (x)      0x0000000000000014 PLTREL               RELA
check-depends.pl: (x)      0x0000000000000006 SYMTAB               0x270
check-depends.pl: (x)      0x000000000000000b SYMENT               24 (bytes)
check-depends.pl: (x)      0x0000000000000005 STRTAB               0xb2d4
check-depends.pl: (x)      0x000000000000000a STRSZ                25357 (bytes)
check-depends.pl: (x)      0x000000006ffffef5 GNU_HASH             0x74c0
check-depends.pl: (x)      0x0000000000000004 HASH                 0x903c
check-depends.pl: (x)      0x0000000000000019 INIT_ARRAY
check-depends.pl: (x)      0x000000000000001b INIT_ARRAYSZ         16 (bytes)
check-depends.pl: (x)      0x000000000000001a FINI_ARRAY
check-depends.pl: (x)      0x000000000000001c FINI_ARRAYSZ         8 (bytes)
check-depends.pl: (x)      0x000000000000000c INIT                 0xabb1c
check-depends.pl: (x)      0x000000000000000d FINI                 0x5f420
check-depends.pl: (x)      0x000000006ffffff0 VERSYM               0x6a20
check-depends.pl: (x)      0x000000006ffffffc VERDEF               0x72c4
check-depends.pl: (x)      0x000000006ffffffd VERDEFNUM            13
check-depends.pl: (x)      0x000000006ffffffe VERNEED              0x7430
check-depends.pl: (x)      0x000000006fffffff VERNEEDNUM           3
check-depends.pl: (x)      0x0000000000000000 NULL                 0x0
check-depends.pl: (x) (eof)

Diff Detail

Event Timeline

jbeich created this revision.Sep 25 2019, 2:40 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptSep 25 2019, 2:40 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: openmp-commits, guansong, krytarowski. · View Herald Transcript
jbeich edited the summary of this revision. (Show Details)Sep 25 2019, 2:41 PM
Harbormaster completed remote builds in B38558: Diff 221838.Sep 25 2019, 2:41 PM
AndreyChurbanov accepted this revision.Sep 27 2019, 6:59 AM
AndreyChurbanov added a subscriber: AndreyChurbanov.

LGTM

This revision is now accepted and ready to land.Sep 27 2019, 6:59 AM
jbeich mentioned this in D68051: [OpenMP] Don't link libm with -Wl,--as-needed on FreeBSD.Oct 8 2019, 12:21 AM
Closed by commit rGca2973bb2024: Don't assume Type from `readelf -d` has parentheses (authored by AndreyChurbanov). · Explain WhyOct 8 2019, 5:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
openmp/
runtime/
tools/
2 lines

Diff 221838

openmp/runtime/tools/check-depends.pl

Show First 20 Lines • Show All 125 Lines • ▼ Show 20 Lines ( $i < @bulk and $bulk[ $i ] =~ m{^Dynamic (?:segment|section) at offset 0x[0-9a-f]+ contains \d+ entries:\s*$} )
or parse_error( $tool, @bulk, $i ); or parse_error( $tool, @bulk, $i );
++ $i; ++ $i;
( $i < @bulk and $bulk[ $i ] =~ m{^\s*Tag\s+Type\s+Name/Value\s*$} ) ( $i < @bulk and $bulk[ $i ] =~ m{^\s*Tag\s+Type\s+Name/Value\s*$} )
or parse_error( $tool, @bulk, $i ); or parse_error( $tool, @bulk, $i );
++ $i; ++ $i;
# Parse body. # Parse body.
while ( $i < @bulk ) { while ( $i < @bulk ) {
my $line = $bulk[ $i ]; my $line = $bulk[ $i ];
if ( $line !~ m{^\s*0x[0-9a-f]+\s+\(([_A-Z0-9]+)\)\s+(.*)\s*$}i ) { if ( $line !~ m{^\s*0x[0-9a-f]+\s+\(?([_A-Z0-9]+)\)?\s+(.*)\s*$}i ) {
parse_error( $tool, @bulk, $i ); parse_error( $tool, @bulk, $i );
}; # if }; # if
my ( $type, $value ) = ( $1, $2 ); my ( $type, $value ) = ( $1, $2 );
if ( $type eq "NEEDED" ) { if ( $type eq "NEEDED" ) {
if ( $value !~ m{\AShared library: \[(.*)\]\z} ) { if ( $value !~ m{\AShared library: \[(.*)\]\z} ) {
parse_error( $tool, @bulk, $i ); parse_error( $tool, @bulk, $i );
}; # if }; # if
my $dep = $1; my $dep = $1;
▲ Show 20 Lines • Show All 363 Lines • Show Last 20 Lines