* gdb.disasm/hppa.mt (hppa), gdb.stabs/hppa.mt (weird.o): Check

	for HP assembler versus GNU assembler based on actual behavior of
	$(CC), rather than assuming that $(AS) is always the GNU assembler.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 076b565624a63807b97e35170e353329d1dc350b..01717de283f68071221465d51eb0afab9a90d581 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 Thu Jan 26 19:20:34 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * gdb.disasm/hppa.mt (hppa), gdb.stabs/hppa.mt (weird.o): Check
+       for HP assembler versus GNU assembler based on actual behavior of
+       $(CC), rather than assuming that $(AS) is always the GNU assembler.
+
        * TODO: Suggest a few more stepping tests.
 
 Wed Jan 25 14:52:41 1995  Stan Shebs  <shebs@andros.cygnus.com>

diff --git a/gdb/testsuite/gdb.disasm/hppa.mt b/gdb/testsuite/gdb.disasm/hppa.mt
index e996a1a44265fe05fcd6217fa65e5d17ca36787d..d5ecdc8e62a31828359eeafff3d99b6043b858cb 100644 (file)
--- a/gdb/testsuite/gdb.disasm/hppa.mt
+++ b/gdb/testsuite/gdb.disasm/hppa.mt
@@ -1,5 +1,14 @@
 EXECUTABLES = hppa
 hppa: hppa.s
-       $(AS) $(ASFLAGS) $(srcdir)/hppa.s -o hppa.o
-       $(CC) $(CFLAGS) $(LDFLAGS) -o hppa hppa.o $(LIBS)
+       if $(CC) -c $(srcdir)/hppa.s 2>errs; then \
+         $(CC) $(CFLAGS) $(LDFLAGS) -o hppa hppa.o $(LIBS); \
+         true; \
+       else \
+         if grep 'Opcode not defined - DIAG' errs \
+             >/dev/null; then \
+           echo HP assembler in use--skipping disasm tests; true; \
+         else \
+           cat errs; false; \
+         fi; \
+       fi
 

diff --git a/gdb/testsuite/gdb.stabs/hppa.mt b/gdb/testsuite/gdb.stabs/hppa.mt
index d7a6e86792ae17a31e5c3f213cff743d8a0c36a8..32a09cac69f1c54c8641f6e01a84675ab502d1d7 100644 (file)
--- a/gdb/testsuite/gdb.stabs/hppa.mt
+++ b/gdb/testsuite/gdb.stabs/hppa.mt
@@ -1,3 +1,12 @@
 weird.o: $(srcdir)/weird.def $(srcdir)/hppa.sed
        sed -f $(srcdir)/hppa.sed <$(srcdir)/weird.def >weird.s
-       $(AS) weird.s -o weird.o
+       if $(CC) -c weird.s 2>errs; then \
+         true; \
+       else \
+         if grep 'Directive name not recognized - STABS' errs \
+             >/dev/null; then \
+           echo HP assembler in use--skipping stabs tests; true; \
+         else \
+           cat errs; false; \
+         fi; \
+       fi