* gdb.stabs: Re-write weird.def and configuration to use sed

	instead of cpp.  sed is portable and POSIX; cpp is neither.

7 files changed, 28 insertions, 33 deletions

diff --git a/gdb/testsuite/gdb.stabs/.Sanitize b/gdb/testsuite/gdb.stabs/.Sanitize
index 59a767dd7a..bf31687e7b 100644
--- a/gdb/testsuite/gdb.stabs/.Sanitize
+++ b/gdb/testsuite/gdb.stabs/.Sanitize
@@ -1,5 +1,3 @@
-# .Sanitize for deja-gnu.
-
 # Each directory to survive it's way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
@@ -28,10 +26,9 @@ alpha.mt
 aout.mt
 configure.in
 ecoff.mt
-weird-aout.S
+weird-aout.sed
 weird-ecoff.sed
-weird-ecoff.S
-weird-xcoff.S
+weird-xcoff.sed
 weird.def
 weird.exp
 xcoff.mt
diff --git a/gdb/testsuite/gdb.stabs/aout.mt b/gdb/testsuite/gdb.stabs/aout.mt
index f1eb7efa98..7eb9f0650d 100644
--- a/gdb/testsuite/gdb.stabs/aout.mt
+++ b/gdb/testsuite/gdb.stabs/aout.mt
@@ -1,3 +1,3 @@
-weird.o: $(srcdir)/weird.def $(srcdir)/weird-aout.S
-	sed -f $(srcdir)/weird-aout.S <$(srcdir)/weird.def >weird.s
+weird.o: $(srcdir)/weird.def $(srcdir)/weird-aout.sed
+	sed -f $(srcdir)/weird-aout.sed <$(srcdir)/weird.def >weird.s
 	$(CC) -c weird.s
diff --git a/gdb/testsuite/gdb.stabs/weird-aout.S b/gdb/testsuite/gdb.stabs/weird-aout.sed
index 0ed3a5e7cc..0ed3a5e7cc 100644
--- a/gdb/testsuite/gdb.stabs/weird-aout.S
+++ b/gdb/testsuite/gdb.stabs/weird-aout.sed
diff --git a/gdb/testsuite/gdb.stabs/weird-ecoff.S b/gdb/testsuite/gdb.stabs/weird-ecoff.S
deleted file mode 100644
index 18925394ff..0000000000
--- a/gdb/testsuite/gdb.stabs/weird-ecoff.S
+++ /dev/null
@@ -1,18 +0,0 @@
-# GDB legitimately expects a file name.
-1i\
- .file	1 "weird.c"\
- #@stabs\
- #.stabs "weird.c",0x64,0,0,0
-/^#/d
-# Remove whitespace from various places.
-s/" *, */",/g
-s/\([0-9]\) *, */\1,/g
-s/  *$//
-#
-s/N_LSYM/0x80/
-s/N_GSYM/0x20/
-s/\.begin_common\(.*\)/.stabs \1,0xe2,0,0,0/
-s/\.end_common\(.*\)/.stabs \1,0xe4,0,0,0/
-s/\.align_it/.align 2/
-/.if/d
-/.endif/d
diff --git a/gdb/testsuite/gdb.stabs/weird-ecoff.sed b/gdb/testsuite/gdb.stabs/weird-ecoff.sed
index e69de29bb2..18925394ff 100644
--- a/gdb/testsuite/gdb.stabs/weird-ecoff.sed
+++ b/gdb/testsuite/gdb.stabs/weird-ecoff.sed
@@ -0,0 +1,18 @@
+# GDB legitimately expects a file name.
+1i\
+ .file	1 "weird.c"\
+ #@stabs\
+ #.stabs "weird.c",0x64,0,0,0
+/^#/d
+# Remove whitespace from various places.
+s/" *, */",/g
+s/\([0-9]\) *, */\1,/g
+s/  *$//
+#
+s/N_LSYM/0x80/
+s/N_GSYM/0x20/
+s/\.begin_common\(.*\)/.stabs \1,0xe2,0,0,0/
+s/\.end_common\(.*\)/.stabs \1,0xe4,0,0,0/
+s/\.align_it/.align 2/
+/.if/d
+/.endif/d
diff --git a/gdb/testsuite/gdb.stabs/weird-xcoff.S b/gdb/testsuite/gdb.stabs/weird-xcoff.sed
index a84e94fc65..0dbcf5c2b6 100644
--- a/gdb/testsuite/gdb.stabs/weird-xcoff.S
+++ b/gdb/testsuite/gdb.stabs/weird-xcoff.sed
@@ -11,7 +11,8 @@ s/\.begin_common/.bc/
 # The AIX assembler doesn't want the name in a .ec directive
 s/\.end_common.*/.ec/
 s/\.align_it/.align 1/
+/\.data/d
 /^#/d
-/.if alpha/,/.endif alpha/d
-/.if/d
-/.endif/d
+/\.if alpha/,/\.endif alpha/d
+/\.if/d
+/\.endif/d
diff --git a/gdb/testsuite/gdb.stabs/xcoff.mt b/gdb/testsuite/gdb.stabs/xcoff.mt
index 314d0ec439..95d867d3a2 100644
--- a/gdb/testsuite/gdb.stabs/xcoff.mt
+++ b/gdb/testsuite/gdb.stabs/xcoff.mt
@@ -1,6 +1,3 @@
-WEIRDSTABS_S=weird-xcoff.S
-
-weird.o: ${srcdir}/${WEIRDSTABS_S} ${srcdir}/weird.def
-	cp ${srcdir}/${WEIRDSTABS_S} tmp.c
-	$(CC) -I${srcdir} -E tmp.c >weird.s
+weird.o: $(srcdir)/weird.def $(srcdir)/weird-xcoff.sed
+	sed -f $(srcdir)/weird-xcoff.sed <$(srcdir)/weird.def >weird.s
 	$(CC) -c weird.s