Committed: Fixes to g++.old-deja/g++.law/bit-fields2.C andgcc.dg/weak-1.c

[Hans-Peter Nilsson <hp at bitrange dot com>]

I've committed these two fixes to trunk, will also do to the 3.1
branch.  The bit-fields2.C fix is as mentioned in
<URL:http://gcc.gnu.org/ml/gcc-patches/2002-03/msg01652.html>
and the weak-1.c change is obvious, just a typo not quoting a ],
confirmed in private email by the author FWIW.  It doesn't bite
now, but would likely do with some newer tcl.

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

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

Index: gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/g++.old-deja/g++.law/bit-fields2.C,v
retrieving revision 1.3
diff -p -c -r1.3 bit-fields2.C
*** bit-fields2.C	2000/08/22 18:16:12	1.3
--- bit-fields2.C	2002/03/28 20:22:55
***************
*** 10,15 ****
--- 10,21 ----
  // 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>
Index: gcc/testsuite/gcc.dg/weak-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/weak-1.c,v
retrieving revision 1.4
diff -p -c -r1.4 weak-1.c
*** weak-1.c	2002/03/25 00:44:36	1.4
--- weak-1.c	2002/03/28 20:22:55
***************
*** 7,20 ****
  /* { 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" } } */

  #pragma weak a
  int a;
--- 7,20 ----
  /* { 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" } } */

  #pragma weak a
  int a;

brgds, H-P