diff -2rcN libg++-2.6/Makefile.in libg++-2.6-amiga/Makefile.in *** libg++-2.6/Makefile.in Tue Jul 19 02:48:12 1994 --- libg++-2.6-amiga/Makefile.in Fri Jul 29 11:07:17 1994 *************** *** 20,24 **** srcdir = . ! prefix = /usr/local exec_prefix = $(prefix) --- 20,24 ---- srcdir = . ! prefix = /gnu exec_prefix = $(prefix) *************** *** 56,60 **** AR = ar AR_FLAGS = rc ! CC = cc # Special variables passed down in EXTRA_GCC_FLAGS. They are defined --- 56,60 ---- AR = ar AR_FLAGS = rc ! CC = amigados-gcc # Special variables passed down in EXTRA_GCC_FLAGS. They are defined *************** *** 66,75 **** # 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 -fexternal-templates RANLIB = ranlib --- 66,75 ---- # We don't specify -g -O because many compilers don't support -g -O, # and/or -O is broken in and of itself. ! CFLAGS = -O2 CXX = gcc # Use -O to stress test the compiler. ! CXXFLAGS = -O2 -fexternal-templates RANLIB = ranlib *************** *** 79,94 **** BISON = bison -y ! LEX = `if [ -f $$r/flex/flex ] ; \ ! then echo $$r/flex/flex ; \ ! else echo flex ; fi` ! ! M4 = `if [ -f $$r/m4/m4 ] ; \ ! then echo $$r/m4/m4 ; \ ! else echo m4 ; fi` ! ! MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ ! then echo $$r/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 --- 79,88 ---- 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 *************** *** 96,107 **** MAKEINFOFLAGS = ! EXPECT = `if [ -f $$r/expect/expect ] ; \ ! then echo $$r/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 --- 90,96 ---- MAKEINFOFLAGS = ! EXPECT = expect + RUNTEST = runtest # libraries that may need to be augmented on a system-by-system basis *************** *** 125,203 **** ! CC_FOR_TARGET = ` \ ! if [ -f $$r/gcc/Makefile ] ; then \ ! if [ -f $$r/newlib/Makefile ] ; then \ ! echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ ! else \ ! echo $$r/gcc/xgcc -B$$r/gcc/; \ ! fi; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(CC); \ ! else \ ! t='$(program_transform_name)'; echo gcc | sed -e 's/brokensed/brokensed/' $$t; \ ! fi; \ ! fi` ! ! ! CXX_FOR_TARGET = ` \ ! if [ -f $$r/gcc/Makefile ] ; then \ ! if [ -f $$r/newlib/Makefile ] ; then \ ! echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ ! else \ ! echo $$r/gcc/xgcc -B$$r/gcc/; \ ! fi; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(CXX); \ ! else \ ! t='$(program_transform_name)'; echo gcc | sed -e 's/brokensed/brokensed/' $$t; \ ! fi; \ ! fi` ! ! AS_FOR_TARGET = ` \ ! if [ -f $$r/gas/Makefile ] ; then \ ! echo $$r/gas/as.new ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(AS); \ ! else \ ! t='$(program_transform_name)'; echo as | sed -e 's/brokensed/brokensed/' $$t ; \ ! fi; \ ! fi` ! ! AR_FOR_TARGET = ` \ ! if [ -f $$r/binutils/ar ] ; then \ ! echo $$r/binutils/ar ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(AR); \ ! else \ ! t='$(program_transform_name)'; echo ar | sed -e 's/brokensed/brokensed/' $$t ; \ ! fi; \ ! fi` ! ! RANLIB_FOR_TARGET = ` \ ! if [ -f $$r/binutils/ranlib ] ; then \ ! echo $$r/binutils/ranlib ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(RANLIB); \ ! else \ ! t='$(program_transform_name)'; echo ranlib | sed -e 's/brokensed/brokensed/' $$t ; \ ! fi; \ ! fi` ! ! NM_FOR_TARGET = ` \ ! if [ -f $$r/binutils/Makefile ] ; then \ ! echo $$r/binutils/nm.new ; \ ! else \ ! if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ ! echo $(NM); \ ! else \ ! t='$(program_transform_name)'; echo nm | sed -e 's/brokensed/brokensed/' $$t ; \ ! fi; \ ! fi` ! #### host and target specific makefile fragments come in here. --- 114,123 ---- ! CC_FOR_TARGET = amigados-gcc ! CXX_FOR_TARGET = amigados-gcc ! AS_FOR_TARGET = /usr/local/amigados/bin/as ! AR_FOR_TARGET = ar ! RANLIB_FOR_TARGET = ranlib ! NM_FOR_TARGET = nm #### host and target specific makefile fragments come in here. diff -2rcN libg++-2.6/config.guess libg++-2.6-amiga/config.guess *** libg++-2.6/config.guess Sat Jul 16 20:11:08 1994 --- libg++-2.6-amiga/config.guess Fri Jul 29 11:02:49 1994 *************** *** 1,3 **** --- 1,4 ---- #!/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. *************** *** 206,210 **** exit 0 ;; i[34]86:UNIX_SV:4.*:*) ! if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} else --- 207,211 ---- exit 0 ;; i[34]86:UNIX_SV:4.*:*) ! if grep Novell /gnu/include/link.h >/dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} else *************** *** 334,347 **** #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. ! test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } #echo '(Unable to guess system type)' 1>&2 --- 335,352 ---- #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. ! test -d /gnu/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } #echo '(Unable to guess system type)' 1>&2 diff -2rcN libg++-2.6/configure libg++-2.6-amiga/configure *** libg++-2.6/configure Mon Jun 27 21:52:54 1994 --- libg++-2.6-amiga/configure Fri Jul 29 13:07:35 1994 *************** *** 34,42 **** # 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 --- 34,45 ---- # + # 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 *************** *** 63,67 **** other_options= package_makefile_frag= ! prefix=/usr/local progname= program_prefix= --- 66,70 ---- other_options= package_makefile_frag= ! prefix=/gnu progname= program_prefix= *************** *** 100,104 **** ## ! progname=$0 # if PWD already has a value, it is probably wrong. if [ -n "$PWD" ]; then PWD=`pwd`; fi --- 103,107 ---- ## ! progname=`echo $0 | sed 's:/$::'` # if PWD already has a value, it is probably wrong. if [ -n "$PWD" ]; then PWD=`pwd`; fi *************** *** 212,216 **** --program-transform-name* | --program-t*) # Double any backslashes or dollar signs in the argument ! program_transform_name="${program_transform_name} -e `echo ${optarg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" program_transform_nameoption="${program_transform_nameoption} --program-transform-name='$optarg'" ;; --- 215,219 ---- --program-transform-name* | --program-t*) # Double any backslashes or dollar signs in the argument ! program_transform_name="${program_transform_name} -e `/bin/echo ${optarg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" program_transform_nameoption="${program_transform_nameoption} --program-transform-name='$optarg'" ;; *************** *** 231,235 **** # in it. Ordinarily this is ok, but emacs takes double slash # to mean "forget the first part". ! srcdir=`echo $optarg | sed -e 's:/$::'` ;; --srcdir* | --sr*) --- 234,238 ---- # in it. Ordinarily this is ok, but emacs takes double slash # to mean "forget the first part". ! srcdir=`/bin/echo $optarg | sed -e 's:/$::'` ;; --srcdir* | --sr*) *************** *** 262,271 **** esac ! withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'` eval $withopt="$optarg" withoptions="$withoptions $option" ;; --without-*) ! withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'` eval $withopt=no withoutoptions="$withoutoptions $option" --- 265,274 ---- esac ! withopt=`/bin/echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'` eval $withopt="$optarg" withoptions="$withoptions $option" ;; --without-*) ! withopt=`/bin/echo ${option} | sed 's:^--::;s:out::;s:-:_:g'` eval $withopt=no withoutoptions="$withoutoptions $option" *************** *** 388,393 **** echo echo Options: [defaults in brackets] ! echo ' --prefix=MYDIR configure for installation of host independent files into MYDIR. ["/usr/local"]' ! echo ' --exec-prefix=MYDIR configure for installation of host dependent files into MYDIR. ["/usr/local"]' echo ' --help print this message. [normal config]' echo ' --build=BUILD configure for building on BUILD. [BUILD=HOST]' --- 391,396 ---- echo echo Options: [defaults in brackets] ! echo ' --prefix=MYDIR configure for installation of host independent files into MYDIR. ["/gnu"]' ! echo ' --exec-prefix=MYDIR configure for installation of host dependent files into MYDIR. ["/gnu"]' echo ' --help print this message. [normal config]' echo ' --build=BUILD configure for building on BUILD. [BUILD=HOST]' *************** *** 835,839 **** # two variables CXX=${CXX-"g++ -O"} ! CC=${CC-cc} # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, --- 838,842 ---- # two variables CXX=${CXX-"g++ -O"} ! CC=${CC-gcc} # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, diff -2rcN libg++-2.6/etc/Makefile.in libg++-2.6-amiga/etc/Makefile.in *** libg++-2.6/etc/Makefile.in Tue Jul 19 02:39:27 1994 --- libg++-2.6-amiga/etc/Makefile.in Fri Jul 29 11:02:50 1994 *************** *** 3,7 **** # ! prefix = /usr/local exec_prefix = $(prefix) --- 3,7 ---- # ! prefix = /gnu exec_prefix = $(prefix) diff -2rcN libg++-2.6/etc/cfg-paper.texi libg++-2.6-amiga/etc/cfg-paper.texi *** libg++-2.6/etc/cfg-paper.texi Tue Jul 19 02:39:28 1994 --- libg++-2.6-amiga/etc/cfg-paper.texi Fri Jul 29 11:02:50 1994 *************** *** 242,246 **** In order to actually install the program, the configuration system needs to know where you would like the program installed. The default ! location is @file{/usr/local}. We refer to this location as @code{$(prefix)}. All user visible programs will be installed in @file{@code{$(prefix)}/bin}. All other programs and files will be --- 242,246 ---- In order to actually install the program, the configuration system needs to know where you would like the program installed. The default ! location is @file{/gnu}. We refer to this location as @code{$(prefix)}. All user visible programs will be installed in @file{@code{$(prefix)}/bin}. All other programs and files will be diff -2rcN libg++-2.6/etc/configure.man libg++-2.6-amiga/etc/configure.man *** libg++-2.6/etc/configure.man Tue Jul 19 02:39:28 1994 --- libg++-2.6-amiga/etc/configure.man Fri Jul 29 11:02:50 1994 *************** *** 58,62 **** sets the location in which to install files to .I DIR. ! The default is "/usr/local". .TP --- 58,62 ---- sets the location in which to install files to .I DIR. ! The default is "/gnu". .TP diff -2rcN libg++-2.6/etc/configure.texi libg++-2.6-amiga/etc/configure.texi *** libg++-2.6/etc/configure.texi Tue Jul 19 02:39:30 1994 --- libg++-2.6-amiga/etc/configure.texi Fri Jul 29 11:02:50 1994 *************** *** 754,758 **** remember that you must also specify a different @samp{--prefix} for each configuration at configure-time. Otherwise, both configurations will be ! installed in the same default location (@file{/usr/local}); the configuration to be installed last would overwrite previously installed configurations. --- 754,758 ---- remember that you must also specify a different @samp{--prefix} for each configuration at configure-time. Otherwise, both configurations will be ! installed in the same default location (@file{/gnu}); the configuration to be installed last would overwrite previously installed configurations. *************** *** 783,787 **** @item in the current directory, and which will be installed ! @item in the default installation directory (@file{/usr/local}) when the code is compiled with @code{make}. @end itemize --- 783,787 ---- @item in the current directory, and which will be installed ! @item in the default installation directory (@file{/gnu}) when the code is compiled with @code{make}. @end itemize *************** *** 1227,1231 **** files, some of which are programs. The location of this tree is determined by the value of the variable @samp{prefix}. The default value of @samp{prefix} is ! @samp{/usr/local}. This is often correct for native tools installed on only one host. --- 1227,1231 ---- files, some of which are programs. The location of this tree is determined by the value of the variable @samp{prefix}. The default value of @samp{prefix} is ! @samp{/gnu}. This is often correct for native tools installed on only one host. *************** *** 1246,1250 **** In the default configuration, all files are installed in subdirectories ! of @file{/usr/local}. The location is determined by the value of the @code{configure} variable @samp{prefix}; in turn, this determines the value of the @file{Makefile} variable of the same name (@samp{prefix}). --- 1246,1250 ---- In the default configuration, all files are installed in subdirectories ! of @file{/gnu}. The location is determined by the value of the @code{configure} variable @samp{prefix}; in turn, this determines the value of the @file{Makefile} variable of the same name (@samp{prefix}). *************** *** 1347,1351 **** with the @samp{--prefix=} command line option to @code{configure} (@pxref{Invoking configure, , Invoking @code{configure}}). The default value ! for @samp{prefix} is @samp{/usr/local}. @item bindir --- 1347,1351 ---- with the @samp{--prefix=} command line option to @code{configure} (@pxref{Invoking configure, , Invoking @code{configure}}). The default value ! for @samp{prefix} is @samp{/gnu}. @item bindir diff -2rcN libg++-2.6/etc/make-stds.texi libg++-2.6-amiga/etc/make-stds.texi *** libg++-2.6/etc/make-stds.texi Sat Mar 26 17:22:48 1994 --- libg++-2.6-amiga/etc/make-stds.texi Fri Jul 29 11:16:39 1994 *************** *** 385,389 **** @item prefix A prefix used in constructing the default values of the variables listed ! below. The default value of @code{prefix} should be @file{/usr/local} (at least for now). --- 385,389 ---- @item prefix A prefix used in constructing the default values of the variables listed ! below. The default value of @code{prefix} should be @file{/gnu} (at least for now). *************** *** 399,403 **** @item bindir The directory for installing executable programs that users can run. ! This should normally be @file{/usr/local/bin}, but write it as @file{$(exec_prefix)/bin}. --- 399,403 ---- @item bindir The directory for installing executable programs that users can run. ! This should normally be @file{/gnu/bin}, but write it as @file{$(exec_prefix)/bin}. *************** *** 408,412 **** files that pertain to a specific machine architecture, but need not be in the path for commands. The value of @code{libdir} should normally be ! @file{/usr/local/lib}, but write it as @file{$(exec_prefix)/lib}. @item datadir --- 408,412 ---- files that pertain to a specific machine architecture, but need not be in the path for commands. The value of @code{libdir} should normally be ! @file{/gnu/lib}, but write it as @file{$(exec_prefix)/lib}. @item datadir *************** *** 414,418 **** refer to while they run. This directory is used for files which are independent of the type of machine being used. This should normally be ! @file{/usr/local/lib}, but write it as @file{$(prefix)/lib}. @item statedir --- 414,418 ---- refer to while they run. This directory is used for files which are independent of the type of machine being used. This should normally be ! @file{/gnu/lib}, but write it as @file{$(prefix)/lib}. @item statedir *************** *** 420,424 **** they run. These files should be independent of the type of machine being used, and it should be possible to share them among machines at a ! network installation. This should normally be @file{/usr/local/lib}, but write it as @file{$(prefix)/lib}. --- 420,424 ---- they run. These files should be independent of the type of machine being used, and it should be possible to share them among machines at a ! network installation. This should normally be @file{/gnu/lib}, but write it as @file{$(prefix)/lib}. *************** *** 427,435 **** The directory for installing header files to be included by user programs with the C @samp{#include} preprocessor directive. This ! should normally be @file{/usr/local/include}, but write it as @file{$(prefix)/include}. Most compilers other than GCC do not look for header files in ! @file{/usr/local/include}. So installing the header files this way is only useful with GCC. Sometimes this is not a problem because some libraries are only really intended to work with GCC. But some libraries --- 427,435 ---- The directory for installing header files to be included by user programs with the C @samp{#include} preprocessor directive. This ! should normally be @file{/gnu/include}, but write it as @file{$(prefix)/include}. Most compilers other than GCC do not look for header files in ! @file{/gnu/include}. So installing the header files this way is only useful with GCC. Sometimes this is not a problem because some libraries are only really intended to work with GCC. But some libraries *************** *** 490,494 **** @item infodir The directory for installing the Info files for this package. By ! default, it should be @file{/usr/local/info}, but it should be written as @file{$(prefix)/info}. --- 490,494 ---- @item infodir The directory for installing the Info files for this package. By ! default, it should be @file{/gnu/info}, but it should be written as @file{$(prefix)/info}. *************** *** 505,509 **** # Common prefix for installation directories. # NOTE: This directory must exist when you start the install. ! prefix = /usr/local exec_prefix = $(prefix) # Where to put the executable for the command `gcc'. --- 505,509 ---- # Common prefix for installation directories. # NOTE: This directory must exist when you start the install. ! prefix = /gnu exec_prefix = $(prefix) # Where to put the executable for the command `gcc'. diff -2rcN libg++-2.6/libg++/etc/ADT-examples/Patmain.cc libg++-2.6-amiga/libg++/etc/ADT-examples/Patmain.cc *** libg++-2.6/libg++/etc/ADT-examples/Patmain.cc Tue Nov 2 02:00:30 1993 --- libg++-2.6-amiga/libg++/etc/ADT-examples/Patmain.cc Fri Jul 29 11:02:51 1994 *************** *** 3,7 **** #include #include ! #include #include "Patricia.h" #include --- 3,7 ---- #include #include ! #include /* Avoid getting String.h */ #include "Patricia.h" #include diff -2rcN libg++-2.6/libg++/etc/benchmarks/Makefile.in libg++-2.6-amiga/libg++/etc/benchmarks/Makefile.in *** libg++-2.6/libg++/etc/benchmarks/Makefile.in Sat May 14 04:54:14 1994 --- libg++-2.6-amiga/libg++/etc/benchmarks/Makefile.in Fri Jul 29 11:02:51 1994 *************** *** 3,7 **** srcdir = . ! prefix = /usr/local --- 3,7 ---- srcdir = . ! prefix = /gnu diff -2rcN libg++-2.6/libg++/etc/benchmarks/dhrystone.cc libg++-2.6-amiga/libg++/etc/benchmarks/dhrystone.cc *** libg++-2.6/libg++/etc/benchmarks/dhrystone.cc Sun Nov 21 09:33:12 1993 --- libg++-2.6-amiga/libg++/etc/benchmarks/dhrystone.cc Fri Jul 29 11:02:51 1994 *************** *** 332,336 **** #ifdef NOSTRUCTASSIGN ! #include #define structassign(d, s) memcpy(&(d), &(s), sizeof(d)) #else --- 332,336 ---- #ifdef NOSTRUCTASSIGN ! #include /* Avoid getting String.h */ #define structassign(d, s) memcpy(&(d), &(s), sizeof(d)) #else diff -2rcN libg++-2.6/libg++/etc/trie-gen/test.cc libg++-2.6-amiga/libg++/etc/trie-gen/test.cc *** libg++-2.6/libg++/etc/trie-gen/test.cc Mon Apr 26 04:25:36 1993 --- libg++-2.6-amiga/libg++/etc/trie-gen/test.cc Fri Jul 29 11:02:51 1994 *************** *** 6,10 **** #include ! #include #define MAX_LEN 200 --- 6,10 ---- #include ! #include /* Avoid getting String.h */ #define MAX_LEN 200 diff -2rcN libg++-2.6/libg++/etc/trie-gen/trie.cc libg++-2.6-amiga/libg++/etc/trie-gen/trie.cc *** libg++-2.6/libg++/etc/trie-gen/trie.cc Sat May 14 03:08:11 1994 --- libg++-2.6-amiga/libg++/etc/trie-gen/trie.cc Fri Jul 29 11:02:52 1994 *************** *** 69,73 **** sort (); ! fputs ("#include \n#define MAX_ASCII 128\n\nstatic", stdout); if (option[CONST]) fputs (" const", stdout); --- 69,73 ---- sort (); ! fputs ("#include \n#define MAX_ASCII 128\n\nstatic", stdout); if (option[CONST]) fputs (" const", stdout); diff -2rcN libg++-2.6/libg++/old-stream/Filebuf.cc libg++-2.6-amiga/libg++/old-stream/Filebuf.cc *** libg++-2.6/libg++/old-stream/Filebuf.cc Fri Jan 17 22:10:41 1992 --- libg++-2.6-amiga/libg++/old-stream/Filebuf.cc Fri Jul 29 11:02:52 1994 *************** *** 3,326 **** 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 #include #include // 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 ! #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(); } --- 3,137 ---- 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 #include // needed to determine values of O_RDONLY... ! #include + 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 ! ! 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 -2rcN libg++-2.6/libg++/old-stream/Makefile.in libg++-2.6-amiga/libg++/old-stream/Makefile.in *** libg++-2.6/libg++/old-stream/Makefile.in Mon Apr 19 08:36:54 1993 --- libg++-2.6-amiga/libg++/old-stream/Makefile.in Fri Jul 29 11:02:52 1994 *************** *** 11,15 **** USER_INCLUDES = File.h Filebuf.h Fmodes.h PlotFile.h SFile.h \ ! filebuf.h istream.h ostream.h stream.h streambuf.h # The following include files are private to the implementation. --- 11,15 ---- USER_INCLUDES = File.h Filebuf.h Fmodes.h PlotFile.h SFile.h \ ! _filebuf.h istream.h ostream.h stream.h streambuf.h # The following include files are private to the implementation. diff -2rcN libg++-2.6/libg++/old-stream/istream.h libg++-2.6-amiga/libg++/old-stream/istream.h *** libg++-2.6/libg++/old-stream/istream.h Fri Jan 17 22:11:03 1992 --- libg++-2.6-amiga/libg++/old-stream/istream.h Fri Jul 29 11:02:52 1994 *************** *** 30,34 **** #include #include ! #include #include --- 30,34 ---- #include #include ! #include <_filebuf.h> /* Avoid name clash; Filebuf.h <==> filebuf.h */ #include diff -2rcN libg++-2.6/libg++/old-stream/ostream.h libg++-2.6-amiga/libg++/old-stream/ostream.h *** libg++-2.6/libg++/old-stream/ostream.h Fri Jan 17 22:11:08 1992 --- libg++-2.6-amiga/libg++/old-stream/ostream.h Fri Jul 29 11:02:52 1994 *************** *** 33,37 **** #include #include ! #include #include --- 33,37 ---- #include #include ! #include <_filebuf.h> /* Avoid name clash; Filebuf.h <==> filebuf.h */ #include diff -2rcN libg++-2.6/libg++/proto-kit/Makefile libg++-2.6-amiga/libg++/proto-kit/Makefile *** libg++-2.6/libg++/proto-kit/Makefile Fri Jun 28 22:24:19 1991 --- libg++-2.6-amiga/libg++/proto-kit/Makefile Fri Jul 29 11:02:53 1994 *************** *** 71,75 **** # GNU directories ! GNULIBDIR := $(BASE)/usr/local/lib GNUIDIR := $(GNULIBDIR)/g++-include --- 71,75 ---- # GNU directories ! GNULIBDIR := /gnu/lib GNUIDIR := $(GNULIBDIR)/g++-include diff -2rcN libg++-2.6/libg++/proto-kit/Makefile.new libg++-2.6-amiga/libg++/proto-kit/Makefile.new *** libg++-2.6/libg++/proto-kit/Makefile.new Tue Jul 30 18:19:13 1991 --- libg++-2.6-amiga/libg++/proto-kit/Makefile.new Fri Jul 29 11:02:53 1994 *************** *** 71,75 **** # GNU directories ! GNULIBDIR := $(BASE)/usr/local/lib GNUIDIR := $(GNULIBDIR)/g++-include --- 71,75 ---- # GNU directories ! GNULIBDIR := /gnu/lib GNUIDIR := $(GNULIBDIR)/g++-include diff -2rcN libg++-2.6/libg++/proto-kit/hierarchy libg++-2.6-amiga/libg++/proto-kit/hierarchy *** libg++-2.6/libg++/proto-kit/hierarchy Fri Jun 28 22:24:37 1991 --- libg++-2.6-amiga/libg++/proto-kit/hierarchy Fri Jul 29 11:02:53 1994 *************** *** 1,3 **** ! #!/usr/local/bin/gawk -f #************************************************************************************** # --- 1,3 ---- ! #! /gnu/bin/gawk -f #************************************************************************************** # diff -2rcN libg++-2.6/libg++/proto-kit/prototype libg++-2.6-amiga/libg++/proto-kit/prototype *** libg++-2.6/libg++/proto-kit/prototype Fri Jun 28 22:24:51 1991 --- libg++-2.6-amiga/libg++/proto-kit/prototype Fri Jul 29 11:02:53 1994 *************** *** 1,3 **** ! #!/usr/local/bin/gawk -f # # types: types[x] = 1 for each type 'x' we have completed. 'x' has separators --- 1,3 ---- ! #! /gnu/bin/gawk -f # # types: types[x] = 1 for each type 'x' we have completed. 'x' has separators diff -2rcN libg++-2.6/libg++/src/BitSet.cc libg++-2.6-amiga/libg++/src/BitSet.cc *** libg++-2.6/libg++/src/BitSet.cc Wed May 11 08:53:49 1994 --- libg++-2.6-amiga/libg++/src/BitSet.cc Fri Jul 29 11:02:53 1994 *************** *** 30,34 **** #include #include ! #include #include --- 30,34 ---- #include #include ! #include /* Avoid getting String.h */ #include diff -2rcN libg++-2.6/libg++/src/Makefile.in libg++-2.6-amiga/libg++/src/Makefile.in *** libg++-2.6/libg++/src/Makefile.in Tue May 31 01:33:05 1994 --- libg++-2.6-amiga/libg++/src/Makefile.in Fri Jul 29 11:19:32 1994 *************** *** 36,40 **** # Comment out if you're getting regex from somewhere else. ! REGEX_OBJ=regex.o BIT_OBJS = bitand.o bitany.o bitblt.o bitclear.o bitcopy.o bitcount.o\ bitinvert.o bitlcomp.o bitset1.o bitxor.o --- 36,40 ---- # Comment out if you're getting regex from somewhere else. ! REGEX_OBJ=_regex.o BIT_OBJS = bitand.o bitany.o bitblt.o bitclear.o bitcopy.o bitcount.o\ bitinvert.o bitlcomp.o bitset1.o bitxor.o diff -2rcN libg++-2.6/libg++/src/Regex.cc libg++-2.6-amiga/libg++/src/Regex.cc *** libg++-2.6/libg++/src/Regex.cc Thu Jul 29 01:23:32 1993 --- libg++-2.6-amiga/libg++/src/Regex.cc Fri Jul 29 11:02:54 1994 *************** *** 29,33 **** extern "C" { ! #include } --- 29,33 ---- extern "C" { ! #include <_regex.h> /* Avoid name clash; Regex.h <==> regex.h */ } diff -2rcN libg++-2.6/libg++/src/String.cc libg++-2.6-amiga/libg++/src/String.cc *** libg++-2.6/libg++/src/String.cc Tue Jul 19 02:15:21 1994 --- libg++-2.6-amiga/libg++/src/String.cc Fri Jul 29 11:36:56 1994 *************** *** 23,27 **** #pragma implementation #endif ! #include #include #include --- 23,27 ---- #pragma implementation #endif ! #include <_String.h> #include #include *************** *** 31,35 **** // extern "C" { ! #include // } --- 31,35 ---- // extern "C" { ! #include <_regex.h> /* Avoid name clash; Regex.h <==> regex.h */ // } diff -2rcN libg++-2.6/libg++/src/_regex.cc libg++-2.6-amiga/libg++/src/_regex.cc *** libg++-2.6/libg++/src/_regex.cc Wed May 11 08:54:30 1994 --- libg++-2.6-amiga/libg++/src/_regex.cc Fri Jul 29 11:38:20 1994 *************** *** 115,119 **** /* Get the interface, including the syntax bits. */ ! #include "regex.h" --- 115,119 ---- /* Get the interface, including the syntax bits. */ ! #include "_regex.h" /* Avoid name clash; Regex.h <==> regex.h */ diff -2rcN libg++-2.6/libg++/src/depend libg++-2.6-amiga/libg++/src/depend *** libg++-2.6/libg++/src/depend Tue Oct 26 02:20:49 1993 --- libg++-2.6-amiga/libg++/src/depend Fri Jul 29 11:37:23 1994 *************** *** 171,175 **** new.h \ builtin.h \ ! regex.h \ Regex.h RndInt.o : RndInt.cc \ --- 171,175 ---- new.h \ builtin.h \ ! _regex.h \ Regex.h RndInt.o : RndInt.cc \ *************** *** 200,204 **** std.h String.o : String.cc \ ! String.h \ $(srcdir)/../$(IO_DIR)/stream.h \ $(srcdir)/../$(IO_DIR)/iostream.h \ --- 200,204 ---- std.h String.o : String.cc \ ! _String.h \ $(srcdir)/../$(IO_DIR)/stream.h \ $(srcdir)/../$(IO_DIR)/iostream.h \ *************** *** 208,212 **** new.h \ builtin.h \ ! regex.h Uniform.o : Uniform.cc \ builtin.h \ --- 208,212 ---- new.h \ builtin.h \ ! _regex.h Uniform.o : Uniform.cc \ builtin.h \ *************** *** 278,283 **** builtin.h \ std.h ! regex.o : regex.cc \ ! regex.h sqrt.o : sqrt.cc \ builtin.h \ --- 278,283 ---- builtin.h \ std.h ! _regex.o : _regex.cc \ ! _regex.h sqrt.o : sqrt.cc \ builtin.h \ diff -2rcN libg++-2.6/libg++/src/strclass.h libg++-2.6-amiga/libg++/src/strclass.h *** libg++-2.6/libg++/src/strclass.h Sat Apr 18 00:51:26 1992 --- libg++-2.6-amiga/libg++/src/strclass.h Fri Jul 29 11:36:21 1994 *************** *** 1,5 **** #ifndef _strclass_h #define _strclass_h ! #include typedef class String string; #endif --- 1,5 ---- #ifndef _strclass_h #define _strclass_h ! #include <_String.h> typedef class String string; #endif diff -2rcN libg++-2.6/libg++/tests/Makefile.sh libg++-2.6-amiga/libg++/tests/Makefile.sh *** libg++-2.6/libg++/tests/Makefile.sh Wed May 25 23:44:45 1994 --- libg++-2.6-amiga/libg++/tests/Makefile.sh Fri Jul 29 11:41:23 1994 *************** *** 91,97 **** 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 \ --- 91,97 ---- 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 \ *************** *** 134,147 **** LIB_FOR_tCurses="-lcurses -ltermcap" for TEST in $TESTS0 tiLList; do echo "${TEST}: ${TEST}.o" echo ' $(CXX) $(LDFLAGS)' "${TEST}.o" '-o $@ $(LIBS)' \ ! `eval echo '$LIB_FOR_'$TEST` echo "" done for TEST in twrapper tgwrapper $TESTS1 tCurses tGetOpt; do echo "${TEST}: " '$(LIBTEST)' " ${TEST}.o" echo ' $(CXX) $(LDFLAGS)' "${TEST}.o" '-o $@ $(LIBTEST) $(LIBS)' \ ! `eval echo '$LIB_FOR_'$TEST` echo "" done --- 134,153 ---- 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 $TESTS0 tiLList; do echo "${TEST}: ${TEST}.o" echo ' $(CXX) $(LDFLAGS)' "${TEST}.o" '-o $@ $(LIBS)' \ ! `eval /bin/echo '$LIB_FOR_'$TEST` echo "" done + # 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 $TESTS1 tCurses tGetOpt; do echo "${TEST}: " '$(LIBTEST)' " ${TEST}.o" echo ' $(CXX) $(LDFLAGS)' "${TEST}.o" '-o $@ $(LIBTEST) $(LIBS)' \ ! `eval /bin/echo '$LIB_FOR_'$TEST` echo "" done diff -2rcN libg++-2.6/libg++/tests/test_h.cc libg++-2.6-amiga/libg++/tests/test_h.cc *** libg++-2.6/libg++/tests/test_h.cc Sun Dec 5 00:27:54 1993 --- libg++-2.6-amiga/libg++/tests/test_h.cc Fri Jul 29 11:02:59 1994 *************** *** 68,72 **** #include #include ! #include #include #include --- 68,72 ---- #include #include ! #include <_complex.h> /* Avoid name clash; Complex.h <==> complex.h */ #include #include *************** *** 81,85 **** #include #include ! #include #include #include --- 81,85 ---- #include #include ! #include <_regex.h> /* Avoid name clash; Regex.h <==> regex.h */ #include #include *************** *** 89,93 **** #include #include ! #include #include #include --- 89,93 ---- #include #include ! #include /* Avoid getting String.h */ #include #include diff -2rcN libg++-2.6/libiberty/Makefile.in libg++-2.6-amiga/libiberty/Makefile.in *** libg++-2.6/libiberty/Makefile.in Wed May 18 18:38:47 1994 --- libg++-2.6-amiga/libiberty/Makefile.in Fri Jul 29 11:02:59 1994 *************** *** 29,33 **** srcdir = . ! prefix = /usr/local exec_prefix = $(prefix) --- 29,33 ---- srcdir = . ! prefix = /gnu exec_prefix = $(prefix) *************** *** 61,65 **** AR_FLAGS = rc ! CFLAGS = -g BISON = bison MAKEINFO = makeinfo --- 61,65 ---- AR_FLAGS = rc ! CFLAGS = -O BISON = bison MAKEINFO = makeinfo *************** *** 92,96 **** check installcheck: ! #### Host, target, and site specific Makefile fragments come in here. ### --- 92,96 ---- check installcheck: ! CC=gcc #### Host, target, and site specific Makefile fragments come in here. ### diff -2rcN libg++-2.6/libio/config.shared libg++-2.6-amiga/libio/config.shared *** libg++-2.6/libio/config.shared Sat Jun 4 03:29:11 1994 --- libg++-2.6-amiga/libio/config.shared Fri Jul 29 11:02:59 1994 *************** *** 41,45 **** echo "SUBDIRS = ${SUBDIRS}" ! echo "prefix = ${prefix-/usr/local}" echo "exec_prefix = ${exec_prefix-'${prefix}'}" --- 41,45 ---- echo "SUBDIRS = ${SUBDIRS}" ! echo "prefix = ${prefix-/gnu}" echo "exec_prefix = ${exec_prefix-'${prefix}'}" *************** *** 92,96 **** 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/ ; \' --- 92,96 ---- 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/ ; \' *************** *** 103,108 **** echo 'WRAP_C_INCLUDES = -I$(srcdir)'/${TOLIBGXX}g++-include fi ! echo 'CFLAGS = -g' ! echo 'CXXFLAGS = -g -O' if test "${DOING_LIBGXX}" = "true" ; then --- 103,108 ---- echo 'WRAP_C_INCLUDES = -I$(srcdir)'/${TOLIBGXX}g++-include fi ! echo 'CFLAGS = -O' ! echo 'CXXFLAGS = -O' if test "${DOING_LIBGXX}" = "true" ; then diff -2rcN libg++-2.6/libio/dbz/Makefile.in libg++-2.6-amiga/libio/dbz/Makefile.in *** libg++-2.6/libio/dbz/Makefile.in Thu Jun 30 16:50:28 1994 --- libg++-2.6-amiga/libio/dbz/Makefile.in Fri Jul 29 11:42:23 1994 *************** *** 1,4 **** srcdir = . ! CFLAGS = -g C_FLAGS = $(CFLAGS) -I$(srcdir) -I.. -I$(srcdir)/.. -DDBZ_FINISH='_IO_flush_all()' CC = `if [ -f ../../../gcc/gcc ] ; \ --- 1,4 ---- srcdir = . ! CFLAGS = -O2 C_FLAGS = $(CFLAGS) -I$(srcdir) -I.. -I$(srcdir)/.. -DDBZ_FINISH='_IO_flush_all()' CC = `if [ -f ../../../gcc/gcc ] ; \ *************** *** 118,121 **** --- 118,122 ---- chmod -w xx ./rdbz -E 1000 -0 -M -i -S -u -U -C xx dbase + sleep 5 # Give lock time to go away (AmigaDOS hack) rmdir xx sed '/> 0/d' $(RHIST) >dbase.used diff -2rcN libg++-2.6/libio/gen-params libg++-2.6-amiga/libio/gen-params *** libg++-2.6/libio/gen-params Tue Jul 19 02:04:09 1994 --- libg++-2.6-amiga/libio/gen-params Fri Jul 29 11:02:59 1994 *************** *** 51,55 **** 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 ; \ --- 51,55 ---- 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 ; \ diff -2rcN libg++-2.6/libio/tests/Makefile.in libg++-2.6-amiga/libio/tests/Makefile.in *** libg++-2.6/libio/tests/Makefile.in Wed Jun 22 21:46:59 1994 --- libg++-2.6-amiga/libio/tests/Makefile.in Fri Jul 29 11:03:00 1994 *************** *** 18,24 **** 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 --- 18,24 ---- 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 *************** *** 163,167 **** check-tfformat: tfformat ! ./tfformat tiformat: $(srcdir)/tiformat.c --- 163,167 ---- check-tfformat: tfformat ! -./tfformat tiformat: $(srcdir)/tiformat.c