* gas/macros/app1.s, gas/macros/app1.d, gas/macros/app2.s,

	gas/macros/app2.d, gas/macros/app3.s, gas/macros/app3.d,
	gas/macros/app4.s, gas/macros/app4b.s, gas/macros/app4.d: New
	tests.
	* gas/macros/macros.exp: Run them.

11 files changed, 85 insertions, 0 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8baa6cd..eb86373 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-13  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* gas/macros/app1.s, gas/macros/app1.d, gas/macros/app2.s,
+	gas/macros/app2.d, gas/macros/app3.s, gas/macros/app3.d,
+	gas/macros/app4.s, gas/macros/app4b.s, gas/macros/app4.d: New
+	tests.
+	* gas/macros/macros.exp: Run them.
+
 2003-05-07  H.J. Lu <hongjiu.lu@intel.com>
 
 	* gas/ia64/ia64.exp: Add alias.
diff --git a/gas/testsuite/gas/macros/app1.d b/gas/testsuite/gas/macros/app1.d
new file mode 100644
index 0000000..e57c8ac
--- /dev/null
+++ b/gas/testsuite/gas/macros/app1.d
@@ -0,0 +1,4 @@
+#nm: -n
+#name: APP with macro without NO_APP
+0+ t a
+0+[1-f] t b
diff --git a/gas/testsuite/gas/macros/app1.s b/gas/testsuite/gas/macros/app1.s
new file mode 100644
index 0000000..fd63b81
--- /dev/null
+++ b/gas/testsuite/gas/macros/app1.s
@@ -0,0 +1,10 @@
+#NO_APP
+ .text
+ .macro foo
+a:
+ .long 42
+ .endm
+#APP
+ foo
+b:
+ .long 56
diff --git a/gas/testsuite/gas/macros/app2.d b/gas/testsuite/gas/macros/app2.d
new file mode 100644
index 0000000..0b3f957
--- /dev/null
+++ b/gas/testsuite/gas/macros/app2.d
@@ -0,0 +1,4 @@
+#nm: -n
+#name: APP with macro then NO_APP
+0+ t a
+0+[1-f] t b
diff --git a/gas/testsuite/gas/macros/app2.s b/gas/testsuite/gas/macros/app2.s
new file mode 100644
index 0000000..7147bca
--- /dev/null
+++ b/gas/testsuite/gas/macros/app2.s
@@ -0,0 +1,11 @@
+#NO_APP
+ .text
+ .macro foo
+a:
+ .long 42
+ .endm
+#APP
+ foo
+b:
+ .long 56
+#NO_APP
diff --git a/gas/testsuite/gas/macros/app3.d b/gas/testsuite/gas/macros/app3.d
new file mode 100644
index 0000000..bc5f3aa
--- /dev/null
+++ b/gas/testsuite/gas/macros/app3.d
@@ -0,0 +1,5 @@
+#nm: -n
+#name: APP with macro then NO_APP then more code
+0+ t a
+0+[1-f] t b
+0+[2-f] t c
diff --git a/gas/testsuite/gas/macros/app3.s b/gas/testsuite/gas/macros/app3.s
new file mode 100644
index 0000000..49d850c
--- /dev/null
+++ b/gas/testsuite/gas/macros/app3.s
@@ -0,0 +1,13 @@
+#NO_APP
+ .text
+ .macro foo
+a:
+ .long 42
+ .endm
+#APP
+ foo
+b:
+ .long 56
+#NO_APP
+c:
+ .long 78
diff --git a/gas/testsuite/gas/macros/app4.d b/gas/testsuite/gas/macros/app4.d
new file mode 100644
index 0000000..36493ba
--- /dev/null
+++ b/gas/testsuite/gas/macros/app4.d
@@ -0,0 +1,6 @@
+#as: -I$srcdir/$subdir
+#nm: -n
+#name: included file with .if 0 wrapped in APP/NO_APP, no final NO_APP, macro in main file
+0+ t d
+0+[1-f] t a
+0+[2-f] t b
diff --git a/gas/testsuite/gas/macros/app4.s b/gas/testsuite/gas/macros/app4.s
new file mode 100644
index 0000000..ca635bf
--- /dev/null
+++ b/gas/testsuite/gas/macros/app4.s
@@ -0,0 +1,9 @@
+ .text
+ .macro foo
+a:
+ .long 42
+ .endm
+ .include "app4b.s"
+ foo
+b:
+ .long 56
diff --git a/gas/testsuite/gas/macros/app4b.s b/gas/testsuite/gas/macros/app4b.s
new file mode 100644
index 0000000..5b2e7af
--- /dev/null
+++ b/gas/testsuite/gas/macros/app4b.s
@@ -0,0 +1,10 @@
+#NO_APP
+d:
+ .long 21
+#APP
+ .if 0
+#NO_APP
+ .err
+x:
+#APP
+ .endif
diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp
index 313f612..806de3a 100644
--- a/gas/testsuite/gas/macros/macros.exp
+++ b/gas/testsuite/gas/macros/macros.exp
@@ -40,3 +40,8 @@ if { ![istarget hppa*-*-*] || [istarget *-*-linux*] } {
     setup_xfail "*c4x*-*-*" "*c54x*-*"
     run_dump_test strings
 }
+
+run_dump_test app1
+run_dump_test app2
+run_dump_test app3
+run_dump_test app4