obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

4 files changed, 205 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc
new file mode 100644
index 000000000..4702581d9
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc
@@ -0,0 +1,71 @@
+// 2001-04-02  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 21.4: null-terminiated sequence utilities
+
+#include <string>
+#include <cstring>
+#include <cwchar>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  wchar_t c = L'a';
+  const wchar_t cc = L'b';
+  wchar_t* c1 = &c;
+  const wchar_t* cc1 = &cc;
+  const wchar_t* ccarray1 = L"san francisco roof garden inspectors";
+  const wchar_t* ccarray2 = L"san francisco sunny-day park inspectors";
+  wchar_t carray[50];
+  std::wcscpy(carray, ccarray1);
+  
+  // const wchar_t* wcschr(const wchar_t* s, wchar_t c);
+  // wchar_t* wcschr(wchar_t* s, wchar_t c);
+  cc1 = std::wcschr(ccarray1, L'c');
+  c1 = std::wcschr(carray, L'c');
+
+  // const char* wcspbrk(const wchar_t* s1, const wchar_t* s2);
+  // char* wcspbrk(wchar_t* s1, const wchar_t* s2);
+  cc1 = std::wcspbrk(ccarray1, ccarray2);
+  c1 = std::wcspbrk(carray, ccarray2);
+
+  // const wchar_t* strrchr(const wchar_t* s, wchar_t c);
+  // wchar_t* strrchr(wchar_t* s, wchar_t c);
+  cc1 = std::wcsrchr(ccarray1, L'c');
+  c1 = std::wcsrchr(carray, L'c');
+
+  // const wchar_t* strstr(const wchar_t* s1, const wchar_t* s2);
+  // wchar_t* strstr(wchar_t* s1, const wchar_t* s2);
+  cc1 = std::wcsstr(ccarray1, ccarray2);
+  c1 = std::wcsstr(carray, carray);
+
+  // const wchar_t* wmemchr(const wchar_t* s, wchar_t c, size_t n);
+  // wchar_t* wmemchr(      wchar_t* s, wchar_t c, size_t n);
+  cc1 = std::wmemchr(ccarray1, L'a', 3);
+  c1 = std::wmemchr(carray, L'a', 3);
+
+  cc1 = cc1; // Suppress unused warnings.
+  c1 = c1;
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/2.cc
new file mode 100644
index 000000000..7637ecddf
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/2.cc
@@ -0,0 +1,51 @@
+// 2001-04-02  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 21.4: null-terminiated sequence utilities
+
+#include <string>
+#include <cstring>
+#include <cwchar>
+
+void test02()
+{
+  using namespace std;
+
+  const wchar_t* ccarray1 = L"san francisco roof garden inspectors";
+  const wchar_t* ccarray2 = L"san francisco sunny-day park inspectors";
+  wchar_t carray[50];
+  wcscpy(carray, ccarray1);
+  const wchar_t* cw;
+  wchar_t* w;
+
+  cw = wmemchr(ccarray1, L'/', 3);
+  cw = wcschr(ccarray1, L'/');
+  cw = wcspbrk(ccarray1, ccarray2);
+  cw = wcsrchr(ccarray1, L'c');
+  w = wcsstr(carray, carray);
+
+  cw = cw; // Suppress unused warnings.
+  w = w;
+}
+
+int main()
+{
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/24559.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/24559.cc
new file mode 100644
index 000000000..d1bf1a9eb
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/24559.cc
@@ -0,0 +1,31 @@
+// Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 21.4: null-terminated sequence utilities
+
+#include <cwchar>
+
+// { dg-do compile }
+
+// libstdc++/24559
+void test01(wchar_t* (*) (wchar_t *, const wchar_t*)) { }
+
+int main()
+{
+  test01(std::wcspbrk);
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
new file mode 100644
index 000000000..2c875fdde
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
@@ -0,0 +1,52 @@
+// { dg-do compile { target correct_iso_cpp_string_wchar_protos } }
+// { dg-options "-O2" }
+
+// Copyright (C) 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <cwchar>
+
+const wchar_t *cw1, *cw2;
+wchar_t *w1, *w2;
+
+void
+test01 ()
+{
+  w1 = wmemchr (w2, L'/', 3);
+  w1 = wcschr (w2, L'/');
+  w1 = wcspbrk (w2, L"abc");
+  w1 = wcsrchr (w2, L'c');
+  w1 = wcsstr (w2, L"abc");
+
+  cw1 = wmemchr (w2, L'/', 3);
+  cw1 = wcschr (w2, L'/');
+  cw1 = wcspbrk (w2, L"abc");
+  cw1 = wcsrchr (w2, L'c');
+  cw1 = wcsstr (w2, L"abc");
+
+  w1 = wmemchr (cw2, L'/', 3);		// { dg-error "invalid conversion" }
+  w1 = wcschr (cw2, L'/');		// { dg-error "invalid conversion" }
+  w1 = wcsrchr (cw2, L'c');		// { dg-error "invalid conversion" }
+  w1 = wcspbrk (cw2, L"abc");		// { dg-error "invalid conversion" }
+  w1 = wcsstr (cw2, L"abc");		// { dg-error "invalid conversion" }
+
+  cw1 = wmemchr (cw2, L'/', 3);
+  cw1 = wcschr (cw2, L'/');
+  cw1 = wcspbrk (cw2, L"abc");
+  cw1 = wcsrchr (cw2, L'c');
+  cw1 = wcsstr (cw2, L"abc");
+}