From b094d6c4bf572654a031ecc4afe675154c886dc5 Mon Sep 17 00:00:00 2001 From: Jing Yu Date: Thu, 22 Jul 2010 14:03:48 -0700 Subject: commit gcc-4.4.3 which is used to build gcc-4.4.3 Android toolchain in master. The source is based on fsf gcc-4.4.3 and contains local patches which are recorded in gcc-4.4.3/README.google. Change-Id: Id8c6d6927df274ae9749196a1cc24dbd9abc9887 --- .../testsuite/21_strings/c_strings/char/1.cc | 69 ++++++++++++++++++++++ .../testsuite/21_strings/c_strings/char/2.cc | 49 +++++++++++++++ .../testsuite/21_strings/c_strings/char/3.cc | 37 ++++++++++++ .../testsuite/21_strings/c_strings/wchar_t/1.cc | 68 +++++++++++++++++++++ .../testsuite/21_strings/c_strings/wchar_t/2.cc | 48 +++++++++++++++ .../21_strings/c_strings/wchar_t/24559.cc | 31 ++++++++++ .../testsuite/21_strings/c_strings/wchar_t/3.cc | 35 +++++++++++ 7 files changed, 337 insertions(+) create mode 100644 gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc create mode 100644 gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/2.cc create mode 100644 gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc create mode 100644 gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc create mode 100644 gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/2.cc create mode 100644 gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/24559.cc create mode 100644 gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc (limited to 'gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings') diff --git a/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc new file mode 100644 index 000000000..67bcac396 --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/1.cc @@ -0,0 +1,69 @@ +// 2001-04-02 Benjamin Kosnik + +// Copyright (C) 2001, 2003, 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 +// . + +// 21.4: null-terminiated sequence utilities + +#include +#include + +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); +} + +int main() +{ + test01(); + return 0; +} diff --git a/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/2.cc b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/2.cc new file mode 100644 index 000000000..464713bed --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/2.cc @@ -0,0 +1,49 @@ +// 2001-04-02 Benjamin Kosnik + +// Copyright (C) 2001, 2003, 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 +// . + +// 21.4: null-terminiated sequence utilities + +#include +#include + +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); +} + +int main() +{ + test02(); + return 0; +} diff --git a/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc new file mode 100644 index 000000000..5e5c514d7 --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc @@ -0,0 +1,37 @@ +// { dg-do compile { target correct_iso_cpp_string_wchar_protos } } +// { dg-options "-O2" } + +#include + +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"); +} diff --git a/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc new file mode 100644 index 000000000..2e7a6c35d --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/1.cc @@ -0,0 +1,68 @@ +// 2001-04-02 Benjamin Kosnik + +// Copyright (C) 2001, 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 +// . + +// 21.4: null-terminiated sequence utilities + +#include +#include +#include + +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); +} + +int main() +{ + test01(); + return 0; +} diff --git a/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/2.cc b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/2.cc new file mode 100644 index 000000000..aea01b0f1 --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/2.cc @@ -0,0 +1,48 @@ +// 2001-04-02 Benjamin Kosnik + +// Copyright (C) 2001, 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 +// . + +// 21.4: null-terminiated sequence utilities + +#include +#include +#include + +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); +} + +int main() +{ + test02(); + return 0; +} diff --git a/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/24559.cc b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/24559.cc new file mode 100644 index 000000000..d1bf1a9eb --- /dev/null +++ b/gcc-4.4.3/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 +// . + +// 21.4: null-terminated sequence utilities + +#include + +// { dg-do compile } + +// libstdc++/24559 +void test01(wchar_t* (*) (wchar_t *, const wchar_t*)) { } + +int main() +{ + test01(std::wcspbrk); + return 0; +} diff --git a/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc new file mode 100644 index 000000000..47c653abb --- /dev/null +++ b/gcc-4.4.3/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc @@ -0,0 +1,35 @@ +// { dg-do compile { target correct_iso_cpp_string_wchar_protos } } +// { dg-options "-O2" } + +#include + +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 = wcspbrk (cw2, L"abc"); // { dg-error "invalid conversion" } + w1 = wcsrchr (cw2, L'c'); // { 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"); +} -- cgit v1.2.3