* gas/cris/branch-warn-1.s, gas/cris/branch-warn-2.s,

	gas/cris/branch-warn-3.s: Tweak for fixed FIXME:s.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5420f9d..af48809 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-23  Hans-Peter Nilsson  <hp@axis.com>
+
+       * gas/cris/branch-warn-1.s, gas/cris/branch-warn-2.s,
+       gas/cris/branch-warn-3.s: Tweak for fixed FIXME:s.
+
 2001-03-19  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
        * gas/vax/quad.exp: Correct expected result.

diff --git a/gas/testsuite/gas/cris/branch-warn-1.s b/gas/testsuite/gas/cris/branch-warn-1.s
index 8c84a00..7f2178e 100644 (file)
--- a/gas/testsuite/gas/cris/branch-warn-1.s
+++ b/gas/testsuite/gas/cris/branch-warn-1.s
@@ -1,11 +1,9 @@
 ; Test warning for expansion of branches.
-; FIXME: Warnings currently have the line number of the last
-; line, which is not really good.
 
 ;  { dg-do assemble { target cris-*-* } }
 ;  { dg-options "-N" }
 
  .text
 start:
- ba external_symbol ; { dg-warning "32-bit conditional branch generated" "" { target cris-*-* } { 11 } }
+ ba external_symbol ; { dg-warning "32-bit conditional branch generated" }
  nop

diff --git a/gas/testsuite/gas/cris/branch-warn-2.s b/gas/testsuite/gas/cris/branch-warn-2.s
index 27cdc72..a9ca659 100644 (file)
--- a/gas/testsuite/gas/cris/branch-warn-2.s
+++ b/gas/testsuite/gas/cris/branch-warn-2.s
@@ -1,13 +1,11 @@
 ; Test warning for expansion of branches.
-; FIXME: Warnings currently have the line number of the last
-; line, which is not really good.
 
 ;  { dg-do assemble { target cris-*-* } }
 ;  { dg-options "-N" }
 
  .text
 start:
- ba long_forward ; { dg-warning "32-bit conditional branch generated" "" { target cris-*-* } { 13 } }
+ ba long_forward ; { dg-warning "32-bit conditional branch generated" }
  .space 32768,0
 long_forward:
  nop

diff --git a/gas/testsuite/gas/cris/branch-warn-3.s b/gas/testsuite/gas/cris/branch-warn-3.s
index 495cfa3..184eddc 100644 (file)
--- a/gas/testsuite/gas/cris/branch-warn-3.s
+++ b/gas/testsuite/gas/cris/branch-warn-3.s
@@ -1,6 +1,4 @@
 ; Test warning for expansion of branches.
-; FIXME: Warnings currently have the line number of the last
-; line, which is not really good.
 
 ;  { dg-do assemble { target cris-*-* } }
 ;  { dg-options "-N" }
@@ -9,5 +7,5 @@
 start:
  nop
  .space 32768,0
- ba start ; { dg-warning "32-bit conditional branch generated" "" { target cris-*-* } { 13 } }
+ ba start ; { dg-warning "32-bit conditional branch generated" }
  nop