2003-09-25 Brad Spencer <spencer@infointeractive.com>

	PR libstdc++/6072
	* acinclude.m4:
	* aclocal.m4: Regenerate.
	* config.h.in: Regenerate.
	* configure: Regenerate.
	* crossconfig.m4: Add in wchar_t bits for solaris crosses.
	* config/io/basic_file_stdio.cc: Guard unistd.h.
	* include/c_compatibility/wchar.h: Guard extra wchar_t functionality.
	* include/c_std/std_cwchar.h: Same.
	* include/c_std/std_cwctype.h: Same.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71795 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 108 insertions, 5 deletions

diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index cec7a6257b8..db31b7eca74 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -208,17 +208,120 @@ case "${host}" in
     AC_DEFINE(HAVE_SINHL)
     ;;
   *-solaris*)
-    #case "$target" in
+    case "$target" in
     #  *-solaris2.5)
     #    os_include_dir="os/solaris/solaris2.5"
     #    ;;
     #  *-solaris2.6)
     #    os_include_dir="os/solaris/solaris2.6"
     #    ;;
-    #  *-solaris2.7 | *-solaris2.8 | *-solaris2.9)
-    #    os_include_dir="os/solaris/solaris2.7"
-    #    ;;
-    #esac
+      *-solaris2.7 | *-solaris2.8 | *-solaris2.9 | *-solaris2.10)
+         AC_DEFINE(HAVE_GETPAGESIZE)
+         AC_DEFINE(HAVE_SIGSETJMP)
+         AC_DEFINE(HAVE_MBSTATE_T)
+         AC_DEFINE(HAVE_POLL)
+         AC_DEFINE(HAVE_S_ISREG)
+         AC_DEFINE(HAVE_LC_MESSAGES)
+         AC_DEFINE(HAVE_BTOWC)
+         AC_DEFINE(HAVE_DRAND48)
+         AC_DEFINE(HAVE_FGETWC)
+         AC_DEFINE(HAVE_FGETWS)
+         AC_DEFINE(HAVE_FINITE)
+         AC_DEFINE(HAVE_FPCLASS)
+         AC_DEFINE(HAVE_FPUTWC)
+         AC_DEFINE(HAVE_FPUTWS)
+         AC_DEFINE(HAVE_FWIDE)
+         AC_DEFINE(HAVE_FWPRINTF)
+         AC_DEFINE(HAVE_FWSCANF)
+         AC_DEFINE(HAVE_GETPAGESIZE)
+         AC_DEFINE(HAVE_GETWC)
+         AC_DEFINE(HAVE_GETWCHAR)
+         AC_DEFINE(HAVE_ISATTY)
+         AC_DEFINE(HAVE_MBRLEN)
+         AC_DEFINE(HAVE_MBRTOWC)
+         AC_DEFINE(HAVE_MBSINIT)
+         AC_DEFINE(HAVE_MBSRTOWCS)
+         AC_DEFINE(HAVE_NL_LANGINFO)
+         AC_DEFINE(HAVE_PUTWC)
+         AC_DEFINE(HAVE_PUTWCHAR)
+         AC_DEFINE(HAVE_SWPRINTF)
+         AC_DEFINE(HAVE_SWSCANF)
+         AC_DEFINE(HAVE_UNGETWC)
+         AC_DEFINE(HAVE_VFWPRINTF)
+         AC_DEFINE(HAVE_VSWPRINTF)
+         AC_DEFINE(HAVE_VWPRINTF)
+         AC_DEFINE(HAVE_WCRTOMB)
+         AC_DEFINE(HAVE_WCSCAT)
+         AC_DEFINE(HAVE_WCSCHR)
+         AC_DEFINE(HAVE_WCSCMP)
+         AC_DEFINE(HAVE_WCSCOLL)
+         AC_DEFINE(HAVE_WCSCPY)
+         AC_DEFINE(HAVE_WCSCSPN)
+         AC_DEFINE(HAVE_WCSFTIME)
+         AC_DEFINE(HAVE_WCSLEN)
+         AC_DEFINE(HAVE_WCSNCAT)
+         AC_DEFINE(HAVE_WCSNCMP)
+         AC_DEFINE(HAVE_WCSNCPY)
+         AC_DEFINE(HAVE_WCSPBRK)
+         AC_DEFINE(HAVE_WCSRCHR)
+         AC_DEFINE(HAVE_WCSRTOMBS)
+         AC_DEFINE(HAVE_WCSSPN)
+         AC_DEFINE(HAVE_WCSSTR)
+         AC_DEFINE(HAVE_WCSTOD)
+         AC_DEFINE(HAVE_WCSTOK)
+         AC_DEFINE(HAVE_WCSTOL)
+         AC_DEFINE(HAVE_WCSTOUL)
+         AC_DEFINE(HAVE_WCSXFRM)
+         AC_DEFINE(HAVE_WCTOB)
+         AC_DEFINE(HAVE_WMEMCHR)
+         AC_DEFINE(HAVE_WMEMCMP)
+         AC_DEFINE(HAVE_WMEMCPY)
+         AC_DEFINE(HAVE_WMEMMOVE)
+         AC_DEFINE(HAVE_WMEMSET)
+         AC_DEFINE(HAVE_WPRINTF)
+         AC_DEFINE(HAVE_WSCANF)
+         AC_DEFINE(HAVE_ICONV)
+         AC_DEFINE(HAVE_ICONV_CLOSE)
+         AC_DEFINE(HAVE_ICONV_OPEN)
+         # Look for the pieces required for wchar_t support in order to
+         # get all the right HAVE_* macros defined.
+         GLIBCXX_CHECK_WCHAR_T_SUPPORT
+         # All of the dependencies for wide character support are here, so
+         # turn it on.  This requires some syncronization with the
+         # GLIBCXX_CHECK_WCHAR_T_SUPPORT in acinclude.m4
+         AC_DEFINE(_GLIBCXX_USE_WCHAR_T) 
+         # Are these tested for even when cross?
+         AC_DEFINE(HAVE_FLOAT_H)
+         AC_DEFINE(HAVE_IEEEFP_H)
+         AC_DEFINE(HAVE_INTTYPES_H)
+         AC_DEFINE(HAVE_LOCALE_H)
+         AC_DEFINE(HAVE_NAN_H)
+         AC_DEFINE(HAVE_SYS_FILIO_H)
+         AC_DEFINE(HAVE_SYS_IOCTL_H)
+         AC_DEFINE(HAVE_SYS_ISA_DEFS_H)
+         AC_DEFINE(HAVE_SYS_RESOURCE_H)
+         AC_DEFINE(HAVE_SYS_TIME_H)
+         AC_DEFINE(HAVE_SYS_TYPES_H)
+         AC_DEFINE(HAVE_UNISTD_H)
+         AC_DEFINE(HAVE_WCHAR_H)
+         AC_DEFINE(HAVE_WCTYPE_H)
+         AC_DEFINE(HAVE_LIBM)
+        ;;
+    esac
+    case "$target" in
+      sparc*-*-solaris2.8 | sparc*-*-solaris2.9 | sparc*-*-solaris2.10)
+        # I saw these on sparc-sun-solaris2.8, but not 2.6, and not on i386
+        AC_DEFINE(HAVE___BUILTIN_ABS)
+        AC_DEFINE(HAVE___BUILTIN_LABS)
+        AC_DEFINE(HAVE___BUILTIN_FABS)
+        AC_DEFINE(HAVE___BUILTIN_FABSF)
+        AC_DEFINE(HAVE___BUILTIN_FABSL)
+        AC_DEFINE(HAVE___BUILTIN_COS)
+        AC_DEFINE(HAVE___BUILTIN_COSF)
+        AC_DEFINE(HAVE___BUILTIN_SIN)
+        AC_DEFINE(HAVE___BUILTIN_SINF)
+       ;;
+    esac
     AC_DEFINE(HAVE_STRTOF)
     AC_DEFINE(HAVE_STRTOLD)
     AC_DEFINE(HAVE_MMAP)