Fresh Fish 2

home *** CD-ROM | disk | FTP | other *** search

/ Fresh Fish 2 / FFMCD02.bin / useful / dist / gnu / libg++ / libg++-2.5.2.diffs next >

Wrap

Text File | 1993-12-19 | 52.9 KB | 1,660 lines

# **** NOTE **** # # Before applying these diffs and building libg++, you need to have moved # the files in the FSF distribution that have name collisions because # the AmigaDOS filesystem is case independent. These are: # # FSF file Move to # ------------------ --------------------- # # libg++/old-stream/filebuf.cc libg++/old-stream/_filebuf.cc # libg++/old-stream/filebuf.h libg++/old-stream/_filebuf.h # libg++/src/regex.cc libg++/src/_regex.cc # libg++/src/regex.h libg++/src/_regex.h # libg++/src/complex.h libg++/src/_complex.h # diff -rc libg++-2.5.2-fsf/Makefile.in libg++-2.5.2-amiga/Makefile.in *** libg++-2.5.2-fsf/Makefile.in Fri Dec 3 07:42:07 1993 --- libg++-2.5.2-amiga/Makefile.in Sat Dec 18 14:17:39 1993 *************** *** 19,25 **** srcdir = . ! prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin --- 19,25 ---- srcdir = . ! prefix = /usr exec_prefix = $(prefix) bindir = $(exec_prefix)/bin *************** *** 53,68 **** AS = as AR = ar AR_FLAGS = rc ! CC = cc # We don't specify -g -O because many compilers don't support -g -O, # and/or -O is broken in and of itself. ! CFLAGS = -g CXX = gcc # Use -O to stress test the compiler. ! CXXFLAGS = -g -O RANLIB = ranlib NM = nm --- 53,68 ---- AS = as AR = ar AR_FLAGS = rc ! CC = gcc # We don't specify -g -O because many compilers don't support -g -O, # and/or -O is broken in and of itself. ! CFLAGS = -O CXX = gcc # Use -O to stress test the compiler. ! CXXFLAGS = -O RANLIB = ranlib NM = nm *************** *** 71,100 **** GZIPPROG = gzip BISON = bison -y ! LEX = `if [ -f $${rootme}/flex/flex ] ; \ ! then echo $${rootme}/flex/flex ; \ ! else echo flex ; fi` ! ! M4 = `if [ -f $${rootme}/m4/m4 ] ; \ ! then echo $${rootme}/m4/m4 ; \ ! else echo m4 ; fi` ! ! MAKEINFO = `if [ -f $${rootme}/texinfo/makeinfo/makeinfo ] ; \ ! then echo $${rootme}/texinfo/makeinfo/makeinfo ; \ ! else echo makeinfo ; fi` # This just becomes part of the MAKEINFO definition passed down to # sub-makes. It lets flags be given on the command line while still # using the makeinfo from the object tree. MAKEINFOFLAGS = ! EXPECT = `if [ -f $${rootme}/expect/expect ] ; \ ! then echo $${rootme}/expect/expect ; \ ! else echo expect ; fi` ! ! RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \ ! then echo $${srcroot}/dejagnu/runtest ; \ ! else echo runtest ; fi` # libraries that may need to be augmented on a system-by-system basis --- 71,90 ---- GZIPPROG = gzip BISON = bison -y ! LEX = flex ! ! M4 = m4 ! ! MAKEINFO = makeinfo # This just becomes part of the MAKEINFO definition passed down to # sub-makes. It lets flags be given on the command line while still # using the makeinfo from the object tree. MAKEINFOFLAGS = ! EXPECT = expect ! ! RUNTEST = runtest # libraries that may need to be augmented on a system-by-system basis *************** *** 115,198 **** $(INSTALL_X11_MODULES) \ install-gcc ! CC_FOR_TARGET = ` \ ! if [ -f $${rootme}/gcc/Makefile ] ; then \ ! echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(CC); \ ! else \ ! t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ ! fi; \ ! fi` ! ! ! CXX_FOR_TARGET = ` \ ! if [ -f $${rootme}/gcc/Makefile ] ; then \ ! echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(CXX); \ ! else \ ! t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ ! fi; \ ! fi` ! ! AS_FOR_TARGET = ` \ ! if [ -f $${rootme}/gas/Makefile ] ; then \ ! echo $${rootme}/gas/as.new ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(AS); \ ! else \ ! t='$(program_transform_name)'; echo as | sed -e '' $$t ; \ ! fi; \ ! fi` ! ! AR_FOR_TARGET = ` \ ! if [ -f $${rootme}/binutils/ar ] ; then \ ! echo $${rootme}/binutils/ar ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(AR); \ ! else \ ! t='$(program_transform_name)'; echo ar | sed -e '' $$t ; \ ! fi; \ ! fi` ! ! RANLIB_FOR_TARGET = ` \ ! if [ -f $${rootme}/binutils/ranlib ] ; then \ ! echo $${rootme}/binutils/ranlib ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(RANLIB); \ ! else \ ! t='$(program_transform_name)'; echo ranlib | sed -e '' $$t ; \ ! fi; \ ! fi` ! ! NM_FOR_TARGET = ` \ ! if [ -f $${rootme}/binutils/Makefile ] ; then \ ! echo $${rootme}/binutils/nm ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(NM); \ ! else \ ! t='$(program_transform_name)'; echo nm | sed -e '' $$t ; \ ! fi; \ ! fi` # FIXME: This is badly named. ! XTRAFLAGS = ` \ ! if [ -f $${rootme}/gcc/Makefile ] ; then \ ! if [ -f $${rootme}/newlib/Makefile ] ; then \ ! echo -I$${rootme}/newlib/targ-include -I$${srcroot}/newlib/libc/include -I$${rootme}/gcc/include -nostdinc ; \ ! else \ ! echo -I$${rootme}/gcc/include ; \ ! fi ; \ ! else \ ! echo ; \ ! fi` #### host and target specific makefile fragments come in here. ### --- 105,119 ---- $(INSTALL_X11_MODULES) \ install-gcc ! CC_FOR_TARGET = gcc ! CXX_FOR_TARGET = gcc ! AS_FOR_TARGET = as ! AR_FOR_TARGET = ar ! RANLIB_FOR_TARGET = ranlib ! NM_FOR_TARGET = nm # FIXME: This is badly named. ! XTRAFLAGS = #### host and target specific makefile fragments come in here. ### diff -rc libg++-2.5.2-fsf/config.guess libg++-2.5.2-amiga/config.guess *** libg++-2.5.2-fsf/config.guess Tue Nov 16 20:43:37 1993 --- libg++-2.5.2-amiga/config.guess Thu Dec 16 22:07:07 1993 *************** *** 1,4 **** --- 1,5 ---- #!/bin/sh + echo "m68k-cbm-amigados" ; exit 0 #HACK (fnf) # This script attempts to guess a canonical system name. # Copyright (C) 1992, 1993 Free Software Foundation, Inc. # *************** *** 270,280 **** printf("i386-sequent-ptx\n"); exit(0); #endif exit (1); } EOF ! ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 rm -f dummy.c dummy # Apollos put the system type in the environment. --- 271,285 ---- printf("i386-sequent-ptx\n"); exit(0); #endif + #if defined(__amigados__) + printf("m68k-cbm-amigados\n"); exit(0); + #endif + exit (1); } EOF ! ${CC-gcc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 rm -f dummy.c dummy # Apollos put the system type in the environment. diff -rc libg++-2.5.2-fsf/configure libg++-2.5.2-amiga/configure *** libg++-2.5.2-fsf/configure Mon Oct 4 23:19:19 1993 --- libg++-2.5.2-amiga/configure Fri Dec 17 12:37:37 1993 *************** *** 33,43 **** # config.status is removed. # export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0 $argv; kill $$) remove=rm ! hard_link=ln ! symbolic_link='ln -s' #for Test #remove="echo rm" --- 33,46 ---- # config.status is removed. # + # In places where the argument to echo may start with a '-', use /bin/echo since + # the AmigaDOS pdksh builtin echo botches this case. + export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0 $argv; kill $$) remove=rm ! hard_link=cp ! symbolic_link=cp #for Test #remove="echo rm" *************** *** 66,72 **** next_tmpdir= norecursion= package_makefile_frag= ! prefix=/usr/local progname= program_prefix= program_prefixoption= --- 69,75 ---- next_tmpdir= norecursion= package_makefile_frag= ! prefix=/usr progname= program_prefix= program_prefixoption= *************** *** 103,111 **** ## path. Since PATH might include "." we also add `pwd` to the end of PATH. ## ! progname=$0 # if PWD already has a value, it is probably wrong. ! if [ -n "$PWD" ]; then PWD=`pwd`; fi case "${progname}" in /*) ;; --- 106,114 ---- ## path. Since PATH might include "." we also add `pwd` to the end of PATH. ## ! progname=`echo $0 | sed 's:/$::'` # if PWD already has a value, it is probably wrong. ! #if [ -n "$PWD" ]; then PWD=`pwd`; fi case "${progname}" in /*) ;; *************** *** 125,131 **** next_exec_prefix= elif [ -n "${next_site}" ] ; then site=${arg} ; site_option=-site=${site} ; next_site= # remove any possible trailing slash from srcdir. See note below. ! elif [ -n "${next_srcdir}" ] ; then srcdir=`echo ${arg} | sed -e 's:/$::'` ; next_srcdir= elif [ -n "${next_program_prefix}" ] ; then program_prefix=${arg} program_prefixoption="-program_prefix=${program_prefix}" --- 128,134 ---- next_exec_prefix= elif [ -n "${next_site}" ] ; then site=${arg} ; site_option=-site=${site} ; next_site= # remove any possible trailing slash from srcdir. See note below. ! elif [ -n "${next_srcdir}" ] ; then srcdir=`/bin/echo ${arg} | sed -e 's:/$::'` ; next_srcdir= elif [ -n "${next_program_prefix}" ] ; then program_prefix=${arg} program_prefixoption="-program_prefix=${program_prefix}" *************** *** 137,143 **** elif [ -n "${next_program_transform_name}" ] ; then # Double any backslashes or dollar signs in the argument if [ -n "${arg}" ] ; then ! program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" fi program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'" next_program_transform_name= --- 140,146 ---- elif [ -n "${next_program_transform_name}" ] ; then # Double any backslashes or dollar signs in the argument if [ -n "${arg}" ] ; then ! program_transform_name="${program_transform_name} -e `/bin/echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" fi program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'" next_program_transform_name= *************** *** 171,177 **** else case ${arg} in -exec_prefix=* | --exec_prefix=* | --exec_prefi=* | --exec_pref=* | --exec_pre=* | --exec_pr=* | --exec_p=* | --exec_=* | --exec=* | --exe=* | --ex=* | --e=* | -exec-prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* ) ! exec_prefix=`echo ${arg} | sed 's/^[-a-z_]*=//'` exec_prefixoption=${arg} ;; -exec_prefix | --exec_prefix | --exec_prefi | --exec_pref | --exec_pre | --exec_pr | --exec_p | --exec_ | --exec | --exe | --ex | --e | -exec-prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec-) --- 174,180 ---- else case ${arg} in -exec_prefix=* | --exec_prefix=* | --exec_prefi=* | --exec_pref=* | --exec_pre=* | --exec_pr=* | --exec_p=* | --exec_=* | --exec=* | --exe=* | --ex=* | --e=* | -exec-prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* ) ! exec_prefix=`/bin/echo ${arg} | sed 's/^[-a-z_]*=//'` exec_prefixoption=${arg} ;; -exec_prefix | --exec_prefix | --exec_prefi | --exec_pref | --exec_pre | --exec_pr | --exec_p | --exec_ | --exec | --exe | --ex | --e | -exec-prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec-) *************** *** 186,192 **** -host=* | --host=* | --hos=* | --ho=*) case "${host_alias}" in "") ! host_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`" ;; *) echo '***' Can only configure for one host at a time. 1>&2 --- 189,195 ---- -host=* | --host=* | --hos=* | --ho=*) case "${host_alias}" in "") ! host_alias="`/bin/echo ${arg} | sed 's/^[-a-z]*=//'`" ;; *) echo '***' Can only configure for one host at a time. 1>&2 *************** *** 212,218 **** norecursion=true ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=*) ! prefix=`echo ${arg} | sed 's/^[-a-z]*=//'` prefixoption=${arg} ;; -prefix | --prefix | --prefi | --pref | --pre) --- 215,221 ---- norecursion=true ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=*) ! prefix=`/bin/echo ${arg} | sed 's/^[-a-z]*=//'` prefixoption=${arg} ;; -prefix | --prefix | --prefi | --pref | --pre) *************** *** 220,243 **** ;; -rm | --rm) removing=${arg} ;; -program_prefix=* | --program_prefix=* | --program_prefi=* | --program_pref=* | --program_pre=* | --program_pr=* | --program_p=* | -program-prefix=* | --program-prefix=* | --program-prefi=* | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ! program_prefix=`echo ${arg} | sed 's/^[-a-z_]*=//'` program_prefixoption=${arg} ;; -program_prefix | --program_prefix | --program_prefi | --program_pref | --program_pre | --program_pr | --program_p | -program-prefix | --program-prefix | --program-prefi | --program-pref | --program-pre | --program-pr | --program-p) next_program_prefix=yes ;; -program_suffix=* | --program_suffix=* | --program_suffi=* | --program_suff=* | --program_suf=* | --program_su=* | --program_s=* | -program-suffix=* | --program-suffix=* | --program-suffi=* | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ! program_suffix=`echo ${arg} | sed 's/^[-a-z_]*=//'` program_suffixoption=${arg} ;; -program_suffix | --program_suffix | --program_suffi | --program_suff | --program_suf | --program_su | --program_s |-program-suffix | --program-suffix | --program-suffi | --program-suff | --program-suf | --program-su | --program-s) next_program_suffix=yes ;; -program_transform_name=* | --program_transform_name=* | --program_transform_nam=* | --program_transform_na=* | --program_transform_n=* | --program_transform_=* | --program_transform=* | --program_transfor=* | --program_transfo=* | --program_transf=* | --program_trans=* | --program_tran=* | --program_tra=* | --program_tr=* | --program_t=* | -program-transform-name=* | --program-transform-name=* | --program-transform-nam=* | --program-transform-na=* | --program-transform-n=* | --program-transform-=* | --program-transform=* | --program-transfor=* | --program-transfo=* | --program-transf=* | --program-trans=* | --program-tran=* | --program-tra=* | --program-tr=* | --program-t=*) ! arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` # Double any \ or $ in the argument if [ -n "${arg}" ] ; then ! program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" fi program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'" ;; --- 223,246 ---- ;; -rm | --rm) removing=${arg} ;; -program_prefix=* | --program_prefix=* | --program_prefi=* | --program_pref=* | --program_pre=* | --program_pr=* | --program_p=* | -program-prefix=* | --program-prefix=* | --program-prefi=* | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ! program_prefix=`/bin/echo ${arg} | sed 's/^[-a-z_]*=//'` program_prefixoption=${arg} ;; -program_prefix | --program_prefix | --program_prefi | --program_pref | --program_pre | --program_pr | --program_p | -program-prefix | --program-prefix | --program-prefi | --program-pref | --program-pre | --program-pr | --program-p) next_program_prefix=yes ;; -program_suffix=* | --program_suffix=* | --program_suffi=* | --program_suff=* | --program_suf=* | --program_su=* | --program_s=* | -program-suffix=* | --program-suffix=* | --program-suffi=* | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ! program_suffix=`/bin/echo ${arg} | sed 's/^[-a-z_]*=//'` program_suffixoption=${arg} ;; -program_suffix | --program_suffix | --program_suffi | --program_suff | --program_suf | --program_su | --program_s |-program-suffix | --program-suffix | --program-suffi | --program-suff | --program-suf | --program-su | --program-s) next_program_suffix=yes ;; -program_transform_name=* | --program_transform_name=* | --program_transform_nam=* | --program_transform_na=* | --program_transform_n=* | --program_transform_=* | --program_transform=* | --program_transfor=* | --program_transfo=* | --program_transf=* | --program_trans=* | --program_tran=* | --program_tra=* | --program_tr=* | --program_t=* | -program-transform-name=* | --program-transform-name=* | --program-transform-nam=* | --program-transform-na=* | --program-transform-n=* | --program-transform-=* | --program-transform=* | --program-transfor=* | --program-transfo=* | --program-transf=* | --program-trans=* | --program-tran=* | --program-tra=* | --program-tr=* | --program-t=*) ! arg=`/bin/echo ${arg} | sed -e 's/^[-a-z_]*=//'` # Double any \ or $ in the argument if [ -n "${arg}" ] ; then ! program_transform_name="${program_transform_name} -e `/bin/echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" fi program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'" ;; *************** *** 246,252 **** ;; -site=* | --site=* | --sit=* | --si=*) site_option=${arg} ! site=`echo ${arg} | sed 's/^[-a-z]*=//'` ;; -site | --site | --sit) next_site=yes --- 249,255 ---- ;; -site=* | --site=* | --sit=* | --si=*) site_option=${arg} ! site=`/bin/echo ${arg} | sed 's/^[-a-z]*=//'` ;; -site | --site | --sit) next_site=yes *************** *** 256,269 **** # it. Ordinarily this is ok, but emacs takes double slash to # mean "forget the first part". -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ! srcdir=`echo ${arg} | sed 's/^[-a-z]*=//' | sed -e 's:/$::'` ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) next_srcdir=yes ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=*) case "${target_alias}" in ! "") target_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`" ;; *) echo '***' Can only configure for one target at a time. 1>&2 fatal=yes --- 259,272 ---- # it. Ordinarily this is ok, but emacs takes double slash to # mean "forget the first part". -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ! srcdir=`/bin/echo ${arg} | sed 's/^[-a-z]*=//' | sed -e 's:/$::'` ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) next_srcdir=yes ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=*) case "${target_alias}" in ! "") target_alias="`/bin/echo ${arg} | sed 's/^[-a-z]*=//'`" ;; *) echo '***' Can only configure for one target at a time. 1>&2 fatal=yes *************** *** 275,281 **** ;; -tmpdir=* | --tmpdir=* | --tmpdi=* | --tmpd=* | --tmp=* | --tm=*) tmpdiroption=${arg} ! TMPDIR=`echo ${arg} | sed 's/^[-a-z]*=//'` ;; -tmpdir | --tmpdir | --tmpdi | --tmpd | --tmp | --tm) next_tmpdir=yes --- 278,284 ---- ;; -tmpdir=* | --tmpdir=* | --tmpdi=* | --tmpd=* | --tmp=* | --tm=*) tmpdiroption=${arg} ! TMPDIR=`/bin/echo ${arg} | sed 's/^[-a-z]*=//'` ;; -tmpdir | --tmpdir | --tmpdi | --tmpd | --tmp | --tm) next_tmpdir=yes *************** *** 289,306 **** exit 0 ;; -with*=* | --with*=*) ! withopt=`echo ${arg} | sed 's:^-*$with[^=]*$=.*$:\1:;s/-/_/g'` ! withval=`echo ${arg} | sed 's:^-*with[^=]*=$.*$$:\1:'` eval $withopt="$withval" withoptions="$withoptions $arg" ;; -without* | --without*) ! withopt=`echo ${arg} | sed 's:^-*without:with:;s/-/_/g'` eval $withopt=no withoutoptions="$withoutoptions $arg" ;; -with* | --with*) ! withopt=`echo ${arg} | sed 's:^-*with:with:;s/-/_/g'` eval $withopt=yes withoptions="$withoptions $arg" ;; --- 292,309 ---- exit 0 ;; -with*=* | --with*=*) ! withopt=`/bin/echo ${arg} | sed 's:^-*$with[^=]*$=.*$:\1:;s/-/_/g'` ! withval=`/bin/echo ${arg} | sed 's:^-*with[^=]*=$.*$$:\1:'` eval $withopt="$withval" withoptions="$withoptions $arg" ;; -without* | --without*) ! withopt=`/bin/echo ${arg} | sed 's:^-*without:with:;s/-/_/g'` eval $withopt=no withoutoptions="$withoutoptions $arg" ;; -with* | --with*) ! withopt=`/bin/echo ${arg} | sed 's:^-*with:with:;s/-/_/g'` eval $withopt=yes withoptions="$withoptions $arg" ;; *************** *** 799,805 **** # make sure that some sort of reasonable default exists for these # two variables CXX=${CXX-"g++ -O"} ! CC=${CC-cc} # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. --- 802,808 ---- # make sure that some sort of reasonable default exists for these # two variables CXX=${CXX-"g++ -O"} ! CC=${CC-gcc} # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. diff -rc libg++-2.5.2-fsf/libg++/configure.in libg++-2.5.2-amiga/libg++/configure.in *** libg++-2.5.2-fsf/libg++/configure.in Fri Nov 5 01:08:19 1993 --- libg++-2.5.2-amiga/libg++/configure.in Fri Dec 17 00:55:16 1993 *************** *** 16,24 **** echo "# Warning this fragment is automatically generated" >temp.mt rootme=`pwd` export rootme ! CC=${CC-`if [ -f ${rootme}/../gcc/xgcc ] ; \ ! then echo ${rootme}/../gcc/xgcc -B${rootme}/../gcc/ ; \ ! else echo gcc ; fi`} CONFIG_NM=${CONFIG_NM-nm} # The Bourne shell writes "command not found" to /dev/tty, so if we get --- 16,25 ---- echo "# Warning this fragment is automatically generated" >temp.mt rootme=`pwd` export rootme ! #CC=${CC-`if [ -f ${rootme}/../gcc/xgcc ] ; \ ! # then echo ${rootme}/../gcc/xgcc -B${rootme}/../gcc/ ; \ ! # else echo gcc ; fi`} ! CC=gcc #HACK (fnf) CONFIG_NM=${CONFIG_NM-nm} # The Bourne shell writes "command not found" to /dev/tty, so if we get *************** *** 48,54 **** echo "int foo;" >temp.c echo "# Use -nostdinc++ flag if your version of gcc understands it."\ >>temp.mt ! if [ "`${CC} -c -nostdinc++ temp.c 2>&1`" = "" ]; then echo 'NOSTDINC = -nostdinc++' >>temp.mt else echo 'NOSTDINC = # -nostdinc++' >>temp.mt --- 49,55 ---- echo "int foo;" >temp.c echo "# Use -nostdinc++ flag if your version of gcc understands it."\ >>temp.mt ! if true ; then #HACK (fnf) echo 'NOSTDINC = -nostdinc++' >>temp.mt else echo 'NOSTDINC = # -nostdinc++' >>temp.mt diff -rc libg++-2.5.2-fsf/libg++/etc/ADT-examples/Patmain.cc libg++-2.5.2-amiga/libg++/etc/ADT-examples/Patmain.cc *** libg++-2.5.2-fsf/libg++/etc/ADT-examples/Patmain.cc Tue Nov 2 02:00:30 1993 --- libg++-2.5.2-amiga/libg++/etc/ADT-examples/Patmain.cc Fri Dec 17 09:16:29 1993 *************** *** 2,8 **** #include <stream.h> #include <stdio.h> ! #include <string.h> #include "Patricia.h" #include <builtin.h> --- 2,8 ---- #include <stream.h> #include <stdio.h> ! #include </usr/include/string.h> /* Avoid getting String.h */ #include "Patricia.h" #include <builtin.h> diff -rc libg++-2.5.2-fsf/libg++/etc/benchmarks/dhrystone.cc libg++-2.5.2-amiga/libg++/etc/benchmarks/dhrystone.cc *** libg++-2.5.2-fsf/libg++/etc/benchmarks/dhrystone.cc Sun Nov 21 09:33:12 1993 --- libg++-2.5.2-amiga/libg++/etc/benchmarks/dhrystone.cc Fri Dec 17 09:18:20 1993 *************** *** 331,337 **** #ifdef NOSTRUCTASSIGN ! #include <string.h> #define structassign(d, s) memcpy(&(d), &(s), sizeof(d)) #else #define structassign(d, s) d = s --- 331,337 ---- #ifdef NOSTRUCTASSIGN ! #include </usr/include/string.h> /* Avoid getting String.h */ #define structassign(d, s) memcpy(&(d), &(s), sizeof(d)) #else #define structassign(d, s) d = s diff -rc libg++-2.5.2-fsf/libg++/etc/trie-gen/test.cc libg++-2.5.2-amiga/libg++/etc/trie-gen/test.cc *** libg++-2.5.2-fsf/libg++/etc/trie-gen/test.cc Mon Apr 26 03:25:36 1993 --- libg++-2.5.2-amiga/libg++/etc/trie-gen/test.cc Fri Dec 17 09:19:03 1993 *************** *** 5,11 **** */ #include <stdio.h> ! #include <string.h> #define MAX_LEN 200 --- 5,11 ---- */ #include <stdio.h> ! #include </usr/include/string.h> /* Avoid getting String.h */ #define MAX_LEN 200 diff -rc libg++-2.5.2-fsf/libg++/etc/trie-gen/trie.cc libg++-2.5.2-amiga/libg++/etc/trie-gen/trie.cc *** libg++-2.5.2-fsf/libg++/etc/trie-gen/trie.cc Sat Jun 5 01:44:36 1993 --- libg++-2.5.2-amiga/libg++/etc/trie-gen/trie.cc Fri Dec 17 09:19:30 1993 *************** *** 67,73 **** { sort (); ! fputs ("#include <string.h>\n#define MAX_ASCII 128\n\nstatic", stdout); if (option[CONST]) fputs (" const", stdout); fputs (" char *const word_list[] = \n{\n \"\",\n", stdout); --- 67,73 ---- { sort (); ! fputs ("#include </usr/include/string.h>\n#define MAX_ASCII 128\n\nstatic", stdout); if (option[CONST]) fputs (" const", stdout); fputs (" char *const word_list[] = \n{\n \"\",\n", stdout); diff -rc libg++-2.5.2-fsf/libg++/old-stream/Filebuf.cc libg++-2.5.2-amiga/libg++/old-stream/Filebuf.cc *** libg++-2.5.2-fsf/libg++/old-stream/Filebuf.cc Sun Dec 19 10:42:41 1993 --- libg++-2.5.2-amiga/libg++/old-stream/Filebuf.cc Sun Jan 5 03:00:33 1992 *************** *** 2,326 **** Copyright (C) 1990 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) ! This file is part of the GNU C++ Library. This library is free ! software; you can redistribute it and/or modify it under the terms of ! the GNU Library General Public License as published by the Free ! Software Foundation; either version 2 of the License, 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 Library General Public License for more details. ! You should have received a copy of the GNU Library General Public ! License along with this library; if not, write to the Free Software ! Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef __GNUG__ #pragma implementation #endif ! ! #include <Filebuf.h> #include <std.h> #include <sys/file.h> // needed to determine values of O_RDONLY... ! #ifndef _bufsiz ! #ifdef masscomp ! #ifdef _UCB ! #define _bufsiz(p) 4096 ! #endif ! #else ! #define _bufsiz(p) ((p)->_bufsiz) ! #endif ! #endif ! #ifdef VMS ! #include <assert.h> ! #define FPOINT (*(Fp->fp)) ! #undef _bufsiz ! #define _bufsiz(p) BUFSIZ // we do not have this available ! #else ! #define FPOINT Fp->fp ! #endif ! void Filebuf::init_streambuf_ptrs() ! { ! if (Fp->fp == 0 || FPOINT->_cnt == 0) ! { ! base = gptr = pptr = eptr = 0; // let first over/under flow deal with it ! } ! else ! { ! #ifdef VMS ! base = new char[BUFSIZ]; ! alloc = 1; ! #else ! base = FPOINT->_base; ! #endif ! eptr = base - 1 + _bufsiz(Fp->fp); ! pptr = gptr = base; ! } ! } ! ! int Filebuf::is_open() { ! return (Fp != 0 && Fp->is_open()); } ! ! streambuf* Filebuf::open(const char* name, io_mode m, access_mode a) { ! if (Fp == 0) ! Fp = new File(name, m, a); ! else ! Fp->open(name, m, a); ! #ifndef VMS ! if (base != 0) Fp->setbuf(eptr-base+1, base); ! #endif ! init_streambuf_ptrs(); ! return this; ! } ! ! streambuf* Filebuf::open(const char* name, const char* m) ! { ! if (Fp == 0) ! Fp = new File(name, m); ! else ! Fp->open(name, m); ! #ifndef VMS ! if (base != 0) Fp->setbuf(eptr-base+1, base); ! #endif ! init_streambuf_ptrs(); ! return this; } ! streambuf* Filebuf::open(const char* name, open_mode m) { ! switch(m) { ! case input: return open(name, "r"); ! case output: return open(name, "w"); ! case append: return open(name, "a"); } - } - - streambuf* Filebuf::open(int filedesc, io_mode m) - { - if (Fp == 0) - Fp = new File(filedesc, m); else ! Fp->open(filedesc, m); ! #ifndef VMS ! if (base != 0) Fp->setbuf(eptr-base+1, base); ! #endif ! init_streambuf_ptrs(); ! return this; ! } ! ! streambuf* Filebuf::open(FILE* fileptr) ! { ! if (Fp == 0) ! Fp = new File(fileptr); ! else ! Fp->open(fileptr); ! #ifndef VMS ! if (base != 0) Fp->setbuf(eptr-base+1, base); ! #endif ! init_streambuf_ptrs(); ! return this; } - Filebuf::Filebuf() : streambuf(), Fp(0) {} - - Filebuf::Filebuf(const char* filename, io_mode m, access_mode a) - : streambuf() - { - Fp = new File(filename, m, a); - init_streambuf_ptrs(); - } ! Filebuf::Filebuf(const char* filename, const char* m) ! : streambuf() { ! Fp = new File(filename, m); ! init_streambuf_ptrs(); } ! Filebuf::Filebuf(int filedesc, io_mode m) ! : streambuf() { ! Fp = new File(filedesc, m); ! init_streambuf_ptrs(); } ! Filebuf::Filebuf(FILE* fileptr) ! : streambuf() { ! Fp = new File(fileptr); ! init_streambuf_ptrs(); } ! int Filebuf::close() { ! int was = Fp->is_open(); ! if (was) { overflow(); Fp->close(); } ! #ifdef VMS ! if (was) { ! if(alloc && (base != 0)) {delete base; base=0; alloc = 0;}; ! gptr=0;}; ! #endif ! return was; } ! ! Filebuf::~Filebuf() { ! if (Fp != 0) { ! close(); ! delete Fp; } } ! #ifdef VMS ! /* ! VMS implementation notes: ! The underflow routine works fine as long as there is no mixing of input and ! output for the same stream. If this were to happen, then great confusion ! would occur, since we maintain a seperate buffer for the case of output. ! the stream classes do not allow this as they are currently written, so for ! now we are OK. VMS does not handle buffered output in quite the same way ! that UNIX does, so a seperate buffer is allocated, and used by the program. ! when it comes time to flush it we call write(...) to empty it. The flush ! function under VMS does not flush the buffer unless it is full, and whatsmore ! the _iobuf is not 14 bytes long as one might suspect from the structure def, ! but at *least* 66 bytes long. Some of these hidden structure elements need ! to be set for the output to work properly, and it seemed to be poor ! programming practice to fool with them ! */ ! #endif ! /* ! The underflow and overflow methods sync the streambuf with the _iobuf ! ptrs on the way in and out of the read. I believe that this is ! done in a portable way. ! */ ! int Filebuf::underflow() { ! int ch; ! if (Fp == 0) return EOF; ! if (gptr == 0) // stdio _iobuf ptrs not initialized until after 1st read ! { ! #ifdef VMS ! assert(alloc==0); ! #endif ! ch = Fp->fill(); ! base = FPOINT->_base; ! eptr = base - 1 + _bufsiz(Fp->fp); ! } ! else ! { ! FPOINT->_ptr = gptr; ! FPOINT->_cnt = eptr - gptr + 1; ! ch = Fp->fill(); ! } ! gptr = base; ! *gptr = ch; ! if (ch == EOF) ! pptr = base; ! else ! pptr = base + FPOINT->_cnt + 1; ! if (Fp->good()) ! return ch; ! else ! { ! Fp->clear(); ! return EOF; ! } ! } ! int Filebuf::overflow(int ch) ! { ! if (Fp == 0) return EOF; ! if (FPOINT->_flag & _IONBF) // handle unbuffered IO specially ! { ! if (pptr == 0) // 1st write ! { ! if (ch == EOF) ! return 0; ! else ! { ! Fp->flush(ch); ! } ! } ! else ! { ! if (ch == EOF) ! Fp->flush(); // Probably not necessary ! else ! Fp->flush(ch); ! } ! } ! else ! { ! if (pptr == 0) // 1st write ! { ! if (ch == EOF) ! return 0; ! else ! { ! Fp->flush(ch); ! #ifdef VMS ! base = new char[BUFSIZ]; ! alloc = 1; ! #else ! base = FPOINT->_base; ! #endif ! eptr = base - 1 + _bufsiz(Fp->fp); ! gptr = base; ! } ! } ! else ! { ! if (ch != EOF) *pptr++ = ch; ! #ifdef VMS ! if(gptr==base) write(FPOINT->_file,base,pptr-base); ! #else ! FPOINT->_ptr = pptr; ! FPOINT->_cnt = eptr - pptr + 1; ! #endif ! Fp->flush(); ! } ! #ifdef VMS ! pptr = base; ! #else ! pptr = FPOINT->_ptr; ! #endif ! } ! if (Fp->fail() || Fp->bad()) { ! Fp->clear(); // this allows recovery from ostream level ! return EOF; } ! else ! return 0; ! } ! ! const char* Filebuf::name() ! { ! return Fp->name(); ! } ! ! streambuf* Filebuf::setbuf(char* buf, int buflen, int preload) ! { ! if (preload != 0) return 0; // cannot preload, sorry ! if (Fp != 0) Fp = new File; ! Fp->setbuf(buflen, buf); ! init_streambuf_ptrs(); ! return (Fp->good())? this : 0; } ! void Filebuf::error() { ! Fp->error(); } --- 2,137 ---- Copyright (C) 1990 Free Software Foundation written by Doug Lea (dl@rocky.oswego.edu) ! This file is part of GNU CC. ! ! GNU CC is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY. No author or distributor ! accepts responsibility to anyone for the consequences of using it ! or for whether it serves any particular purpose or works at all, ! unless he says so in writing. Refer to the GNU CC General Public ! License for full details. ! ! Everyone is granted permission to copy, modify and redistribute ! GNU CC, but only under the conditions described in the ! GNU CC General Public License. A copy of this license is ! supposed to have been given to you along with GNU CC so you ! can know your rights and responsibilities. It should be in a ! file named COPYING. Among other things, the copyright notice ! and this notice must be preserved on all copies. */ + #if 1 #ifdef __GNUG__ #pragma implementation #endif ! #endif #include <std.h> #include <sys/file.h> // needed to determine values of O_RDONLY... + #include <filebuf.h> ! filebuf::filebuf() ! :streambuf(), fd(-1), opened(0) {} ! filebuf::filebuf(int newfd) ! : streambuf(), fd(newfd), opened(1) {} ! filebuf::filebuf(int newfd, char* buf, int buflen) ! : streambuf(buf, buflen), fd(newfd), opened(1) {} ! int filebuf::is_open() { ! return opened; } ! int filebuf::close() { ! int was = opened; ! if (was) ::close(fd); ! opened = 0; ! return was; } ! streambuf* filebuf::open(const char* name, open_mode m) { ! if (opened) return 0; ! int mode = -1; // any illegal value ! switch (m) ! { ! case input: mode = O_RDONLY; ! break; ! case output: mode = O_WRONLY | O_CREAT | O_TRUNC; ! break; ! case append: mode = O_APPEND | O_CREAT | O_WRONLY; ! break; ! } ! fd = ::open(name, mode, 0666); ! if (opened = (fd >= 0)) { ! allocate(); ! return this; } else ! return 0; } ! streambuf* filebuf::open(const char* filename, io_mode m, access_mode a) { ! return 0; } ! streambuf* filebuf::open(const char* filename, const char* m) { ! return 0; } ! streambuf* filebuf::open(int filedesc, io_mode m) { ! return 0; } ! streambuf* filebuf::open(FILE* fileptr) { ! return 0; } ! int filebuf::underflow() { ! if (!opened) return EOF; ! if (base == 0) allocate(); ! int nwanted = eptr - base + 1; ! int nread = ::read(fd, base, nwanted); ! if (nread >= 0) { ! gptr = base; ! pptr = base + nread; } + return (nread <= 0)? EOF : int(*gptr); } ! int filebuf::overflow(int ch) { ! if (!opened) return EOF; ! if (base == 0) allocate(); ! if (ch != EOF) // overflow *must* be called before really full ! *pptr++ = (char)(ch); ! // loop, in case write can't handle full request ! // From: Rene' Seindal <seindal@diku.dk> ! ! int w, n, t; ! for (w = t = 0, n = pptr - base; n > 0; n -= w, t += w) { ! if ((w = ::write(fd, base + t, n)) < 0) ! break; } ! ! pptr = base; ! return (n == 0 && w >= 0)? 0 : EOF; } ! filebuf::~filebuf() { ! close(); } diff -rc libg++-2.5.2-fsf/libg++/src/BitSet.cc libg++-2.5.2-amiga/libg++/src/BitSet.cc *** libg++-2.5.2-fsf/libg++/src/BitSet.cc Fri Apr 30 22:11:44 1993 --- libg++-2.5.2-amiga/libg++/src/BitSet.cc Fri Dec 17 09:20:02 1993 *************** *** 29,35 **** #include <AllocRing.h> #include <new.h> #include <builtin.h> ! #include <string.h> #include <strstream.h> void BitSet::error(const char* msg) const --- 29,35 ---- #include <AllocRing.h> #include <new.h> #include <builtin.h> ! #include </usr/include/string.h> /* Avoid getting String.h */ #include <strstream.h> void BitSet::error(const char* msg) const diff -rc libg++-2.5.2-fsf/libg++/src/Makefile.in libg++-2.5.2-amiga/libg++/src/Makefile.in *** libg++-2.5.2-fsf/libg++/src/Makefile.in Wed Nov 3 21:04:30 1993 --- libg++-2.5.2-amiga/libg++/src/Makefile.in Fri Dec 17 10:42:19 1993 *************** *** 35,41 **** PlotFile.o SFile.o # Comment out if you're getting regex from somewhere else. ! REGEX_OBJ=regex.o OBJS = AllocRing.o Obstack.o builtin.o \ $(REGEX_OBJ) Regex.o String.o Intdouble.o Integer.o Rational.o \ Complex.o Random.o BitSet.o BitString.o LogNorm.o SmplHist.o SmplStat.o \ --- 35,41 ---- PlotFile.o SFile.o # Comment out if you're getting regex from somewhere else. ! REGEX_OBJ=_regex.o OBJS = AllocRing.o Obstack.o builtin.o \ $(REGEX_OBJ) Regex.o String.o Intdouble.o Integer.o Rational.o \ Complex.o Random.o BitSet.o BitString.o LogNorm.o SmplHist.o SmplStat.o \ diff -rc libg++-2.5.2-fsf/libg++/src/Regex.cc libg++-2.5.2-amiga/libg++/src/Regex.cc *** libg++-2.5.2-fsf/libg++/src/Regex.cc Sun Dec 19 10:41:45 1993 --- libg++-2.5.2-amiga/libg++/src/Regex.cc Fri Dec 17 10:25:43 1993 *************** *** 28,34 **** #include <builtin.h> extern "C" { ! #include <regex.h> } #include <Regex.h> --- 28,34 ---- #include <builtin.h> extern "C" { ! #include <_regex.h> /* Avoid name clash; Regex.h <==> regex.h */ } #include <Regex.h> diff -rc libg++-2.5.2-fsf/libg++/src/String.cc libg++-2.5.2-amiga/libg++/src/String.cc *** libg++-2.5.2-fsf/libg++/src/String.cc Sun Dec 19 10:41:56 1993 --- libg++-2.5.2-amiga/libg++/src/String.cc Fri Dec 17 10:26:26 1993 *************** *** 30,36 **** #include <builtin.h> // extern "C" { ! #include <regex.h> // } void String::error(const char* msg) const --- 30,36 ---- #include <builtin.h> // extern "C" { ! #include <_regex.h> /* Avoid name clash; Regex.h <==> regex.h */ // } void String::error(const char* msg) const diff -rc libg++-2.5.2-fsf/libg++/src/_regex.cc libg++-2.5.2-amiga/libg++/src/_regex.cc *** libg++-2.5.2-fsf/libg++/src/_regex.cc Sun Dec 19 10:41:47 1993 --- libg++-2.5.2-amiga/libg++/src/_regex.cc Fri Dec 17 10:26:58 1993 *************** *** 54,60 **** #else /* not emacs */ #include <_G_config.h> ! #include <string.h> #include <stdlib.h> /* Define the syntax stuff, so we can do the \<, \>, etc. */ --- 54,60 ---- #else /* not emacs */ #include <_G_config.h> ! #include </usr/include/string.h> /* Avoid getting String.h */ #include <stdlib.h> /* Define the syntax stuff, so we can do the \<, \>, etc. */ *************** *** 114,120 **** #endif /* Get the interface, including the syntax bits. */ ! #include "regex.h" /* These are the command codes that appear in compiled regular --- 114,120 ---- #endif /* Get the interface, including the syntax bits. */ ! #include "_regex.h" /* Avoid name clash; Regex.h <==> regex.h */ /* These are the command codes that appear in compiled regular diff -rc libg++-2.5.2-fsf/libg++/src/depend libg++-2.5.2-amiga/libg++/src/depend *** libg++-2.5.2-fsf/libg++/src/depend Tue Oct 26 02:20:49 1993 --- libg++-2.5.2-amiga/libg++/src/depend Fri Dec 17 10:49:41 1993 *************** *** 170,176 **** std.h \ new.h \ builtin.h \ ! regex.h \ Regex.h RndInt.o : RndInt.cc \ RndInt.h \ --- 170,176 ---- std.h \ new.h \ builtin.h \ ! _regex.h \ Regex.h RndInt.o : RndInt.cc \ RndInt.h \ *************** *** 207,213 **** std.h \ new.h \ builtin.h \ ! regex.h Uniform.o : Uniform.cc \ builtin.h \ std.h \ --- 207,213 ---- std.h \ new.h \ builtin.h \ ! _regex.h Uniform.o : Uniform.cc \ builtin.h \ std.h \ *************** *** 277,284 **** pow.o : pow.cc \ builtin.h \ std.h ! regex.o : regex.cc \ ! regex.h sqrt.o : sqrt.cc \ builtin.h \ std.h --- 277,284 ---- pow.o : pow.cc \ builtin.h \ std.h ! _regex.o : _regex.cc \ ! _regex.h sqrt.o : sqrt.cc \ builtin.h \ std.h diff -rc libg++-2.5.2-fsf/libg++/src/std.h libg++-2.5.2-amiga/libg++/src/std.h *** libg++-2.5.2-fsf/libg++/src/std.h Wed Jul 28 22:41:41 1993 --- libg++-2.5.2-amiga/libg++/src/std.h Fri Dec 17 09:21:11 1993 *************** *** 23,29 **** #include <_G_config.h> #include <stddef.h> #include <stdlib.h> ! #include <string.h> #include <unistd.h> #include <stdio.h> #include <errno.h> --- 23,29 ---- #include <_G_config.h> #include <stddef.h> #include <stdlib.h> ! #include </usr/include/string.h> /* Avoid getting String.h */ #include <unistd.h> #include <stdio.h> #include <errno.h> diff -rc libg++-2.5.2-fsf/libg++/tests/Makefile.sh libg++-2.5.2-amiga/libg++/tests/Makefile.sh *** libg++-2.5.2-fsf/libg++/tests/Makefile.sh Wed Sep 15 21:50:03 1993 --- libg++-2.5.2-amiga/libg++/tests/Makefile.sh Sat Dec 18 15:04:37 1993 *************** *** 8,19 **** tiLList.cc EOF ! TESTS1="tObstack tString tInteger tRational tComplex tBitSet tBitString tStack tQueue tDeque tPQ tSet tBag tMap tFix tFix16 tFix24 tList tPlex tLList tVec" TTESTS="tRandom ${TESTS1} tiLList" cat <<EOF # executables ! TOUTS = test_h tCurses ${TTESTS} tGetOpt EOF --- 8,19 ---- tiLList.cc EOF ! TESTS1="tObstack tInteger tRational tComplex tBitSet tStack tQueue tDeque tPQ tSet tBag tMap tFix tFix16 tFix24 tList tPlex tLList tVec" TTESTS="tRandom ${TESTS1} tiLList" cat <<EOF # executables ! TOUTS = test_h ${TTESTS} tGetOpt EOF *************** *** 90,98 **** # Comment this out if your compiler doesn't handle templates: CHECK_TEMPLATES=check-templates ! tests checktests: clean_tests test_h tCurses \ ! check-tObstack check-tString check-tInteger \ ! check-tRational check-tComplex check-tBitSet check-tBitString \ check-tFix check-tFix16 check-tFix24 check-tGetOpt \ check-tList check-tPlex check-tLList check-tVec \ check-tStack check-tQueue check-tDeque check-tPQ \ --- 90,98 ---- # Comment this out if your compiler doesn't handle templates: CHECK_TEMPLATES=check-templates ! tests checktests: clean_tests test_h \ ! check-tObstack check-tInteger \ ! check-tRational check-tComplex check-tBitSet \ check-tFix check-tFix16 check-tFix24 check-tGetOpt \ check-tList check-tPlex check-tLList check-tVec \ check-tStack check-tQueue check-tDeque check-tPQ \ *************** *** 133,142 **** LIB_FOR_tFix24=-lm LIB_FOR_tCurses="-lcurses -ltermcap" ! for TEST in twrapper tgwrapper $TTESTS tCurses tGetOpt; do echo "${TEST}: " '$(LIBTEST)' " ${TEST}.o" echo ' $(CXX) $(LDFLAGS)' "${TEST}.o" '-o $@ $(LIBTEST) $(LIBS)' \ ! `eval echo '$LIB_FOR_'$TEST` echo "" done --- 133,145 ---- LIB_FOR_tFix24=-lm LIB_FOR_tCurses="-lcurses -ltermcap" ! # Note: the eval line below causes commands of the form "echo -lcurses ..." ! # to be run, which are not handled properly on the Amiga with pdksh's ! # internal echo. Force the GNU echo (/bin/echo) to be used. -fnf ! for TEST in twrapper tgwrapper $TTESTS tGetOpt; do echo "${TEST}: " '$(LIBTEST)' " ${TEST}.o" echo ' $(CXX) $(LDFLAGS)' "${TEST}.o" '-o $@ $(LIBTEST) $(LIBS)' \ ! `eval /bin/echo '$LIB_FOR_'$TEST` echo "" done diff -rc libg++-2.5.2-fsf/libg++/tests/test_h.cc libg++-2.5.2-amiga/libg++/tests/test_h.cc *** libg++-2.5.2-fsf/libg++/tests/test_h.cc Wed Nov 24 20:42:03 1993 --- libg++-2.5.2-amiga/libg++/tests/test_h.cc Fri Dec 17 10:28:07 1993 *************** *** 74,80 **** #include <assert.h> #include <libc.h> #include <compare.h> ! #include <complex.h> #include <ctype.h> #include <errno.h> #include <generic.h> --- 74,80 ---- #include <assert.h> #include <libc.h> #include <compare.h> ! #include <_complex.h> /* Avoid name clash; Complex.h <==> complex.h */ #include <ctype.h> #include <errno.h> #include <generic.h> *************** *** 87,93 **** #include <new.h> #include <osfcn.h> #include <pwd.h> ! #include <regex.h> #include <setjmp.h> #include <signal.h> #include <stdarg.h> --- 87,93 ---- #include <new.h> #include <osfcn.h> #include <pwd.h> ! #include <_regex.h> /* Avoid name clash; Regex.h <==> regex.h */ #include <setjmp.h> #include <signal.h> #include <stdarg.h> *************** *** 95,101 **** #include <stdio.h> #include <stdlib.h> #include <strclass.h> ! #include <string.h> #include <swap.h> #include <unistd.h> #include <limits.h> --- 95,101 ---- #include <stdio.h> #include <stdlib.h> #include <strclass.h> ! #include </usr/include/string.h> /* Avoid getting String.h */ #include <swap.h> #include <unistd.h> #include <limits.h> diff -rc libg++-2.5.2-fsf/libiberty/Makefile.in libg++-2.5.2-amiga/libiberty/Makefile.in *** libg++-2.5.2-fsf/libiberty/Makefile.in Fri Nov 26 21:55:13 1993 --- libg++-2.5.2-amiga/libiberty/Makefile.in Sat Dec 18 14:34:58 1993 *************** *** 60,66 **** AR = ar AR_FLAGS = rc ! CFLAGS = -g BISON = bison MAKEINFO = makeinfo RANLIB = ranlib --- 60,66 ---- AR = ar AR_FLAGS = rc ! CFLAGS = -O BISON = bison MAKEINFO = makeinfo RANLIB = ranlib *************** *** 93,99 **** .PHONY: check installcheck check installcheck: ! #### Host, target, and site specific Makefile fragments come in here. ### --- 93,99 ---- .PHONY: check installcheck check installcheck: ! CC=gcc #### Host, target, and site specific Makefile fragments come in here. ### diff -rc libg++-2.5.2-fsf/libio/config.shared libg++-2.5.2-amiga/libio/config.shared *** libg++-2.5.2-fsf/libio/config.shared Sat Nov 27 03:27:42 1993 --- libg++-2.5.2-amiga/libio/config.shared Sat Dec 18 14:34:17 1993 *************** *** 91,97 **** echo '' echo 'CC = `if [ -f '${TOPDIR}'gcc/xgcc ] ; \' echo ' then echo '${TOPDIR}'gcc/xgcc -B'${TOPDIR}'gcc/ ; \' ! echo ' else echo cc ; fi`' echo 'CXX = `if [ -f '${TOPDIR}'gcc/xgcc ] ; \' echo ' then echo '${TOPDIR}'gcc/xgcc -B'${TOPDIR}'gcc/ ; \' echo ' else echo gcc ; fi`' --- 91,97 ---- echo '' echo 'CC = `if [ -f '${TOPDIR}'gcc/xgcc ] ; \' echo ' then echo '${TOPDIR}'gcc/xgcc -B'${TOPDIR}'gcc/ ; \' ! echo ' else echo gcc ; fi`' echo 'CXX = `if [ -f '${TOPDIR}'gcc/xgcc ] ; \' echo ' then echo '${TOPDIR}'gcc/xgcc -B'${TOPDIR}'gcc/ ; \' echo ' else echo gcc ; fi`' *************** *** 105,112 **** else echo 'WRAP_C_INCLUDES = -I$(srcdir)'/${TOLIBGXX}g++-include fi ! echo 'CFLAGS = -g' ! echo 'CXXFLAGS = -g -O' if test "${DOING_LIBGXX}" = "true" ; then echo 'PROTODIR = $(srcdir)'/${TOLIBGXX}src/gen --- 105,112 ---- else echo 'WRAP_C_INCLUDES = -I$(srcdir)'/${TOLIBGXX}g++-include fi ! echo 'CFLAGS = -O' ! echo 'CXXFLAGS = -O' if test "${DOING_LIBGXX}" = "true" ; then echo 'PROTODIR = $(srcdir)'/${TOLIBGXX}src/gen diff -rc libg++-2.5.2-fsf/libio/dbz/Makefile.in libg++-2.5.2-amiga/libio/dbz/Makefile.in *** libg++-2.5.2-fsf/libio/dbz/Makefile.in Fri Dec 3 07:21:55 1993 --- libg++-2.5.2-amiga/libio/dbz/Makefile.in Sat Dec 18 14:33:21 1993 *************** *** 1,5 **** srcdir = . ! CFLAGS = -g C_FLAGS = $(CFLAGS) -I$(srcdir) -I.. -I$(srcdir)/.. $(XTRAFLAGS) -DDBZ_FINISH='_IO_flush_all()' CC = `if [ -f ../../../gcc/gcc ] ; \ then echo ../../../gcc/gcc -B../../../gcc/ ; \ --- 1,5 ---- srcdir = . ! CFLAGS = -O C_FLAGS = $(CFLAGS) -I$(srcdir) -I.. -I$(srcdir)/.. $(XTRAFLAGS) -DDBZ_FINISH='_IO_flush_all()' CC = `if [ -f ../../../gcc/gcc ] ; \ then echo ../../../gcc/gcc -B../../../gcc/ ; \ diff -rc libg++-2.5.2-fsf/libio/gen-params libg++-2.5.2-amiga/libio/gen-params *** libg++-2.5.2-fsf/libio/gen-params Thu Nov 4 18:45:55 1993 --- libg++-2.5.2-amiga/libio/gen-params Thu Dec 16 21:38:24 1993 *************** *** 50,56 **** binutilsdir=${binutilsdir-${rootdir}/binutils} CC=${CC-`if [ -f ${gccdir}/xgcc ] ; \ then echo ${gccdir}/xgcc -B${gccdir}/ -I${gccdir}/include ; \ ! else echo cc ; fi`} CXX=${CXX-`if [ -f ${gccdir}/xgcc ] ; \ then echo ${gccdir}/xgcc -B${gccdir}/ -I${gccdir}/include ; \ else echo gcc ; fi`} --- 50,56 ---- binutilsdir=${binutilsdir-${rootdir}/binutils} CC=${CC-`if [ -f ${gccdir}/xgcc ] ; \ then echo ${gccdir}/xgcc -B${gccdir}/ -I${gccdir}/include ; \ ! else echo gcc ; fi`} CXX=${CXX-`if [ -f ${gccdir}/xgcc ] ; \ then echo ${gccdir}/xgcc -B${gccdir}/ -I${gccdir}/include ; \ else echo gcc ; fi`} diff -rc libg++-2.5.2-fsf/libio/tests/Makefile.in libg++-2.5.2-amiga/libio/tests/Makefile.in *** libg++-2.5.2-fsf/libio/tests/Makefile.in Fri Dec 3 07:20:20 1993 --- libg++-2.5.2-amiga/libio/tests/Makefile.in Sat Dec 18 14:33:53 1993 *************** *** 17,25 **** srcdir = . ! CFLAGS = -g C_FLAGS = $(CFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/.. ! CXXFLAGS = -g CXX_FLAGS = $(CXXFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/.. CC = gcc CXX = gcc --- 17,25 ---- srcdir = . ! CFLAGS = -O C_FLAGS = $(CFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/.. ! CXXFLAGS = -O CXX_FLAGS = $(CXXFLAGS) -I. -I.. -I$(srcdir) -I$(srcdir)/.. CC = gcc CXX = gcc *************** *** 162,168 **** -o tfformat $(srcdir)/tfformat.c $(IOSTDIOLIB) check-tfformat: tfformat ! ./tfformat tiformat: $(srcdir)/tiformat.c $(CC) $(C_FLAGS) -DTEST_LIBIO -o tiformat $(srcdir)/tiformat.c $(IOSTDIOLIB) --- 162,168 ---- -o tfformat $(srcdir)/tfformat.c $(IOSTDIOLIB) check-tfformat: tfformat ! -./tfformat tiformat: $(srcdir)/tiformat.c $(CC) $(C_FLAGS) -DTEST_LIBIO -o tiformat $(srcdir)/tiformat.c $(IOSTDIOLIB)