Mainline merge as of 2004-01-26.

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@76954 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 19 insertions, 16 deletions

diff --git a/gcc/testsuite/g++.dg/abi/vbase10.C b/gcc/testsuite/g++.dg/abi/vbase10.C
index bd03105ec1d..a0d113ade79 100644
--- a/gcc/testsuite/g++.dg/abi/vbase10.C
+++ b/gcc/testsuite/g++.dg/abi/vbase10.C
@@ -1,13 +1,12 @@
 // { dg-do compile }
 // { dg-options "-Wabi -fabi-version=1" }
+// On ARM processors, the alignment of B will be 4 even though it
+// contains only a single "char".  That would avoids the situation
+// that the warning below is designed to catch.  We therefore
+// explicitly set the default structure alignment to 1.
+// { dg-options "-Wabi -fabi-version=1 -mstructure-size-boundary=8" { target arm*-*-* } }
 
 struct A { virtual void f(); char c1; };
 struct B { B(); char c2; };
-// On ARM processors, the alignment of B will be 4 even though it
-// contains only a single "char".  That avoids the situation that the
-// warning below is designed to catch.  On ARM NetBSD, the alignment
-// of B will be only 1 -- but there is no way to tell DejaGNU that a
-// failure is expected on all ARM targets except arm*-*-netbsd*.
-// Therefore, this test will XPASS on arm*-*-netbsd*.
-struct C : public A, public virtual B {}; // { dg-warning "ABI" "" { xfail arm*-*-* } }
+struct C : public A, public virtual B {}; // { dg-warning "ABI" }
 
diff --git a/gcc/testsuite/g++.dg/compat/compat.exp b/gcc/testsuite/g++.dg/compat/compat.exp
index 94da38c77de..df8dac96992 100644
--- a/gcc/testsuite/g++.dg/compat/compat.exp
+++ b/gcc/testsuite/g++.dg/compat/compat.exp
@@ -49,6 +49,9 @@ proc compat-fix-library-path { } {
 	setenv  SHLIB_PATH          $ld_library_path
 	setenv  LD_LIBRARYN32_PATH  $ld_library_path
 	setenv  LD_LIBRARY64_PATH   $ld_library_path
+	setenv  LD_LIBRARY_PATH_32  $ld_library_path
+	setenv  LD_LIBRARY_PATH_64  $ld_library_path
+	setenv  DYLD_LIBRARY_PATH   $ld_library_path
     }
 }
 
diff --git a/gcc/testsuite/g++.dg/eh/simd-1.C b/gcc/testsuite/g++.dg/eh/simd-1.C
index 9cad5ad9d10..d10a74ab274 100644
--- a/gcc/testsuite/g++.dg/eh/simd-1.C
+++ b/gcc/testsuite/g++.dg/eh/simd-1.C
@@ -1,8 +1,9 @@
 // Test EH when V2SI SIMD registers are involved.
 // Contributed by Aldy Hernandez (aldy@quesejoda.com).
 // { dg-options "-O" }
+// { dg-options "-O -w" { target i?86-*-* } }
 // { dg-do run }
-// { dg-error "" "PR target/12916" { target sparc*-*-* } 10 }
+// { dg-error "" "PR target/12916" { target sparc*-*-* } 11 }
 
 typedef int __attribute__((mode(V2SI))) vecint;
 
diff --git a/gcc/testsuite/g++.dg/ext/attrib9.C b/gcc/testsuite/g++.dg/ext/attrib9.C
index ee6fdb1d375..d01fc12b675 100644
--- a/gcc/testsuite/g++.dg/ext/attrib9.C
+++ b/gcc/testsuite/g++.dg/ext/attrib9.C
@@ -1,5 +1,5 @@
-class __attribute__((unused)) C;
-struct __attribute__((unused)) S;
-union __attribute__((unused)) U;
+class __attribute__((unused)) C;	//  { dg-warning "type attributes" }
+struct __attribute__((unused)) S;	//  { dg-warning "type attributes" }
+union __attribute__((unused)) U;	//  { dg-warning "type attributes" }
 enum e {};
-enum __attribute__((unused)) e;
+enum __attribute__((unused)) e;		//  { dg-warning "type attributes" }
diff --git a/gcc/testsuite/g++.dg/ext/lvalue1.C b/gcc/testsuite/g++.dg/ext/lvalue1.C
index 98e63a7a309..bf883eae21f 100644
--- a/gcc/testsuite/g++.dg/ext/lvalue1.C
+++ b/gcc/testsuite/g++.dg/ext/lvalue1.C
@@ -4,7 +4,7 @@ int main ()
 {
   char c;
 
-  static_cast<int>(c) = 2; // { dg-error "lvalue" "not an lvalue" { xfail *-*-* } }
+  static_cast<int>(c) = 2; // { dg-error "lvalue" "not an lvalue" }
 
   return c != 2;
 }
diff --git a/gcc/testsuite/g++.dg/other/error1.C b/gcc/testsuite/g++.dg/other/error1.C
index a55fcc60cf6..927efef8bbb 100644
--- a/gcc/testsuite/g++.dg/other/error1.C
+++ b/gcc/testsuite/g++.dg/other/error1.C
@@ -10,6 +10,6 @@ class foo {
   int fudge[40];
   int bar [40];
   inline int access(int i) {
-    return bar(i);  // { dg-error "call to non-function `foo::bar'" "" }
+    return bar(i);  // { dg-error "cannot be used as a function" "" }
   }
 };
diff --git a/gcc/testsuite/g++.dg/template/arg2.C b/gcc/testsuite/g++.dg/template/arg2.C
index dbed54d2131..9fb7a68cc78 100644
--- a/gcc/testsuite/g++.dg/template/arg2.C
+++ b/gcc/testsuite/g++.dg/template/arg2.C
@@ -10,5 +10,5 @@ template <typename T> class X {};
 void fn ()
 {
   class L {};
-  X<L> f; // { dg-error "uses local type|trying to instantiate|no type" "" }
+  X<L> f; // { dg-error "uses local type|trying to instantiate|no type|invalid type" "" }
 }
diff --git a/gcc/testsuite/g++.dg/warn/Wunused-2.C b/gcc/testsuite/g++.dg/warn/Wunused-2.C
index dcad9015e11..593bf4872d4 100644
--- a/gcc/testsuite/g++.dg/warn/Wunused-2.C
+++ b/gcc/testsuite/g++.dg/warn/Wunused-2.C
@@ -2,5 +2,5 @@
 // { dg-options "-Wunused -O3" }
 
 static const int i = 0;
-static void f() { }		/* { dg-warning "defined but not used" "" { xfail *-*-* } } */
+static void f() { }		/* { dg-warning "defined but not used" "" } */
 static inline void g() { }