aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorBen Elliston <bje@au.ibm.com>2001-07-05 11:00:28 +0000
committerBen Elliston <bje@au.ibm.com>2001-07-05 11:00:28 +0000
commit56070b8bdc4da963c605166e1cac0e9644932fc6 (patch)
tree49413686155f6a8e2edf9c674372713b40901068 /binutils
parent0515494aac726cd5112c6136a3126de9f1535e6a (diff)
downloadgdb-56070b8bdc4da963c605166e1cac0e9644932fc6.zip
gdb-56070b8bdc4da963c605166e1cac0e9644932fc6.tar.gz
gdb-56070b8bdc4da963c605166e1cac0e9644932fc6.tar.bz2
2001-07-05 Ben Elliston <bje@redhat.com>
* lib/utils-lib.exp (target_assemble): Remove duplicate copy. (default_target_assemble): Likewise.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/testsuite/ChangeLog5
-rw-r--r--binutils/testsuite/lib/utils-lib.exp54
2 files changed, 7 insertions, 52 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index f3a4799..d7630eb 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-05 Ben Elliston <bje@redhat.com>
+
+ * lib/utils-lib.exp (target_assemble): Remove duplicate copy.
+ (default_target_assemble): Likewise.
+
2001-06-18 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* binutils-all/readelf.exp: Typo.
diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp
index e43019c..54c59de 100644
--- a/binutils/testsuite/lib/utils-lib.exp
+++ b/binutils/testsuite/lib/utils-lib.exp
@@ -1,5 +1,5 @@
-# Copyright 1993, 1994, 1995, 1996, 1997, 2000
-# Free Software Foundation, Inc.
+# 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
@@ -111,53 +111,3 @@ proc default_binutils_assemble { source object } {
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};
-}
-}
-}