From 6ad50467e7f1435c23fe69ce862f439752e716fa Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Mon, 15 May 2000 06:38:55 +0000 Subject: [PATCH] mkcshadow: build in more-correct directory... * mkcshadow: build in more-correct directory, create cshadow/ directory if needed, report progress. 2000-05-14 LLeweLLyn Reese * src/Makefile.am: Fix tr commands. * src/Makefile.am: Remove references to [w]stringCTORDUPAL.[lo,cc] * src/string-inst.cc: Remove extra instantiation of S::basic_string(S::size_type, C, S::allocator_type const&); * src/string-inst.cc: Remove extra template keyword. 2000-05-14 Loren J. Rittle * config/bsd/bits/ctype_base.h: Add support for plain BSD4.4. * acinclude.m4 (GLIBCPP_CHECK_CTYPE): Enhance bsd tests. * aclocal.m4: Regenerate. * configure: Regenerate. * */Makefile.in: Regenerate. From-SVN: r33906 --- libstdc++-v3/ChangeLog | 21 ++++++ libstdc++-v3/Makefile.in | 1 - libstdc++-v3/acinclude.m4 | 18 ++++- libstdc++-v3/aclocal.m4 | 18 ++++- libstdc++-v3/config/bsd/bits/ctype_base.h | 21 +++++- libstdc++-v3/configure | 88 +++++++++++++++-------- libstdc++-v3/libio/Makefile.in | 1 - libstdc++-v3/math/Makefile.in | 1 - libstdc++-v3/mkcshadow | 21 +++--- libstdc++-v3/src/Makefile.am | 16 ++--- libstdc++-v3/src/Makefile.in | 67 ++++++++--------- libstdc++-v3/src/string-inst.cc | 10 +-- 12 files changed, 185 insertions(+), 98 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a6f5d8dabce..1d0b95c35e0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,24 @@ +2000-05-14 Nathan Myers + + * mkcshadow: build in more-correct directory, create cshadow/ + directory if needed, report progress. + +2000-05-14 LLeweLLyn Reese + + * src/Makefile.am: Fix tr commands. + * src/Makefile.am: Remove references to [w]stringCTORDUPAL.[lo,cc] + * src/string-inst.cc: Remove extra instantiation of + S::basic_string(S::size_type, C, S::allocator_type const&); + * src/string-inst.cc: Remove extra template keyword. + +2000-05-14 Loren J. Rittle + + * config/bsd/bits/ctype_base.h: Add support for plain BSD4.4. + * acinclude.m4 (GLIBCPP_CHECK_CTYPE): Enhance bsd tests. + * aclocal.m4: Regenerate. + * configure: Regenerate. + * */Makefile.in: Regenerate. + 2000-05-11 Phil Edwards * acinclude.m4: Fix minor typo with ctypes, add more sanity to diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index b2a688c8b86..f51495cb286 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -86,7 +86,6 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -NAMESPACES = @NAMESPACES@ OBJDUMP = @OBJDUMP@ OPTLEVEL = @OPTLEVEL@ PACKAGE = @PACKAGE@ diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 99d7e94fee8..f248858dd44 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -311,8 +311,8 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [ ctype_default=no fi - dnl Test for functionality -- BSD - AC_MSG_CHECKING([ for bsd ]) + dnl Test for functionality -- FreeBSD 4.0 + AC_MSG_CHECKING([ for freebsd 4.0 ]) AC_TRY_COMPILE([#include ], [int foo (int a) @@ -325,6 +325,20 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [ ctype_default=no fi + dnl Test for functionality -- FreeBSD 3.4 + AC_MSG_CHECKING([ for freebsd 3.4 ]) + AC_TRY_COMPILE([#include ], + [int + foo (int a) + { return _S + _R + _C + _U + _L + _A \ + + _D + _P + _X + _G + __istype (a, 0);}], \ + ctype_freebsd34=yes, ctype_freebsd34=no) + AC_MSG_RESULT($ctype_freebsd34) + if test $ctype_freebsd34 = "yes"; then + ctype_include_dir="config/bsd" + ctype_default=no + fi + dnl Test for functionality -- solaris 2.6 and 2.7 if test $ctype_default = "yes"; then AC_MSG_CHECKING([ for solaris 2.[6,7,8] ]) diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 5afad852416..83a52928e14 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -323,8 +323,8 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [ ctype_default=no fi - dnl Test for functionality -- BSD - AC_MSG_CHECKING([ for bsd ]) + dnl Test for functionality -- FreeBSD 4.0 + AC_MSG_CHECKING([ for freebsd 4.0 ]) AC_TRY_COMPILE([#include ], [int foo (int a) @@ -337,6 +337,20 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [ ctype_default=no fi + dnl Test for functionality -- FreeBSD 3.4 + AC_MSG_CHECKING([ for freebsd 3.4 ]) + AC_TRY_COMPILE([#include ], + [int + foo (int a) + { return _S + _R + _C + _U + _L + _A \ + + _D + _P + _X + _G + __istype (a, 0);}], \ + ctype_freebsd34=yes, ctype_freebsd34=no) + AC_MSG_RESULT($ctype_freebsd34) + if test $ctype_freebsd34 = "yes"; then + ctype_include_dir="config/bsd" + ctype_default=no + fi + dnl Test for functionality -- solaris 2.6 and 2.7 if test $ctype_default = "yes"; then AC_MSG_CHECKING([ for solaris 2.[6,7,8] ]) diff --git a/libstdc++-v3/config/bsd/bits/ctype_base.h b/libstdc++-v3/config/bsd/bits/ctype_base.h index 97209efc871..145321f5fee 100644 --- a/libstdc++-v3/config/bsd/bits/ctype_base.h +++ b/libstdc++-v3/config/bsd/bits/ctype_base.h @@ -31,7 +31,10 @@ // ISO C++ 14882: 22.1 Locales // -// Information as gleaned from /usr/include/ctype.h on FreeBSD 4.0 +// Information as gleaned from /usr/include/ctype.h on FreeBSD 3.4, +// 4.0 and all versions of the CVS managed file at: +// :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs/src/include/ctype.h +// which should cover most classic BSD configurations struct ctype_base { @@ -41,6 +44,8 @@ enum { +#ifdef _CTYPE_S + // FreeBSD 4.0 uses this style of define. space = _CTYPE_S, print = _CTYPE_R, cntrl = _CTYPE_C, @@ -52,6 +57,20 @@ xdigit = _CTYPE_X, alnum = _CTYPE_A | _CTYPE_D, graph = _CTYPE_G +#else + // Other BSD's, including Free BSD 3.4, uses this style of define. + space = _S, + print = _R, + cntrl = _C, + upper = _U, + lower = _L, + alpha = _A, + digit = _D, + punct = _P, + xdigit = _X, + alnum = _A | _D, + graph = _G +#endif }; }; diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index a60ed9acbc3..4b79496a366 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -3521,8 +3521,8 @@ rm -f conftest* ctype_default=no fi - echo $ac_n "checking for bsd ""... $ac_c" 1>&6 -echo "configure:3526: checking for bsd " >&5 + echo $ac_n "checking for freebsd 4.0 ""... $ac_c" 1>&6 +echo "configure:3526: checking for freebsd 4.0 " >&5 cat > conftest.$ac_ext < for freebsd 3.4 ""... $ac_c" 1>&6 +echo "configure:3556: checking for freebsd 3.4 " >&5 + cat > conftest.$ac_ext < +int main() { +int + foo (int a) + { return _S + _R + _C + _U + _L + _A \ + + _D + _P + _X + _G + __istype (a, 0);} +; return 0; } +EOF +if { (eval echo configure:3568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + \ + ctype_freebsd34=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ctype_freebsd34=no +fi +rm -f conftest* + echo "$ac_t""$ctype_freebsd34" 1>&6 + if test $ctype_freebsd34 = "yes"; then + ctype_include_dir="config/bsd" + ctype_default=no + fi + if test $ctype_default = "yes"; then echo $ac_n "checking for solaris 2.6,7,8 ""... $ac_c" 1>&6 -echo "configure:3557: checking for solaris 2.6,7,8 " >&5 +echo "configure:3587: checking for solaris 2.6,7,8 " >&5 cat > conftest.$ac_ext < int main() { @@ -3566,7 +3596,7 @@ int + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];} ; return 0; } EOF -if { (eval echo configure:3570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris=yes @@ -3581,7 +3611,7 @@ rm -f conftest* if test $ctype_solaris = "yes"; then echo $ac_n "checking for version""... $ac_c" 1>&6 -echo "configure:3585: checking for version" >&5 +echo "configure:3615: checking for version" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -3590,14 +3620,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { typedef long* __to_type; __to_type const& _M_toupper = __trans_upper; ; return 0; } EOF -if { (eval echo configure:3601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris26=yes @@ -3629,9 +3659,9 @@ cross_compiling=$ac_cv_prog_cc_cross if test $ctype_default = "yes"; then echo $ac_n "checking for solaris 2.5.1 ""... $ac_c" 1>&6 -echo "configure:3633: checking for solaris 2.5.1 " >&5 +echo "configure:3663: checking for solaris 2.5.1 " >&5 cat > conftest.$ac_ext < int main() { @@ -3641,7 +3671,7 @@ int + __ctype[a];} ; return 0; } EOF -if { (eval echo configure:3645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris25=yes @@ -3661,9 +3691,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for aix ""... $ac_c" 1>&6 -echo "configure:3665: checking for aix " >&5 +echo "configure:3695: checking for aix " >&5 cat > conftest.$ac_ext < int main() { @@ -3674,7 +3704,7 @@ int + _VALC('a') + _IS('c', 0);} ; return 0; } EOF -if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_aix=yes @@ -3694,9 +3724,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking for newlib ""... $ac_c" 1>&6 -echo "configure:3698: checking for newlib " >&5 +echo "configure:3728: checking for newlib " >&5 cat > conftest.$ac_ext < int main() { @@ -3706,7 +3736,7 @@ int + _ctype_[a];} ; return 0; } EOF -if { (eval echo configure:3710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_newlib=yes @@ -3740,17 +3770,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3744: checking for $ac_hdr" >&5 +echo "configure:3774: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3779,12 +3809,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3783: checking for $ac_func" >&5 +echo "configure:3813: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3832,7 +3862,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3836: checking for working mmap" >&5 +echo "configure:3866: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3840,7 +3870,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -4043,19 +4073,19 @@ fi if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:4047: checking for LC_MESSAGES" >&5 +echo "configure:4077: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_val_LC_MESSAGES=yes else diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index 920f55e5638..a5fd42ec112 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -86,7 +86,6 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -NAMESPACES = @NAMESPACES@ OBJDUMP = @OBJDUMP@ OPTLEVEL = @OPTLEVEL@ PACKAGE = @PACKAGE@ diff --git a/libstdc++-v3/math/Makefile.in b/libstdc++-v3/math/Makefile.in index 123716e5bdd..9683177ef7c 100644 --- a/libstdc++-v3/math/Makefile.in +++ b/libstdc++-v3/math/Makefile.in @@ -86,7 +86,6 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -NAMESPACES = @NAMESPACES@ OBJDUMP = @OBJDUMP@ OPTLEVEL = @OPTLEVEL@ PACKAGE = @PACKAGE@ diff --git a/libstdc++-v3/mkcshadow b/libstdc++-v3/mkcshadow index 277ecee98a2..b506f1dfeac 100755 --- a/libstdc++-v3/mkcshadow +++ b/libstdc++-v3/mkcshadow @@ -4,9 +4,17 @@ # from stdin, and creates shadow headers under cshadow/, except where # a header of the same name is already in shadow/. +SCRIPTDIR=${0%/*} + +if [ ! -d cshadow ]; then + echo "Creating cshadow." + mkdir cshadow +fi + +echo "Creating..." while read header; do - if [ ! -f shadow/$header ]; then + if [ ! -f $SCRIPTDIR/shadow/$header ]; then # strip off directory names while making # any necessary directories @@ -21,12 +29,13 @@ while read header; do done ;; esac - + + echo " cshadow/$header" UPNAME=`echo $header | tr 'a-z./-' 'A-Z___'` cat >"cshadow/$header" <