okay, now the parser module is totally part of Mode/Link.pm, no reason

for a separate file

3 files changed, 298 insertions, 322 deletions

diff --git a/usr.bin/libtool/LT/Mode/Link.pm b/usr.bin/libtool/LT/Mode/Link.pm
index 8d9b6f73be0..6ce80dc155b 100644
--- a/usr.bin/libtool/LT/Mode/Link.pm
+++ b/usr.bin/libtool/LT/Mode/Link.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Link.pm,v 1.16 2012/07/12 12:35:21 espie Exp $
+# $OpenBSD: Link.pm,v 1.17 2012/07/12 17:07:12 espie Exp $
 #
 # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
 # Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -92,7 +92,6 @@ package LT::Mode::Link;
 our @ISA = qw(LT::Mode);
 
 use LT::Util;
-use LT::Parser;
 use LT::Trace;
 use File::Basename;
 
@@ -442,6 +441,302 @@ sub process_deplibs
 	return $result;
 }
 
+package LT::Parser;
+use File::Basename;
+use Cwd qw(abs_path);
+use LT::Util;
+use LT::Library;
+use LT::Trace;
+
+my $calls = 0;
+
+sub build_cache
+{
+	my ($self, $lainfo, $level) = @_;
+	my $o = $lainfo->{cached} = {
+	    deplibs => [], libdirs => [], result => []};
+	$self->internal_resolve_la($o, $lainfo->deplib_list, 
+	    $level+1);
+	push(@{$o->{deplibs}}, @{$lainfo->deplib_list});
+	if ($lainfo->{libdir} ne '') {
+		push(@{$o->{libdirs}}, $lainfo->{libdir});
+	}
+	for my $e (qw(deplibs libdirs result)) {
+		if (@{$o->{$e}} > 50) {
+			$o->{$e} = reverse_zap_duplicates_ref($o->{$e});
+		}
+	}
+}
+
+sub internal_resolve_la
+{
+	my ($self, $o, $args, $level) = @_;
+	$level //= 0;
+	tsay {"resolve level: $level"};
+	$o->{pthread} = 0;
+	foreach my $_ (@$args) {
+		if ($_ eq '-pthread') {
+			$o->{pthread}++;
+			next;
+		}
+		push(@{$o->{result}}, $_);
+		next unless m/\.la$/;
+		require LT::LaFile;
+		my $lainfo = LT::LaFile->parse($_);
+		if  (!exists $lainfo->{cached}) {
+			$self->build_cache($lainfo, $level+1);
+		}
+		$o->{pthread} += $lainfo->{cached}{pthread};
+		for my $e (qw(deplibs libdirs result)) {
+			push(@{$o->{$e}}, @{$lainfo->{cached}{$e}});
+		}
+	}
+	$calls++;
+}
+
+END
+{
+	LT::Trace::print { "Calls to resolve_la: $calls\n" } if $calls;
+}
+
+# resolve .la files until a level with empty dependency_libs is reached.
+sub resolve_la
+{
+	my ($self, $deplibs, $libdirs) = @_;
+
+	tsay {"argvstring (pre resolve_la): @{$self->{args}}"};
+	my $o = { result => [], deplibs => $deplibs, libdirs => $libdirs};
+
+	$self->internal_resolve_la($o, $self->{args});
+	if ($o->{pthread}) {
+		unshift(@{$o->{result}}, '-pthread');
+		unshift(@{$o->{deplibs}}, '-pthread');
+	}
+
+	tsay {"argvstring (post resolve_la): @{$self->{args}}"};
+	$self->{args} = $o->{result};
+}
+
+# parse link flags and arguments
+# eliminate all -L and -l flags in the argument string and add the
+# corresponding directories and library names to the dirs/libs hashes.
+# fill deplibs, to be taken up as dependencies in the resulting .la file...
+# set up a hash for library files which haven't been found yet.
+# deplibs are formed by collecting the original -L/-l flags, plus
+# any .la files passed on the command line, EXCEPT when the .la file
+# does not point to a shared library.
+# pass 1
+# -Lfoo, -lfoo, foo.a, foo.la
+# recursively find .la files corresponding to -l flags; if there is no .la
+# file, just inspect the library file itself for any dependencies.
+sub internal_parse_linkargs1
+{
+	my ($self, $deplibs, $gp, $dirs, $libs, $args, $level) = @_;
+
+	$level //= 0;
+	tsay {"parse_linkargs1, level: $level"};
+	tsay {"  args: @$args"};
+	my $result   = $self->{result};
+
+	# first read all directories where we can search libraries
+	foreach my $_ (@$args) {
+		if (m/^-L(.*)/) {
+			if (!exists $dirs->{$1}) {
+				$dirs->{$1} = 1;
+				tsay {"    adding $_ to deplibs"} 
+				    if $level == 0;
+				push @$deplibs, $_;
+			}
+		}
+	}
+	foreach my $_ (@$args) {
+		tsay {"  processing $_"};
+		if (!$_ || $_ eq '' || m/^\s+$/) {
+			# skip empty arguments
+		} elsif ($_ eq '-pthread') {
+			$self->{pthread} = 1;
+		} elsif (m/^-L(.*)/) {
+			# already read earlier, do nothing
+		} elsif (m/^-R(.*)/) {
+			# -R options originating from .la resolution
+			# those from @ARGV are in @Ropts
+			$gp->add_R($1);
+		} elsif (m/^-l(\S+)/) {
+			my @largs = ();
+			my $key = $1;
+			if (!exists $libs->{$key}) {
+				$libs->{$key} = LT::Library->new($key);
+				require LT::LaFile;
+				my $lafile = LT::LaFile->find($key, $dirs);
+				if ($lafile) {
+					$libs->{$key}->{lafile} = $lafile;
+					my $absla = abs_path($lafile);
+					tsay {"    adding $absla to deplibs"} 
+					    if $level == 0;
+					push @$deplibs, $absla;
+					push @$result, $lafile;
+					next;
+				} else {
+					$libs->{$key}->resolve_library($dirs, 1, 0, 'notyet', $gp);
+					my @deps = $libs->{$key}->inspect;
+					foreach my $d (@deps) {
+						my $k = basename($d);
+						$k =~ s/^(\S+)\.so.*$/$1/;
+						$k =~ s/^lib//;
+						push(@largs, "-l$k");
+					}
+				}
+			}
+			tsay {"    adding $_ to deplibs"} if $level == 0;
+			push @$deplibs, $_;
+			push(@$result, $_);
+			my $dummy = []; # no need to add deplibs recursively
+			$self->internal_parse_linkargs1($dummy, $gp, $dirs, 
+			    $libs, \@largs, $level+1) if @largs;
+		} elsif (m/(\S+\/)*(\S+)\.a$/) {
+			(my $key = $2) =~ s/^lib//;
+			if (!exists $libs->{$key}) {
+				$libs->{$key} = LT::Library->new($key);
+			}
+			$dirs->{abs_dir($_)} = 1;
+			$libs->{$key}->{fullpath} = $_;
+			push(@$result, $_);
+		} elsif (m/(\S+\/)*(\S+)\.la$/) {
+			(my $key = $2) =~ s/^lib//;
+			$dirs->{abs_dir($_)} = 1;
+			my $fulla = abs_path($_);
+			require LT::LaFile;
+			my $lainfo = LT::LaFile->parse($fulla);
+			my $dlname = $lainfo->{'dlname'};
+			my $oldlib = $lainfo->{'old_library'};
+			my $libdir = $lainfo->{'libdir'};
+			if ($dlname ne '') {
+				if (!exists $libs->{$key}) {
+					$libs->{$key} = LT::Library->new($key);
+					$libs->{$key}->{lafile} = $fulla;
+				}
+			}
+			push(@$result, $_);
+			push(@$deplibs, $fulla) if $libdir ne '';
+		} elsif (m/(\S+\/)*(\S+)\.so(\.\d+){2}/) {
+			(my $key = $2) =~ s/^lib//;
+			$dirs->{abs_dir($_)} = 1;
+			if (!exists $libs->{$key}) {
+				$libs->{$key} = LT::Library->new($key);
+			}
+			# not really normal argument
+			# -lfoo should be used instead, so convert it
+			push(@$result, "-l$key");
+		} else {
+			push(@$result, $_);
+		}
+	}
+}
+
+sub parse_linkargs1
+{
+	my ($self, $deplibs, $gp, $dirs, $libs, $args) = @_;
+	$self->{result} = [];
+	$self->internal_parse_linkargs1($deplibs, $gp, $dirs, $libs, 
+	    $self->{args});
+    	push(@$deplibs, '-pthread') if $self->{pthread};
+	$self->{args} = $self->{result};
+}
+
+# pass 2
+# -Lfoo, -lfoo, foo.a
+# no recursion in pass 2
+# fill orderedlibs array, which is the sequence of shared libraries
+#   after resolving all .la
+# (this list may contain duplicates)
+# fill staticlibs array, which is the sequence of static and convenience
+#   libraries
+# XXX the variable $parser->{seen_la_shared} will register whether or not
+#     a .la file is found which refers to a shared library and which is not
+#     yet installed
+#     this is used to decide where to link executables and create wrappers
+sub parse_linkargs2
+{
+	my ($self, $gp, $orderedlibs, $staticlibs, $dirs, $libs) = @_;
+	tsay {"parse_linkargs2"};
+	tsay {"  args: @{$self->{args}}"};
+	$self->{result} = [];
+	my $result = $self->{result};
+
+	foreach my $_ (@{$self->{args}}) {
+		tsay {"  processing $_"};
+		if (!$_ || $_ eq '' || m/^\s+$/) {
+			# skip empty arguments
+		} elsif ($_ eq '-lc') {
+			# don't link explicitly with libc (just remove -lc)
+		} elsif ($_ eq '-pthread') {
+			$self->{pthread} = 1;
+		} elsif (m/^-L(.*)/) {
+			if (!exists $dirs->{$1}) {
+				$dirs->{$1} = 1;
+			}
+		} elsif (m/^-R(.*)/) {
+			# -R options originating from .la resolution
+			# those from @ARGV are in @Ropts
+			$gp->add_R($1);
+		} elsif (m/^-l(.*)/) {
+			my @largs = ();
+			my $key = $1;
+			if (!exists $libs->{$key}) {
+				$libs->{$key} = LT::Library->new($key);
+			}
+			push @$orderedlibs, $key;
+		} elsif (m/(\S+\/)*(\S+)\.a$/) {
+			(my $key = $2) =~ s/^lib//;
+			if (!exists $libs->{$key}) {
+				$libs->{$key} = LT::Library->new($key);
+			}
+			$libs->{$key}->{fullpath} = $_;
+			push(@$staticlibs, $_);
+		} elsif (m/(\S+\/)*(\S+)\.la$/) {
+			(my $key = $2) =~ s/^lib//;
+			my $d = abs_dir($_);
+			$dirs->{$d} = 1;
+			my $fulla = abs_path($_);
+			require LT::LaFile;
+			my $lainfo = LT::LaFile->parse($fulla);
+			my $dlname = $lainfo->stringize('dlname');
+			my $oldlib = $lainfo->stringize('old_library');
+			my $installed = $lainfo->stringize('installed');
+			if ($dlname ne '' && $installed eq 'no') {
+				tsay {"seen uninstalled la shared in $_"};
+				$self->{seen_la_shared} = 1;
+			}
+			if ($dlname eq '' && -f "$d/$ltdir/$oldlib") {
+				push @$staticlibs, "$d/$ltdir/$oldlib";
+			} else {
+				if (!exists $libs->{$key}) {
+					$libs->{$key} = LT::Library->new($key);
+					$libs->{$key}->{lafile} = $fulla;
+				}
+				push @$orderedlibs, $key;
+			}
+		} elsif (m/^-Wl,(\S+)$/) {
+			# libtool accepts a list of -Wl options separated
+			# by commas, and possibly with a trailing comma
+			# which is not accepted by the linker
+			my @Wlflags = split(/,/, $1);
+			foreach my $f (@Wlflags) {
+				push(@$result, "-Wl,$f");
+			}
+		} else {
+			push(@$result, $_);
+		}
+	}
+	tsay {"end parse_linkargs2"};
+	return $self->{result};
+}
+
+sub new
+{
+	my ($class, $args) = @_;
+	bless { args => $args, pthread => 0 }, $class;
+}
 
 1;
 
