3 files changed, 38 insertions, 5 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 31e651e..d7365b4 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-06  Jan Beulich  <jbeulich@novell.com>
 
+	* gas/all/cond.s: Also test .ifb/.ifnb.
+	* gas/all/cond.d: Adjust.
+
+2005-05-06  Jan Beulich  <jbeulich@novell.com>
+
 	* gas/macros/dot.s: Don't use pseudo-ops in first column.
 	* gas/macros/dot.l: Match broader range of possible outputs.
 	* gas/macros/purge.l: Likewise.
diff --git a/gas/testsuite/gas/all/cond.d b/gas/testsuite/gas/all/cond.d
index 4d0da36..e13ac90 100644
--- a/gas/testsuite/gas/all/cond.d
+++ b/gas/testsuite/gas/all/cond.d
@@ -23,8 +23,18 @@
   27[ 	]+.elseif	1
   29[ 	]+.else
   31[ 	]+.endif
-  32 000c 00 ?00 ?00 ?00[ 	]+.p2align 5,0
-  32[ 	]+00 ?00 ?00 ?00 
-  32[ 	]+00 ?00 ?00 ?00 
-  32[ 	]+00 ?00 ?00 ?00 
-  32[ 	]+00 ?00 ?00 ?00 
+[ 	]*[1-9][0-9]*[ 	]+
+[ 	]*[1-9][0-9]*[ 	]+\.macro[ 	]+m[ 	]+x,[ 	]*y[ 	]*
+#...
+[ 	]*[1-9][0-9]*[ 	]+\.endm[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+[0-9a-f]+[048c] FF ?FF ?FF ?FF[ 	]+m[ 	]+,[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+FF ?FF ?FF ?FF[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+[0-9a-f]+[048c] FF ?FF ?FF ?FF[ 	]+m[ 	]+,[ 	]*10[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+0[0A] ?00 ?00 ?0[0A][ 	]*
+[ 	]*[1-9][0-9]*[ 	]+[0-9a-f]+[048c] 0[0B] ?00 ?00 ?0[0B][ 	]+m[ 	]+11,[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+FF ?FF ?FF ?FF[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+[0-9a-f]+[048c] 0[0C] ?00 ?00 ?0[0C][ 	]+m[ 	]+12,[ 	]*13[ 	]*
+[ 	]*[1-9][0-9]*[ 	]+0[0D] ?00 ?00 ?0[0D][ 	]*
+[ 	]*[1-9][0-9]*[ 	]+
+[ 	]*[1-9][0-9]*[ 	]+.*\.p2align 5,0
+#pass
diff --git a/gas/testsuite/gas/all/cond.s b/gas/testsuite/gas/all/cond.s
index ba4bd6c..b8136ba 100644
--- a/gas/testsuite/gas/all/cond.s
+++ b/gas/testsuite/gas/all/cond.s
@@ -29,4 +29,22 @@
 	.else
 	.long	9
 	.endif
+
+	.macro	m x, y
+	.ifb \x
+	.long	-1
+	.else
+	.long	\x
+	.endif
+	.ifnb \y
+	.long	\y
+	.else
+	.long	-1
+	.endif
+	.endm
+	m	,
+	m	, 10
+	m	11,
+	m	12, 13
+
 	.p2align 5,0