Mainline merge as of 2004-03-03.

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

6 files changed, 94 insertions, 23 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index acc1d32162d..42e02ae50e8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,79 @@
+2004-03-01  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/14369
+	* g++.dg/template/cond4.C: New test.
+
+2004-03-01  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/14360
+	* g++.old-deja/g++.ns/koenig5.C: Remove some error markers.
+	
+	PR c++/14361
+	* g++.dg/parse/defarg7.C: New test.
+
+	PR c++/14359
+	* g++.dg/template/friend26.C: New test.
+
+2004-03-01  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/14324
+	* g++.dg/abi/mangle21.C: New test.
+
+	PR c++/14260
+	* g++.dg/parse/constructor2.C: New test.
+
+	PR c++/14337
+	* g++.dg/template/sfinae1.C: New test.
+
+2004-02-29  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/14267
+	* g++.dg/expr/crash2.C: New test.
+
+	PR middle-end/13448
+	* gcc.dg/inline-5.c: New test.
+	* gcc.dg/always-inline.c: Split out tests into ...
+	* gcc.dg/always-inline2.c: ... this and ...
+	* gcc.dg/always-inline3.c: ... this.
+
+2004-02-29  Mark Mitchell  <mark@codesourcery.com>
+
+	PR debug/12103
+	* g++.dg/debug/crash1.C: New test.
+
+2004-02-29  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* gcc.dg/sibcall-3.c (recurser_void1): Make it an extern
+	function with __attribute__((noinline)).
+	(recurser_void2): Likewise.
+	* gcc.dg/sibcall-4.c (recurser_void1): Likewise.
+	(recurser_void2): Likewise.
+
+2004-02-29  Roger Sayle  <roger@eyesopen.com>
+
+	PR middle-end/14203
+	* g++.dg/warn/Wunused-6.C: New test case.
+
+2004-02-28  Richard Earnshaw  <rearnsha@arm.com>
+
+	* lib/g++.exp (g++_link_flags): Don't crash if LD_LIBRARY_PATH is
+	not defined.
+
+2004-02-27  Eric Christopher  <echristo@redhat.com>
+
+	* g++.dg/charset/charset.exp: Change CFLAGS to CHARSETCFLAGS.
+	* g++.dg/charset/asm2.c: Run only x86.
+	* gcc.dg/charset/asm3.c: Ditto.
+
+2004-02-27  Aldy Hernandez  <aldyh@redhat.com>
+
+	* lib/g++.exp (g++_link_flags): Append LD_LIBRARY_PATH to
+	ld_library_path.
+
+2004-02-27  Ziemowit Laski  <zlaski@apple.com>
+
+	* g++.dg/ext/altivec-3.C: New.
+
 2004-02-26  Richard Henderson  <rth@redhat.com>
 
         * g++.dg/ext/attrib10.C: Mark for warning.
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/koenig5.C b/gcc/testsuite/g++.old-deja/g++.ns/koenig5.C
index 84af9f1edf5..d84fc8dbf41 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/koenig5.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/koenig5.C
@@ -1,16 +1,18 @@
 // { dg-do assemble  }
 // To find function pointers in Koenig lookup is ok as long as we only find one.
 namespace A{
-  void foo();             // { dg-error "" } 
+  void foo();             
   struct X{};
   void (*bar)(X*)=0;
 }
 using A::X;
 
-void (*foo)(X*)=0;        // { dg-error "" } 
+void (*foo)(X*)=0;        
 
 void g()
 {
-  foo(new X);            // { dg-error "" } both objects and functions found
+  foo(new X);            // ok -- DR 218 says that we find the global
+			 // foo variable first, and therefore do not
+			 // perform argument-dependent lookup.
   bar(new X);            // ok
 }
