Revert last patch

From-SVN: r34486

gcc/testsuite/g++.old-deja/g++.ext/pretty2.C

-// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+// Copyright (C) 1999 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 21 Nov 1999 <nathan@acm.org>
 
 // make sure __FUNCTION__ and __PRETTY_FUNCTION__ work in member functions
@@ -67,7 +67,7 @@ X::operator int ()
   printf ("__FUNCTION__ %s\n", function);
   printf ("__PRETTY_FUNCTION__ %s\n", pretty);
   
-  if (strcmp (function, "operator i"))
+  if (strcmp (function, "__opi"))
     bad = true;
   if (strcmp (pretty, "X::operator int ()"))
     bad = true;

gcc/testsuite/g++.old-deja/g++.other/decl4.C

@@ -4,4 +4,4 @@
 // Simplified for testsuite by Alexandre Oliva
 
 struct foo { operator long double(); };
-int bar(int __opr); // gets bogus error
+int bar(int __opr); // gets bogus error - XFAIL *-*-*

gcc/testsuite/g++.old-deja/g++.other/static8.C

 // Build don't link:
+// Special g++ Options: -fno-squangle
 // Origin: Mark Mitchell <mark@codesourcery.com>
 
+#if (!defined (__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100)
+#define NAME(OLD, NEW) OLD
+#else
+#define NAME(OLD, NEW) NEW
+#endif /* (!defined (__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100) */
+
 static unsigned int strlen (const char*) {} // ERROR - previous declaration
 
-int _Z6strlenPKc = 0; // ERROR - duplicate declaration
+int NAME (strlen__FPCc, _Z6strlenPKc) = 0; // ERROR - duplicate declaration