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.

3 files changed, 179 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc
new file mode 100644
index 000000000..9142018d0
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc
@@ -0,0 +1,72 @@
+// 2001-04-02  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2003, 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>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  char c = 'a';
+  const char cc = 'b';
+  char* c1 = &c;
+  const char* cc1 = &cc;
+  const char* ccarray1 = "san francisco roof garden inspectors";
+  const char* ccarray2 = "san francisco sunny-day park inspectors";
+  char carray[50];
+  std::strcpy(carray, ccarray1);
+  void* v = carray;
+  const void* cv = ccarray1;
+  
+  // const char* strchr(const char* s, int c);
+  // char* strchr(char* s, int c);
+  cc1 = std::strchr(ccarray1, 'c');
+  c1 = std::strchr(carray, 'c');
+
+  // const char* strpbrk(const char* s1, const char* s2);
+  // char* strpbrk(char* s1, const char* s2);
+  cc1 = std::strpbrk(ccarray1, ccarray2);
+  c1 = std::strpbrk(carray, ccarray2);
+
+  // const char* strrchr(const char* s, int c);
+  // char* strrchr(char* s, int c);
+  cc1 = std::strrchr(ccarray1, 'c');
+  c1 = std::strrchr(carray, 'c');
+
+  // const char* strstr(const char* s1, const char* s2);
+  // char* strstr(char* s1, const char* s2);
+  cc1 = std::strstr(ccarray1, ccarray2);
+  c1 = std::strstr(carray, carray);
+
+  // const void* memchr(const void* s, int c, size_t n);
+  // void* memchr(      void* s, int c, size_t n);
+  cv = std::memchr(cv, 'a', 3);
+  v = std::memchr(v, 'a', 3);
+
+  cc1 = cc1; // Suppress unused warnings.
+  c1 = c1;
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/2.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/2.cc
new file mode 100644
index 000000000..5d7519004
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/char/2.cc
@@ -0,0 +1,53 @@
+// 2001-04-02  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2003, 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>
+
+void test02()
+{
+  using namespace std;
+
+  const char* ccarray1 = "san francisco roof garden inspectors";
+  const char* ccarray2 = "san francisco sunny-day park inspectors";
+  char carray[50];
+  strcpy(carray, ccarray1);
+  const void* cv = ccarray1;
+  const void* cv1;
+  const char* cc;
+  char* c;
+
+  cv1 = memchr(cv, '/', 3);
+  cc = strchr(ccarray1, '/');
+  cc = strrchr(ccarray1, 'c');
+  cc = strpbrk(ccarray1, ccarray2);
+  c = strstr(carray, carray);
+
+  cv1 = cv1; // Suppress unused warnings.
+  cc = cc;
+  c = c;
+}
+
+int main()
+{
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc
new file mode 100644
index 000000000..3b2543837
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc
@@ -0,0 +1,54 @@
+// { 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 <cstring>
+
+const char *cc1, *cc2;
+char *c1, *c2;
+const void *cv1, *cv2;
+void *v1, *v2;
+
+void
+test01 ()
+{
+  v1 = std::memchr (v2, '/', 3);
+  c1 = std::strchr (c2, '/');
+  c1 = std::strrchr (c2, 'c');
+  c1 = std::strpbrk (c2, "abc");
+  c1 = std::strstr (c2, "abc");
+
+  cv1 = std::memchr (v2, '/', 3);
+  cc1 = std::strchr (c2, '/');
+  cc1 = std::strrchr (c2, 'c');
+  cc1 = std::strpbrk (c2, "abc");
+  cc1 = std::strstr (c2, "abc");
+
+  v1 = std::memchr (cv2, '/', 3);	// { dg-error "invalid conversion" }
+  c1 = std::strchr (cc2, '/');		// { dg-error "invalid conversion" }
+  c1 = std::strrchr (cc2, 'c');		// { dg-error "invalid conversion" }
+  c1 = std::strpbrk (cc2, "abc");	// { dg-error "invalid conversion" }
+  c1 = std::strstr (cc2, "abc");	// { dg-error "invalid conversion" }
+
+  cv1 = std::memchr (cv2, '/', 3);
+  cc1 = std::strchr (cc2, '/');
+  cc1 = std::strrchr (cc2, 'c');
+  cc1 = std::strpbrk (cc2, "abc");
+  cc1 = std::strstr (cc2, "abc");
+}