diff --git a/gcc/testsuite/gcc.dg/always_inline.c b/gcc/testsuite/gcc.dg/always_inline.c
index 9480470a95a..2177f642f60 100644
--- a/gcc/testsuite/gcc.dg/always_inline.c
+++ b/gcc/testsuite/gcc.dg/always_inline.c
@@ -1,18 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-Winline -O2" } */
 #include <stdarg.h>
-inline __attribute__ ((always_inline)) void t(void); /* { dg-error "body not available" "" } */
-void
-q(void)
-{
-  t(); 				/* { dg-error "called from here" "" } */
-}
-inline __attribute__ ((always_inline)) void
-q2(void)
-{ 				/* { dg-error "recursive" "" } */
-  q2(); 			/* { dg-error "called from here" "" } */
-  q2(); 			/* { dg-error "called from here" "" } */
-}
 inline __attribute__ ((always_inline)) void
 e(int t, ...)
 {				/* { dg-error "variable argument" "" } */
diff --git a/gcc/testsuite/gcc.dg/sibcall-3.c b/gcc/testsuite/gcc.dg/sibcall-3.c
index f1e9fa1ca7f..4806e15ee89 100644
--- a/gcc/testsuite/gcc.dg/sibcall-3.c
+++ b/gcc/testsuite/gcc.dg/sibcall-3.c
@@ -13,8 +13,8 @@
    (except targets where the test does not work due to the return address
    not saved on the regular stack).  */
 
-static void recurser_void1 (int);
-static void recurser_void2 (int);
+extern void recurser_void1 (int);
+extern void recurser_void2 (int);
 extern void track (int);
 
 int main ()
@@ -27,7 +27,7 @@ int main ()
    reasonably sure is to make them have the same contents (regarding the
    n tests).  */
 
-static void
+void __attribute__((noinline))
 recurser_void1 (int n)
 {
   if (n == 0 || n == 7 || n == 8)
@@ -39,7 +39,7 @@ recurser_void1 (int n)
   recurser_void2 (n + 1);
 }
 
-static void
+void __attribute__((noinline))
 recurser_void2 (int n)
 {
   if (n == 0 || n == 7 || n == 8)
diff --git a/gcc/testsuite/gcc.dg/sibcall-4.c b/gcc/testsuite/gcc.dg/sibcall-4.c
index 1624b897874..85b18a9e310 100644
--- a/gcc/testsuite/gcc.dg/sibcall-4.c
+++ b/gcc/testsuite/gcc.dg/sibcall-4.c
@@ -13,8 +13,8 @@
    (except targets where the test does not work due to the return address
    not saved on the regular stack).  */
 
-static void recurser_void1 (void);
-static void recurser_void2 (void);
+extern void recurser_void1 (void);
+extern void recurser_void2 (void);
 extern void track (void);
 
 int n = 0;
@@ -28,7 +28,7 @@ int main ()
    reasonably sure is to make them have the same contents (regarding the
    n tests).  */
 
-static void
+void __attribute__((noinline))
 recurser_void1 (void)
 {
   if (n == 0 || n == 7 || n == 8)
@@ -40,7 +40,7 @@ recurser_void1 (void)
   recurser_void2 ();
 }
 
-static void
+void __attribute__((noinline))
 recurser_void2 (void)
 {
   if (n == 0 || n == 7 || n == 8)
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index a9f99fa26d8..518e836020c 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -176,6 +176,11 @@ proc g++_link_flags { paths } {
     # (SHLIB_PATH).
     # Doing this does cause trouble when testing cross-compilers.
     if {![is_remote target]} {
+	global env;
+	if { [info exists env(LD_LIBRARY_PATH)] 
+	     && $env(LD_LIBRARY_PATH) != "" } {
+		append ld_library_path ":$env(LD_LIBRARY_PATH)";
+	}
 	setenv  LD_LIBRARY_PATH     $ld_library_path
 	setenv  SHLIB_PATH          $ld_library_path
 	setenv  LD_LIBRARYN32_PATH  $ld_library_path