diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-11 03:38:05 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-11 03:38:05 +0000 |
| commit | 18d2f6df6c90c537abf13103a9cc574db1d55fdf (patch) | |
| tree | 4e47906b6b081417ee1dcf20fc5c7e4b58178164 /gcc | |
| parent | 2ecbe5a77cd9dc75942868f1e26b8661fd201ece (diff) | |
| download | ppe42-gcc-18d2f6df6c90c537abf13103a9cc574db1d55fdf.tar.gz ppe42-gcc-18d2f6df6c90c537abf13103a9cc574db1d55fdf.zip | |
Revert last patch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34486 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.ext/pretty2.C | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.other/decl4.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.other/static8.C | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/pretty2.C b/gcc/testsuite/g++.old-deja/g++.ext/pretty2.C index d3e8f100a44..8f69bf4b50f 100644 --- a/gcc/testsuite/g++.old-deja/g++.ext/pretty2.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/pretty2.C @@ -1,4 +1,4 @@ -// 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; diff --git a/gcc/testsuite/g++.old-deja/g++.other/decl4.C b/gcc/testsuite/g++.old-deja/g++.other/decl4.C index a66a8489b0e..d14845290e5 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/decl4.C +++ b/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 *-*-* diff --git a/gcc/testsuite/g++.old-deja/g++.other/static8.C b/gcc/testsuite/g++.old-deja/g++.other/static8.C index deabc088d91..6158f50299d 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/static8.C +++ b/gcc/testsuite/g++.old-deja/g++.other/static8.C @@ -1,6 +1,13 @@ // 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 |
