-# Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1997 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
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Please email any bugs, comments, and/or additions to this file to:
# bug-dejagnu@prep.ai.mit.edu
# and extended by Ian Lance Taylor <ian@cygnus.com>
proc binutil_version { prog } {
- if {[which $prog] == 0} then {
- perror "$prog can't be run, file not found."
- return ""
+ if ![is_remote host] {
+ set path [which $prog];
+ if {$path == 0} then {
+ perror "$prog can't be run, file not found."
+ return ""
+ }
+ } else {
+ set path $prog
}
- catch "exec $prog --version" tmp
+ set state [remote_exec host $prog --version];
+ set tmp "[lindex $state 1]\n";
# Should find a way to discard constant parts, keep whatever's
# left, so the version string could be almost anything at all...
- regexp "version (cygnus-|)\[-0-9.a-zA-Z-\]+" $tmp version
- if ![info exists version] then {
- return "[which $prog] (no version number)\n"
+ regexp "\[^\n\]* (cygnus-|)(\[-0-9.a-zA-Z-\]+)\[\r\n\].*" "$tmp" version cyg number
+ if ![info exists number] then {
+ return "$path (no version number)\n"
}
- set tmp $version
- return "[which $prog] $version\n"
+ return "$path $number\n"
}
#
#
proc default_binutils_run { prog progargs } {
global binutils_run_failed
+ global host_triplet
set binutils_run_failed 0
- if {[which $prog] == 0} then {
- perror "$prog does not exist"
- set binutils_run_failed 1
- return ""
+ if ![is_remote host] {
+ if {[which $prog] == 0} then {
+ perror "$prog does not exist"
+ set binutils_run_failed 1
+ return ""
+ }
}
send_log "$prog $progargs\n"
verbose "$prog $progargs"
- # This used to be
- # catch "exec $prog $progargs" exec_output
- # but that would evaluate $progargs twice, which would fail if
- # any arguments started with `$'. This is a dismal hack to avoid
- # this problem. I tried using
- # catch { exec $prog $progargs } exec_output
- # but that failed because $progargs was not split into words by
- # exec. I don't know if this operation can be done correctly. No
- # matter how hard I try, I can not convince myself that TCL is a
- # language.
- regsub -all "\\$" $progargs "\\$" progq
- catch "exec $prog $progq" exec_output
+ # Gotta quote dollar-signs because they get mangled by the
+ # shell otherwise.
+ regsub -all "\\$" "$progargs" "\\$" progargs
+
+ set state [remote_exec host $prog $progargs]
+ set exec_output [prune_warnings [lindex $state 1]];
if {![string match "" $exec_output]} then {
send_log "$exec_output\n"
verbose "$exec_output"
# default_binutils_assemble
# assemble a file
#
-proc default_binutils_assemble { as source object } {
- global ASFLAGS
+proc default_binutils_assemble { source object } {
global srcdir
-
- if {[which $as] == 0} then {
- perror "$as does not exist"
- return 0
- }
-
- if ![info exists ASFLAGS] { set ASFLAGS "" }
+ global host_triplet
# The HPPA assembler syntax is a little different than most, to make
# the test source file assemble we need to run it through sed.
# similar transformations to assemble. We'll generalize the hack
# if/when other targets need similar handling.
if [istarget "hppa*-*-*" ] then {
- send_log "sed -f $srcdir/config/hppa.sed < $source | $as $ASFLAGS -o $object\n"
- verbose "sed -f $srcdir/config/hppa.sed < $source | $as $ASFLAGS -o $object"
- catch "exec sed -f $srcdir/config/hppa.sed < $source | $as $ASFLAGS -o $object" exec_output
- } else {
- send_log "$as $ASFLAGS -o $object $source\n"
- verbose "$as $ASFLAGS -o $object $source"
- catch "exec $as $ASFLAGS -o $object $source" exec_output
+ send_log "sed -f $srcdir/config/hppa.sed < $source > asm.s\n"
+ verbose "sed -f $srcdir/config/hppa.sed < $source > asm.s"
+ catch "exec sed -f $srcdir/config/hppa.sed < $source > asm.s";
+ set source asm.s
}
- if [string match "" $exec_output] then {
+ set exec_output [target_assemble $source $object ""];
+ set exec_output [prune_warnings $exec_output]
+
+ if [string match "" $exec_output] {
return 1
} else {
send_log "$exec_output\n"
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};
+}
+}
+}
projects / deliverable / binutils-gdb.git / blobdiff