diff --git a/usr.bin/libtool/LT/Parser.pm b/usr.bin/libtool/LT/Parser.pm
deleted file mode 100644
index 865ea13cb3c..00000000000
--- a/usr.bin/libtool/LT/Parser.pm
+++ /dev/null
@@ -1,318 +0,0 @@
-# $OpenBSD: Parser.pm,v 1.11 2012/07/12 13:03:28 espie Exp $
-
-# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
-# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-use strict;
-use warnings;
-use feature qw(say switch state);
-
-package LT::Parser;
-use File::Basename;
-use Cwd qw(abs_path);
-use LT::Util;
-use LT::Library;
-use LT::Trace;
-
-my $calls = 0;
-
-sub build_cache
-{
-	my ($self, $lainfo, $level) = @_;
-	my $o = $lainfo->{cached} = {
-	    deplibs => [], libdirs => [], result => []};
-	$self->internal_resolve_la($o, $lainfo->deplib_list, 
-	    $level+1);
-	push(@{$o->{deplibs}}, @{$lainfo->deplib_list});
-	if ($lainfo->{libdir} ne '') {
-		push(@{$o->{libdirs}}, $lainfo->{libdir});
-	}
-	for my $e (qw(deplibs libdirs result)) {
-		if (@{$o->{$e}} > 50) {
-			$o->{$e} = reverse_zap_duplicates_ref($o->{$e});
-		}
-	}
-}
-
-sub internal_resolve_la
-{
-	my ($self, $o, $args, $level) = @_;
-	$level //= 0;
-	tsay {"resolve level: $level"};
-	$o->{pthread} = 0;
-	foreach my $_ (@$args) {
-		if ($_ eq '-pthread') {
-			$o->{pthread}++;
-			next;
-		}
-		push(@{$o->{result}}, $_);
-		next unless m/\.la$/;
-		require LT::LaFile;
-		my $lainfo = LT::LaFile->parse($_);
-		if  (!exists $lainfo->{cached}) {
-			$self->build_cache($lainfo, $level+1);
-		}
-		$o->{pthread} += $lainfo->{cached}{pthread};
-		for my $e (qw(deplibs libdirs result)) {
-			push(@{$o->{$e}}, @{$lainfo->{cached}{$e}});
-		}
-	}
-	$calls++;
-}
-
-END
-{
-	LT::Trace::print { "Calls to resolve_la: $calls\n" } if $calls;
-}
-
-# resolve .la files until a level with empty dependency_libs is reached.
-sub resolve_la
-{
-	my ($self, $deplibs, $libdirs) = @_;
-
-	tsay {"argvstring (pre resolve_la): @{$self->{args}}"};
-	my $o = { result => [], deplibs => $deplibs, libdirs => $libdirs};
-
-	$self->internal_resolve_la($o, $self->{args});
-	if ($o->{pthread}) {
-		unshift(@{$o->{result}}, '-pthread');
-		unshift(@{$o->{deplibs}}, '-pthread');
-	}
-
-	tsay {"argvstring (post resolve_la): @{$self->{args}}"};
-	$self->{args} = $o->{result};
-}
-
-# parse link flags and arguments
-# eliminate all -L and -l flags in the argument string and add the
-# corresponding directories and library names to the dirs/libs hashes.
-# fill deplibs, to be taken up as dependencies in the resulting .la file...
-# set up a hash for library files which haven't been found yet.
-# deplibs are formed by collecting the original -L/-l flags, plus
-# any .la files passed on the command line, EXCEPT when the .la file
-# does not point to a shared library.
-# pass 1
-# -Lfoo, -lfoo, foo.a, foo.la
-# recursively find .la files corresponding to -l flags; if there is no .la
-# file, just inspect the library file itself for any dependencies.
-sub internal_parse_linkargs1
-{
-	my ($self, $deplibs, $gp, $dirs, $libs, $args, $level) = @_;
-
-	$level //= 0;
-	tsay {"parse_linkargs1, level: $level"};
-	tsay {"  args: @$args"};
-	my $result   = $self->{result};
-
-	# first read all directories where we can search libraries
-	foreach my $_ (@$args) {
-		if (m/^-L(.*)/) {
-			if (!exists $dirs->{$1}) {
-				$dirs->{$1} = 1;
-				tsay {"    adding $_ to deplibs"} 
-				    if $level == 0;
-				push @$deplibs, $_;
-			}
-		}
-	}
-	foreach my $_ (@$args) {
-		tsay {"  processing $_"};
-		if (!$_ || $_ eq '' || m/^\s+$/) {
-			# skip empty arguments
-		} elsif ($_ eq '-pthread') {
-			$self->{pthread} = 1;
-		} elsif (m/^-L(.*)/) {
-			# already read earlier, do nothing
-		} elsif (m/^-R(.*)/) {
-			# -R options originating from .la resolution
-			# those from @ARGV are in @Ropts
-			$gp->add_R($1);
-		} elsif (m/^-l(\S+)/) {
-			my @largs = ();
-			my $key = $1;
-			if (!exists $libs->{$key}) {
-				$libs->{$key} = LT::Library->new($key);
-				require LT::LaFile;
-				my $lafile = LT::LaFile->find($key, $dirs);
-				if ($lafile) {
-					$libs->{$key}->{lafile} = $lafile;
-					my $absla = abs_path($lafile);
-					tsay {"    adding $absla to deplibs"} 
-					    if $level == 0;
-					push @$deplibs, $absla;
-					push @$result, $lafile;
-					next;
-				} else {
-					$libs->{$key}->resolve_library($dirs, 1, 0, 'notyet', $gp);
-					my @deps = $libs->{$key}->inspect;
-					foreach my $d (@deps) {
-						my $k = basename($d);
-						$k =~ s/^(\S+)\.so.*$/$1/;
-						$k =~ s/^lib//;
-						push(@largs, "-l$k");
-					}
-				}
-			}
-			tsay {"    adding $_ to deplibs"} if $level == 0;
-			push @$deplibs, $_;
-			push(@$result, $_);
-			my $dummy = []; # no need to add deplibs recursively
-			$self->internal_parse_linkargs1($dummy, $gp, $dirs, 
-			    $libs, \@largs, $level+1) if @largs;
-		} elsif (m/(\S+\/)*(\S+)\.a$/) {
-			(my $key = $2) =~ s/^lib//;
-			if (!exists $libs->{$key}) {
-				$libs->{$key} = LT::Library->new($key);
-			}
-			$dirs->{abs_dir($_)} = 1;
-			$libs->{$key}->{fullpath} = $_;
-			push(@$result, $_);
-		} elsif (m/(\S+\/)*(\S+)\.la$/) {
-			(my $key = $2) =~ s/^lib//;
-			$dirs->{abs_dir($_)} = 1;
-			my $fulla = abs_path($_);
-			require LT::LaFile;
-			my $lainfo = LT::LaFile->parse($fulla);
-			my $dlname = $lainfo->{'dlname'};
-			my $oldlib = $lainfo->{'old_library'};
-			my $libdir = $lainfo->{'libdir'};
-			if ($dlname ne '') {
-				if (!exists $libs->{$key}) {
-					$libs->{$key} = LT::Library->new($key);
-					$libs->{$key}->{lafile} = $fulla;
-				}
-			}
-			push(@$result, $_);
-			push(@$deplibs, $fulla) if $libdir ne '';
-		} elsif (m/(\S+\/)*(\S+)\.so(\.\d+){2}/) {
-			(my $key = $2) =~ s/^lib//;
-			$dirs->{abs_dir($_)} = 1;
-			if (!exists $libs->{$key}) {
-				$libs->{$key} = LT::Library->new($key);
-			}
-			# not really normal argument
-			# -lfoo should be used instead, so convert it
-			push(@$result, "-l$key");
-		} else {
-			push(@$result, $_);
-		}
-	}
-}
-
-sub parse_linkargs1
-{
-	my ($self, $deplibs, $gp, $dirs, $libs, $args) = @_;
-	$self->{result} = [];
-	$self->internal_parse_linkargs1($deplibs, $gp, $dirs, $libs, 
-	    $self->{args});
-    	push(@$deplibs, '-pthread') if $self->{pthread};
-	$self->{args} = $self->{result};
-}
-
-# pass 2
-# -Lfoo, -lfoo, foo.a
-# no recursion in pass 2
-# fill orderedlibs array, which is the sequence of shared libraries
-#   after resolving all .la
-# (this list may contain duplicates)
-# fill staticlibs array, which is the sequence of static and convenience
-#   libraries
-# XXX the variable $parser->{seen_la_shared} will register whether or not
-#     a .la file is found which refers to a shared library and which is not
-#     yet installed
-#     this is used to decide where to link executables and create wrappers
-sub parse_linkargs2
-{
-	my ($self, $gp, $orderedlibs, $staticlibs, $dirs, $libs) = @_;
-	tsay {"parse_linkargs2"};
-	tsay {"  args: @{$self->{args}}"};
-	$self->{result} = [];
-	my $result = $self->{result};
-
-	foreach my $_ (@{$self->{args}}) {
-		tsay {"  processing $_"};
-		if (!$_ || $_ eq '' || m/^\s+$/) {
-			# skip empty arguments
-		} elsif ($_ eq '-lc') {
-			# don't link explicitly with libc (just remove -lc)
-		} elsif ($_ eq '-pthread') {
-			$self->{pthread} = 1;
-		} elsif (m/^-L(.*)/) {
-			if (!exists $dirs->{$1}) {
-				$dirs->{$1} = 1;
-			}
-		} elsif (m/^-R(.*)/) {
-			# -R options originating from .la resolution
-			# those from @ARGV are in @Ropts
-			$gp->add_R($1);
-		} elsif (m/^-l(.*)/) {
-			my @largs = ();
-			my $key = $1;
-			if (!exists $libs->{$key}) {
-				$libs->{$key} = LT::Library->new($key);
-			}
-			push @$orderedlibs, $key;
-		} elsif (m/(\S+\/)*(\S+)\.a$/) {
-			(my $key = $2) =~ s/^lib//;
-			if (!exists $libs->{$key}) {
-				$libs->{$key} = LT::Library->new($key);
-			}
-			$libs->{$key}->{fullpath} = $_;
-			push(@$staticlibs, $_);
-		} elsif (m/(\S+\/)*(\S+)\.la$/) {
-			(my $key = $2) =~ s/^lib//;
-			my $d = abs_dir($_);
-			$dirs->{$d} = 1;
-			my $fulla = abs_path($_);
-			require LT::LaFile;
-			my $lainfo = LT::LaFile->parse($fulla);
-			my $dlname = $lainfo->stringize('dlname');
-			my $oldlib = $lainfo->stringize('old_library');
-			my $installed = $lainfo->stringize('installed');
-			if ($dlname ne '' && $installed eq 'no') {
-				tsay {"seen uninstalled la shared in $_"};
-				$self->{seen_la_shared} = 1;
-			}
-			if ($dlname eq '' && -f "$d/$ltdir/$oldlib") {
-				push @$staticlibs, "$d/$ltdir/$oldlib";
-			} else {
-				if (!exists $libs->{$key}) {
-					$libs->{$key} = LT::Library->new($key);
-					$libs->{$key}->{lafile} = $fulla;
-				}
-				push @$orderedlibs, $key;
-			}
-		} elsif (m/^-Wl,(\S+)$/) {
-			# libtool accepts a list of -Wl options separated
-			# by commas, and possibly with a trailing comma
-			# which is not accepted by the linker
-			my @Wlflags = split(/,/, $1);
-			foreach my $f (@Wlflags) {
-				push(@$result, "-Wl,$f");
-			}
-		} else {
-			push(@$result, $_);
-		}
-	}
-	tsay {"end parse_linkargs2"};
-	return $self->{result};
-}
-
-sub new
-{
-	my ($class, $args) = @_;
-	bless { args => $args, pthread => 0 }, $class;
-}
-1;
diff --git a/usr.bin/libtool/Makefile b/usr.bin/libtool/Makefile
index f327da8758e..24563412541 100644
--- a/usr.bin/libtool/Makefile
+++ b/usr.bin/libtool/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2012/07/08 10:42:25 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2012/07/12 17:07:12 espie Exp $
 
 .include <bsd.own.mk>
 
@@ -17,7 +17,6 @@ PACKAGES= \
     LT/Mode/Compile.pm \
     LT/Mode/Install.pm \
     LT/Mode/Link.pm \
-    LT/Parser.pm \
     LT/Program.pm \
     LT/Trace.pm \
     LT/Util.pm