From fe11a27fb0ba094a7537d301d0f349effaa14f41 Mon Sep 17 00:00:00 2001
From: Michael Chastain <mec@google.com>
Date: Wed, 7 Jan 2004 21:56:26 +0000
Subject: [PATCH] 2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>

	* gdb.stabs/weird.exp: Use hp_cc_compiler and hp_aCC_compiler
	to test for hp-ux assembler.  Fix copyright years.
---
 gdb/testsuite/ChangeLog           |  5 +++++
 gdb/testsuite/gdb.stabs/weird.exp | 31 ++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c53537d895..3d96343d1b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
+
+	* gdb.stabs/weird.exp: Use hp_cc_compiler and hp_aCC_compiler
+	to test for hp-ux assembler.  Fix copyright years.
+
 2004-01-07  Andrew Cagney  <cagney@redhat.com>
 
 	* gdb.base/fileio.c (strerrno): Add "EBUSY".
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index e3bbfb5e6c..324f67b1f0 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -1,4 +1,5 @@
-#   Copyright 1997, 1998, 1999 Free Software Foundation, Inc.
+# Copyright 1997, 1998, 1999, 2001, 2003, 2004
+# Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,6 +34,24 @@ if ![file isdirectory ${objdir}/${subdir}] then {
 set prms_id 0
 set bug_id 0
 
+set testfile weird
+set srcfile ${objdir}/${subdir}/weird.s
+set binfile ${objdir}/${subdir}/weirdx.o
+
+if { [ get_compiler_info "$binfile" ] } {
+    return -1
+}
+
+if { $hp_cc_compiler || $hp_aCC_compiler } {
+    # The native hp-ux assembler does not support stabs at all.
+    # If the compiler is native hp-ux, of course the assembler is too.
+    # But if someone builds gcc with the native assembler (not recommended)
+    # rather than the gnu assembler, then this logic will not suppress it.
+    # -- chastain 2004-01-07
+    unsupported "stabs with hp-ux assembler"
+    continue
+}
+
 proc do_tests {} {
 	global binfile
 	global gdb_prompt
@@ -236,9 +255,6 @@ proc print_weird_var { var } {
 
 # Don't use gdb_load; it doesn't bitch if the loading produced some
 # error messages during symbol reading.
-set testfile weird
-set srcfile ${objdir}/${subdir}/weird.s
-set binfile ${objdir}/${subdir}/weirdx.o
 
 global target_os
 set sedscript ${srcdir}/${subdir}/aout.sed
@@ -266,7 +282,6 @@ switch -glob ${target_triplet} {
     }
 }
 
-
 # Hope this is a Unix box.
 set exec_output [remote_exec build "sed" "-f ${sedscript}" "${srcdir}/${subdir}/weird.def" "${srcfile}"]
 if { [lindex $exec_output 0] != 0 } {
@@ -274,12 +289,6 @@ if { [lindex $exec_output 0] != 0 } {
     return -1
 }
 
-# HP's assembler has no idea of what to do with .stab directives; detect the
-# use of HP compilers and escape from here.  (No doubt a better heuristic
-# could be devised.)
-
-if { [ info exists CC ] && [ string first "/opt/ansic/bin/cc" "$CC" ] >= 0 } then { continue }
-
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }