binutils testsuite patch

[Ben Elliston <bje at redhat dot com>]

While tracking down a couple of stray m88k testsuite failures, I
discovered this comment in a hunk of Tcl code in lib/utils-lib.exp:

  # Stolen from dejagnu/lib/target.exp--please remove after 1/1/98. 

Upon inspection, it appears that the code is a perfect duplicate
(verified with `diff') of code present in src/dejagnu/lib/target.exp.
Since it's now after 1998-01-01, I propose we take its advice! :-)


2001-07-05  Ben Elliston  <bje@redhat.com>

	* lib/utils-lib.exp (target_assemble): Remove duplicate copy.
	(default_target_assemble): Likewise.

Index: utils-lib.exp
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/lib/utils-lib.exp,v
retrieving revision 1.3
diff -u -c -r1.3 utils-lib.exp
*** utils-lib.exp	2001/03/13 06:43:59	1.3
--- utils-lib.exp	2001/07/05 09:31:46
***************
*** 1,5 ****
! #   Copyright 1993, 1994, 1995, 1996, 1997, 2000
! #   Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,5 ----
! # Copyright 1993, 1994, 1995, 1996, 1997, 2000, 2001
! # Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 110,163 ****
  	perror "$source: assembly failed"
  	return 0
      }
- }
- 
- if ![info exists target_assemble] {
- #
- # Stolen from dejagnu/lib/target.exp--please remove after 1/1/98.
- #
- uplevel #0 {
-     proc target_assemble { source destfile flags } {
- 	return [default_target_assemble $source $destfile $flags];
-     }
- 
-     proc default_target_assemble { source destfile flags } {
- 	global AS_FOR_TARGET;
- 	global ASFLAGS_FOR_TARGET;
- 
- 	if [info exists AS_FOR_TARGET] {
- 	    set AS "$AS_FOR_TARGET";
- 	} else {
- 	    if ![board_info target exists assembler] {
- 		set AS [find_gas];
- 	    } else {
- 		set AS [board_info target assembler];
- 	    }
- 	}
- 
- 	if [info exists ASFLAGS_FOR_TARGET] {
- 	    append flags " $ASFLAGS_FOR_TARGET";
- 	}
- 
- 	if [is_remote host] {
- 	    set source [remote_download host $source];
- 	    set dest "a.out"
- 	} else {
- 	    set dest $destfile
- 	}
- 	set status [remote_exec host "$AS $source $flags -o $dest"]
- 	if [is_remote host] {
- 	    remote_upload host $dest $destfile
- 	}
- 
- 	set comp_output [prune_warnings [lindex $status 1]];
- 	if { [lindex $status 0] != 0 } {
- 	    verbose -log "assembler exited with status [lindex $status 0]";
- 	}
- 	if { [lindex $status 1] != "" } {
- 	    verbose -log "assembler output is:\n[lindex $status 1]" 2;
- 	}
- 	return ${comp_output};
- }
- }
  }
--- 110,113 ----