aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/testsuite/ChangeLog5
-rw-r--r--binutils/testsuite/lib/utils-lib.exp9
2 files changed, 10 insertions, 4 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 95434fd..a3d0a3a 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-10 Alan Modra <alan@linuxcare.com.au>
+
+ * lib/utils-lib.exp (default_binutils_assemble): Don't do the hppa
+ sed fudges for hppa-linux.
+
2000-07-01 Frank Ch. Eigler <fche@redhat.com>
* binutils-all/objdump.exp (cpus_expected, cpus_regex): Reorganize
diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp
index e27f217..de1535d 100644
--- a/binutils/testsuite/lib/utils-lib.exp
+++ b/binutils/testsuite/lib/utils-lib.exp
@@ -90,10 +90,11 @@ proc default_binutils_assemble { source object } {
# This is a hack in that it won't scale well if other targets need
# 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 > asm.s\n"
- verbose "sed -f $srcdir/config/hppa.sed < $source > asm.s"
- catch "exec sed -f $srcdir/config/hppa.sed < $source > asm.s";
+ if { [istarget "hppa*-*-*"] && ![istarget "*-*-linux*" ] } then {
+ set sed_file $srcdir/config/hppa.sed
+ send_log "sed -f $sed_file < $source > asm.s\n"
+ verbose "sed -f $sed_file < $source > asm.s"
+ catch "exec sed -f $sed_file < $source > asm.s";
set source asm.s
}