FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mkcshadow: build in more-correct directory...

Browse source 
* mkcshadow: build in more-correct directory, create cshadow/
        directory if needed, report progress.

2000-05-14  LLeweLLyn Reese  <llewelly@dbritsch.dsl.xmission.com>

        * 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  <ljrittle@acm.org>

        * 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
This commit is contained in:
Benjamin Kosnik 2000-05-15 06:38:55 +00:00
parent 1888228d16
commit 6ad50467e7
12 changed files with 185 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,24 @@
2000-05-14 Nathan Myers <ncm@cantrip.org>
* mkcshadow: build in more-correct directory, create cshadow/
directory if needed, report progress.
2000-05-14 LLeweLLyn Reese <llewelly@dbritsch.dsl.xmission.com>
* 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 <ljrittle@acm.org>
* 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 <pme@sourceware.cygnus.com>
* acinclude.m4: Fix minor typo with ctypes, add more sanity to

1
libstdc++-v3/Makefile.in
View file

@ -86,7 +86,6 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NAMESPACES = @NAMESPACES@
OBJDUMP = @OBJDUMP@
OPTLEVEL = @OPTLEVEL@
PACKAGE = @PACKAGE@

18
libstdc++-v3/acinclude.m4
View file

@ -311,8 +311,8 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_default=no
fi
dnl Test for <ctype> functionality -- BSD
AC_MSG_CHECKING([<ctype> for bsd ])
dnl Test for <ctype> functionality -- FreeBSD 4.0
AC_MSG_CHECKING([<ctype> for freebsd 4.0 ])
AC_TRY_COMPILE([#include <ctype.h>],
[int
foo (int a)
@ -325,6 +325,20 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_default=no
fi
dnl Test for <ctype> functionality -- FreeBSD 3.4
AC_MSG_CHECKING([<ctype> for freebsd 3.4 ])
AC_TRY_COMPILE([#include <ctype.h>],
[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 <ctype> functionality -- solaris 2.6 and 2.7
if test $ctype_default = "yes"; then
AC_MSG_CHECKING([<ctype> for solaris 2.[6,7,8] ])

18
libstdc++-v3/aclocal.m4 vendored
View file

@ -323,8 +323,8 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_default=no
fi
dnl Test for <ctype> functionality -- BSD
AC_MSG_CHECKING([<ctype> for bsd ])
dnl Test for <ctype> functionality -- FreeBSD 4.0
AC_MSG_CHECKING([<ctype> for freebsd 4.0 ])
AC_TRY_COMPILE([#include <ctype.h>],
[int
foo (int a)
@ -337,6 +337,20 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_default=no
fi
dnl Test for <ctype> functionality -- FreeBSD 3.4
AC_MSG_CHECKING([<ctype> for freebsd 3.4 ])
AC_TRY_COMPILE([#include <ctype.h>],
[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 <ctype> functionality -- solaris 2.6 and 2.7
if test $ctype_default = "yes"; then
AC_MSG_CHECKING([<ctype> for solaris 2.[6,7,8] ])

21
libstdc++-v3/config/bsd/bits/ctype_base.h
View file

@ -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
};
};

88
libstdc++-v3/configure vendored
View file

@ -3521,8 +3521,8 @@ rm -f conftest*
ctype_default=no
fi
echo $ac_n "checking <ctype> for bsd ""... $ac_c" 1>&6
echo "configure:3526: checking <ctype> for bsd " >&5
echo $ac_n "checking <ctype> for freebsd 4.0 ""... $ac_c" 1>&6
echo "configure:3526: checking <ctype> for freebsd 4.0 " >&5
cat > conftest.$ac_ext <<EOF
#line 3528 "configure"
#include "confdefs.h"
@ -3551,11 +3551,41 @@ rm -f conftest*
ctype_default=no
fi
echo $ac_n "checking <ctype> for freebsd 3.4 ""... $ac_c" 1>&6
echo "configure:3556: checking <ctype> for freebsd 3.4 " >&5
cat > conftest.$ac_ext <<EOF
#line 3558 "configure"
#include "confdefs.h"
#include <ctype.h>
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 <ctype> for solaris 2.6,7,8 ""... $ac_c" 1>&6
echo "configure:3557: checking <ctype> for solaris 2.6,7,8 " >&5
echo "configure:3587: checking <ctype> for solaris 2.6,7,8 " >&5
cat > conftest.$ac_ext <<EOF
#line 3559 "configure"
#line 3589 "configure"
#include "confdefs.h"
#include <ctype.h>
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 <<EOF
#line 3594 "configure"
#line 3624 "configure"
#include "confdefs.h"
#include <ctype.h>
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 <ctype> for solaris 2.5.1 ""... $ac_c" 1>&6
echo "configure:3633: checking <ctype> for solaris 2.5.1 " >&5
echo "configure:3663: checking <ctype> for solaris 2.5.1 " >&5
cat > conftest.$ac_ext <<EOF
#line 3635 "configure"
#line 3665 "configure"
#include "confdefs.h"
#include <ctype.h>
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 <ctype> for aix ""... $ac_c" 1>&6
echo "configure:3665: checking <ctype> for aix " >&5
echo "configure:3695: checking <ctype> for aix " >&5
cat > conftest.$ac_ext <<EOF
#line 3667 "configure"
#line 3697 "configure"
#include "confdefs.h"
#include <ctype.h>
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 <ctype> for newlib ""... $ac_c" 1>&6
echo "configure:3698: checking <ctype> for newlib " >&5
echo "configure:3728: checking <ctype> for newlib " >&5
cat > conftest.$ac_ext <<EOF
#line 3700 "configure"
#line 3730 "configure"
#include "confdefs.h"
#include <ctype.h>
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
#line 3749 "configure"
#line 3779 "configure"
#include "confdefs.h"
#include <$ac_hdr>
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 <<EOF
#line 3788 "configure"
#line 3818 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -3807,7 +3837,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:3811: \"$ac_link\") 1>&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 <<EOF
#line 3844 "configure"
#line 3874 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@ -3980,7 +4010,7 @@ main()
}
EOF
if { (eval echo configure:3984: \"$ac_link\") 1>&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 <<EOF
#line 4052 "configure"
#line 4082 "configure"
#include "confdefs.h"
#include <locale.h>
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

1
libstdc++-v3/libio/Makefile.in
View file

@ -86,7 +86,6 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NAMESPACES = @NAMESPACES@
OBJDUMP = @OBJDUMP@
OPTLEVEL = @OPTLEVEL@
PACKAGE = @PACKAGE@

1
libstdc++-v3/math/Makefile.in
View file

@ -86,7 +86,6 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NAMESPACES = @NAMESPACES@
OBJDUMP = @OBJDUMP@
OPTLEVEL = @OPTLEVEL@
PACKAGE = @PACKAGE@

21
libstdc++-v3/mkcshadow
View file

@ -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" <<EOF
// -*- C++ -*- header wrapper.
// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
// Copyright (C) 1997, 1998, 1999, 2000 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
@ -73,11 +82,7 @@ while read header; do
# endif /* _IN_C_SWAMP_ */
#endif /* _INCLUDED_CPP_${UPNAME}_ */
EOF
#################### end ####################
fi
done

16
libstdc++-v3/src/Makefile.am
View file

@ -171,7 +171,7 @@ cpu_headers = \
string_sources = \
stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \
stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \
stringCTORPAL.cc stringCTORDUPAL.cc stringCTORPP.cc stringCTORII.cc \
stringCTORPAL.cc stringCTORPP.cc stringCTORII.cc \
stringMUTATE.cc stringRESERVE.cc \
stringSWAP.cc stringSLOP.cc \
stringRESIZE.cc stringAPPCOPY.cc stringAPPCPR.cc stringAPPPR.cc \
@ -190,7 +190,7 @@ string_sources = \
wstring_sources = \
wstringMAIN.cc wstringCTORNC.cc wstringCTORAL.cc \
wstringCTORCPR.cc wstringCTORCPRAL.cc wstringCTORPRAL.cc \
wstringCTORPAL.cc wstringCTORDUPAL.cc wstringCTORPP.cc \
wstringCTORPAL.cc wstringCTORPP.cc \
wstringCTORII.cc \
wstringMUTATE.cc wstringRESERVE.cc \
wstringSWAP.cc wstringSLOP.cc \
@ -293,7 +293,6 @@ stringCTORCPR.lo \
stringCTORCPRAL.lo \
stringCTORPRAL.lo \
stringCTORPAL.lo \
stringCTORDUPAL.lo \
stringCTORPP.lo \
stringCTORII.lo \
stringMUTATE.lo \
@ -343,7 +342,7 @@ stringGETLINE.lo \
stringSCOPY.lo \
stringEQ.lo : string-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@
wstringMAIN.lo \
wstringCTORNC.lo \
@ -352,7 +351,6 @@ wstringCTORCPR.lo \
wstringCTORCPRAL.lo \
wstringCTORPRAL.lo \
wstringCTORPAL.lo \
wstringCTORDUPAL.lo \
wstringCTORPP.lo \
wstringCTORII.lo \
wstringMUTATE.lo \
@ -402,7 +400,7 @@ wstringGETLINE.lo \
wstringSCOPY.lo \
wstringEQ.lo : string-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` -DC=wchar_t $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@
stringMAIN.o \
stringCTORNC.o \
@ -411,7 +409,6 @@ stringCTORCPR.o \
stringCTORCPRAL.o \
stringCTORPRAL.o \
stringCTORPAL.o \
stringCTORDUPAL.o \
stringCTORPP.o \
stringCTORII.o \
stringMUTATE.o \
@ -461,7 +458,7 @@ stringGETLINE.o \
stringSCOPY.o \
stringEQ.o : string-inst.cc
$(CXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@
wstringMAIN.o \
wstringCTORNC.o \
@ -470,7 +467,6 @@ wstringCTORCPR.o \
wstringCTORCPRAL.o \
wstringCTORPRAL.o \
wstringCTORPAL.o \
wstringCTORDUPAL.o \
wstringCTORPP.o \
wstringCTORII.o \
wstringMUTATE.o \
@ -520,4 +516,4 @@ wstringGETLINE.o \
wstringSCOPY.o \
wstringEQ.o : string-inst.cc
$(CXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` -DC=wchar_t $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@

67
libstdc++-v3/src/Makefile.in
View file

@ -254,7 +254,7 @@ cpu_headers = \
string_sources = \
stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \
stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \
stringCTORPAL.cc stringCTORDUPAL.cc stringCTORPP.cc stringCTORII.cc \
stringCTORPAL.cc stringCTORPP.cc stringCTORII.cc \
stringMUTATE.cc stringRESERVE.cc \
stringSWAP.cc stringSLOP.cc \
stringRESIZE.cc stringAPPCOPY.cc stringAPPCPR.cc stringAPPPR.cc \
@ -274,7 +274,7 @@ string_sources = \
wstring_sources = \
wstringMAIN.cc wstringCTORNC.cc wstringCTORAL.cc \
wstringCTORCPR.cc wstringCTORCPRAL.cc wstringCTORPRAL.cc \
wstringCTORPAL.cc wstringCTORDUPAL.cc wstringCTORPP.cc \
wstringCTORPAL.cc wstringCTORPP.cc \
wstringCTORII.cc \
wstringMUTATE.cc wstringRESERVE.cc \
wstringSWAP.cc wstringSLOP.cc \
@ -338,36 +338,35 @@ libinst_string_la_LDFLAGS =
libinst_string_la_LIBADD =
libinst_string_la_OBJECTS = stringMAIN.lo stringCTORNC.lo \
stringCTORAL.lo stringCTORCPR.lo stringCTORCPRAL.lo stringCTORPRAL.lo \
stringCTORPAL.lo stringCTORDUPAL.lo stringCTORPP.lo stringCTORII.lo \
stringMUTATE.lo stringRESERVE.lo stringSWAP.lo stringSLOP.lo \
stringRESIZE.lo stringAPPCOPY.lo stringAPPCPR.lo stringAPPPR.lo \
stringAPPDUP.lo stringAPPII.lo stringASSCP.lo stringASSII.lo \
stringINSII.lo stringREPRR.lo stringREPIIDUP.lo stringREPII.lo \
stringREPIII.lo stringREP4I.lo stringREPIIPP.lo stringREPIIPP2.lo \
stringCOPY.lo stringCONII.lo stringCONIIF.lo stringCONPPF.lo \
stringCONPPF2.lo stringCONSC.lo stringFIND.lo stringFINDC.lo \
stringRFIND.lo stringRFINDC.lo stringFFO.lo stringFLO.lo stringFFNO.lo \
stringFLNO.lo stringFLNOC.lo stringCOMPARE.lo stringCOMPARE2.lo \
stringCOMPAREP.lo stringCOMPAREP2.lo stringADDPS.lo stringADDCS.lo \
stringEXTRACT.lo stringINSERT.lo stringGETLINE.lo stringSCOPY.lo \
stringEQ.lo
stringCTORPAL.lo stringCTORPP.lo stringCTORII.lo stringMUTATE.lo \
stringRESERVE.lo stringSWAP.lo stringSLOP.lo stringRESIZE.lo \
stringAPPCOPY.lo stringAPPCPR.lo stringAPPPR.lo stringAPPDUP.lo \
stringAPPII.lo stringASSCP.lo stringASSII.lo stringINSII.lo \
stringREPRR.lo stringREPIIDUP.lo stringREPII.lo stringREPIII.lo \
stringREP4I.lo stringREPIIPP.lo stringREPIIPP2.lo stringCOPY.lo \
stringCONII.lo stringCONIIF.lo stringCONPPF.lo stringCONPPF2.lo \
stringCONSC.lo stringFIND.lo stringFINDC.lo stringRFIND.lo \
stringRFINDC.lo stringFFO.lo stringFLO.lo stringFFNO.lo stringFLNO.lo \
stringFLNOC.lo stringCOMPARE.lo stringCOMPARE2.lo stringCOMPAREP.lo \
stringCOMPAREP2.lo stringADDPS.lo stringADDCS.lo stringEXTRACT.lo \
stringINSERT.lo stringGETLINE.lo stringSCOPY.lo stringEQ.lo
libinst_wstring_la_LDFLAGS =
libinst_wstring_la_LIBADD =
libinst_wstring_la_OBJECTS = wstringMAIN.lo wstringCTORNC.lo \
wstringCTORAL.lo wstringCTORCPR.lo wstringCTORCPRAL.lo \
wstringCTORPRAL.lo wstringCTORPAL.lo wstringCTORDUPAL.lo \
wstringCTORPP.lo wstringCTORII.lo wstringMUTATE.lo wstringRESERVE.lo \
wstringSWAP.lo wstringSLOP.lo wstringRESIZE.lo wstringAPPCOPY.lo \
wstringAPPCPR.lo wstringAPPPR.lo wstringAPPDUP.lo wstringAPPII.lo \
wstringASSCP.lo wstringASSII.lo wstringINSII.lo wstringREPRR.lo \
wstringREPIIDUP.lo wstringREPII.lo wstringREPIII.lo wstringREP4I.lo \
wstringREPIIPP.lo wstringREPIIPP2.lo wstringCOPY.lo wstringCONII.lo \
wstringCONIIF.lo wstringCONPPF.lo wstringCONPPF2.lo wstringCONSC.lo \
wstringFIND.lo wstringFINDC.lo wstringRFIND.lo wstringRFINDC.lo \
wstringFFO.lo wstringFLO.lo wstringFFNO.lo wstringFLNO.lo \
wstringFLNOC.lo wstringCOMPARE.lo wstringCOMPARE2.lo wstringCOMPAREP.lo \
wstringCOMPAREP2.lo wstringADDPS.lo wstringADDCS.lo wstringEXTRACT.lo \
wstringINSERT.lo wstringGETLINE.lo wstringSCOPY.lo wstringEQ.lo
wstringCTORPRAL.lo wstringCTORPAL.lo wstringCTORPP.lo wstringCTORII.lo \
wstringMUTATE.lo wstringRESERVE.lo wstringSWAP.lo wstringSLOP.lo \
wstringRESIZE.lo wstringAPPCOPY.lo wstringAPPCPR.lo wstringAPPPR.lo \
wstringAPPDUP.lo wstringAPPII.lo wstringASSCP.lo wstringASSII.lo \
wstringINSII.lo wstringREPRR.lo wstringREPIIDUP.lo wstringREPII.lo \
wstringREPIII.lo wstringREP4I.lo wstringREPIIPP.lo wstringREPIIPP2.lo \
wstringCOPY.lo wstringCONII.lo wstringCONIIF.lo wstringCONPPF.lo \
wstringCONPPF2.lo wstringCONSC.lo wstringFIND.lo wstringFINDC.lo \
wstringRFIND.lo wstringRFINDC.lo wstringFFO.lo wstringFLO.lo \
wstringFFNO.lo wstringFLNO.lo wstringFLNOC.lo wstringCOMPARE.lo \
wstringCOMPARE2.lo wstringCOMPAREP.lo wstringCOMPAREP2.lo \
wstringADDPS.lo wstringADDCS.lo wstringEXTRACT.lo wstringINSERT.lo \
wstringGETLINE.lo wstringSCOPY.lo wstringEQ.lo
libstdc___la_OBJECTS = limitsMEMBERS.lo c++io.lo cmath.lo complex.lo \
complexf.lo complexl.lo complex_io.lo stdexcept.lo ios.lo stdstreams.lo \
strstream.lo locale.lo localename.lo locale-inst.lo stl-inst.lo \
@ -646,7 +645,6 @@ stringCTORCPR.lo \
stringCTORCPRAL.lo \
stringCTORPRAL.lo \
stringCTORPAL.lo \
stringCTORDUPAL.lo \
stringCTORPP.lo \
stringCTORII.lo \
stringMUTATE.lo \
@ -696,7 +694,7 @@ stringGETLINE.lo \
stringSCOPY.lo \
stringEQ.lo : string-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@
wstringMAIN.lo \
wstringCTORNC.lo \
@ -705,7 +703,6 @@ wstringCTORCPR.lo \
wstringCTORCPRAL.lo \
wstringCTORPRAL.lo \
wstringCTORPAL.lo \
wstringCTORDUPAL.lo \
wstringCTORPP.lo \
wstringCTORII.lo \
wstringMUTATE.lo \
@ -755,7 +752,7 @@ wstringGETLINE.lo \
wstringSCOPY.lo \
wstringEQ.lo : string-inst.cc
$(LTCXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` -DC=wchar_t $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@
stringMAIN.o \
stringCTORNC.o \
@ -764,7 +761,6 @@ stringCTORCPR.o \
stringCTORCPRAL.o \
stringCTORPRAL.o \
stringCTORPAL.o \
stringCTORDUPAL.o \
stringCTORPP.o \
stringCTORII.o \
stringMUTATE.o \
@ -814,7 +810,7 @@ stringGETLINE.o \
stringSCOPY.o \
stringEQ.o : string-inst.cc
$(CXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` $< -o $@
wstringMAIN.o \
wstringCTORNC.o \
@ -823,7 +819,6 @@ wstringCTORCPR.o \
wstringCTORCPRAL.o \
wstringCTORPRAL.o \
wstringCTORPAL.o \
wstringCTORDUPAL.o \
wstringCTORPP.o \
wstringCTORII.o \
wstringMUTATE.o \
@ -873,7 +868,7 @@ wstringGETLINE.o \
wstringSCOPY.o \
wstringEQ.o : string-inst.cc
$(CXXCOMPILE) -fimplicit-templates \
-c -D`echo $@ | tr -dc 'A-Z'` -DC=wchar_t $< -o $@
-c -D`echo $@ | tr -dc '0-9A-Z'` -DC=wchar_t $< -o $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

10
libstdc++-v3/src/string-inst.cc
View file

@ -98,12 +98,6 @@ namespace std
C const*, S::allocator_type const&);
#endif
#ifdef CTORDUPAL
template
S::basic_string(
S::size_type, C, S::allocator_type const&);
#endif
#ifdef CTORPP
template
S::basic_string
@ -222,7 +216,9 @@ namespace std
#endif
#ifdef REP4I
template
// Only one template keyword allowed here.
// See core issue #46 (NAD)
// http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/cwg_closed.html#46
template
S&
S::_M_replace<S::const_iterator>