From d15e67bc462ac4225e72792748d50b31d21c6552 Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@bitrange.com>
Date: Thu, 28 Mar 2002 20:36:16 +0000
Subject: [PATCH] weak-1.c: Fix typo in scan-assembler pattern.

	* gcc.dg/weak-1.c: Fix typo in scan-assembler pattern.

	* g++.old-deja/g++.law/bit-fields2.C: Skip on mmix-knuth-mmixware.

From-SVN: r51529
---
 gcc/testsuite/ChangeLog                          |  6 ++++++
 gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C |  6 ++++++
 gcc/testsuite/gcc.dg/weak-1.c                    | 16 ++++++++--------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5cf57802e03..950a5fe0ab0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-28  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* gcc.dg/weak-1.c: Fix typo in scan-assembler pattern.
+
+	* g++.old-deja/g++.law/bit-fields2.C: Skip on mmix-knuth-mmixware.
+
 2002-03-27  Richard Henderson  <rth@redhat.com>
 
 	* g++.dg/ext/instantiate1.C: Use scan-assembler, not link errors.
diff --git a/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C b/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C
index 69fe85d8739..ac70686861d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C
@@ -10,6 +10,12 @@
 // From: Jaimie Wilson/MSL <Jaimie_Wilson@msl.isis.org>
 // Date:   Fri, 28 Jan 1994 06:11:43 -0500
 // Subject: GCC bug report
+//
+// This test is only meant for targets where EMPTY_FIELD_BOUNDARY is
+// defined to no larger than the size of an unsigned int, or where
+// PCC_BITFIELD_TYPE_MATTERS is defined.  Add skips below for targets that
+// do not have that property.
+// Skip if target: mmix-knuth-mmixware
 
 
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.dg/weak-1.c b/gcc/testsuite/gcc.dg/weak-1.c
index 2e736f8f186..216a2b914f5 100644
--- a/gcc/testsuite/gcc.dg/weak-1.c
+++ b/gcc/testsuite/gcc.dg/weak-1.c
@@ -7,14 +7,14 @@
 /* { dg-final { global target_triplet } } */
 /* { dg-final { if [string match i?86-pc-cygwin $target_triplet ] {return} } } */
 /* { dg-final { if [string match *-*-coff $target_triplet ] {return} } } */
-/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t]_?a" } } */
-/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t]_?b" } } */
-/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t]_?c" } } */
-/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t]_?d" } } */
-/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t]_?e" } } */
-/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t]_?g" } } */
-/* { dg-final { scan-assembler-not "weak\[^ \t\]*\[ \t]_?i" } } */
-/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t]_?j" } } */
+/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?a" } } */
+/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?b" } } */
+/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?c" } } */
+/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?d" } } */
+/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?e" } } */
+/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?g" } } */
+/* { dg-final { scan-assembler-not "weak\[^ \t\]*\[ \t\]_?i" } } */
+/* { dg-final { scan-assembler "weak\[^ \t\]*\[ \t\]_?j" } } */
 
 #pragma weak a
 int a;