* Merge in cygwin-64bit-branch.
This commit is contained in:
@@ -11,16 +11,17 @@ my $static;
|
||||
my $inverse;
|
||||
my @exclude;
|
||||
|
||||
my ($ar, $as, $nm, $objcopy);
|
||||
my ($cpu, $ar, $as, $nm, $objcopy);
|
||||
GetOptions('exclude=s'=>\@exclude, 'static!'=>\$static, 'v!'=>\$inverse,
|
||||
'ar=s'=>\$ar, 'as=s'=>\$as,'nm=s'=>\$nm, 'objcopy=s'=>\$objcopy);
|
||||
'cpu=s'=>\$cpu, 'ar=s'=>\$ar, 'as=s'=>\$as,'nm=s'=>\$nm, 'objcopy=s'=>\$objcopy);
|
||||
|
||||
$_ = File::Spec->rel2abs($_) for @ARGV;
|
||||
|
||||
my $libdll = shift;
|
||||
my $lib = pop;
|
||||
my $uscore = ($cpu eq 'x86_64' ? undef : '_');
|
||||
(my $iname = basename $lib) =~ s/\.a$//o;
|
||||
$iname = '_' . $iname . '_dll_iname';
|
||||
$iname = $uscore . $iname . '_dll_iname';
|
||||
|
||||
open my $nm_fd, '-|', $nm, '-Apg', '--defined-only', @ARGV, $libdll or
|
||||
die "$0: execution of $nm for object files failed - $!\n";
|
||||
@@ -34,7 +35,7 @@ $exclude_regex = qr/$exclude_regex/;
|
||||
my $dllname;
|
||||
while (<$nm_fd>) {
|
||||
study;
|
||||
if (/ I _(.*)_dll_iname/o) {
|
||||
if (/ I _?(.*)_dll_iname/o) {
|
||||
$dllname = $1;
|
||||
} else {
|
||||
my ($file, $member, $symbol) = m%^([^:]*):([^:]*(?=:))?.* T (.*)%o;
|
||||
|
Reference in New Issue
Block a user