diff -c gnu/libg++/Makefile.in:1.1.1.4 gnu/libg++/Makefile.in:1.6 *** gnu/libg++/Makefile.in:1.1.1.4 Sat Nov 25 00:32:43 1995 --- gnu/libg++/Makefile.in Sat Nov 25 00:32:43 1995 *************** *** 669,675 **** -rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E local-distclean: ! -rm -f Makefile config.status local-maintainer-clean: @echo "This command is intended for maintainers to use;" --- 669,675 ---- -rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E local-distclean: ! -rm -f Makefile config.status mh-frag local-maintainer-clean: @echo "This command is intended for maintainers to use;" diff -c gnu/libg++/configure.in:1.1.1.6 gnu/libg++/configure.in:1.2 *** gnu/libg++/configure.in:1.1.1.6 Sat Nov 25 00:32:43 1995 --- gnu/libg++/configure.in Sat Nov 25 00:32:44 1995 *************** *** 396,401 **** --- 396,405 ---- noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx" ;; + i[345]86-*-linux) + # linux has rx in libc + skipdirs="$skipdirs target-librx" + ;; i[345]86-*-win32) noconfigdirs="$noconfigdirs tk" # Can't build gdb for win32 if not native. diff -c gnu/libg++/libg++/Makefile.in:1.1.1.5 gnu/libg++/libg++/Makefile.in:1.10 *** gnu/libg++/libg++/Makefile.in:1.1.1.5 Sat Nov 25 00:32:45 1995 --- gnu/libg++/libg++/Makefile.in Sat Nov 25 00:32:45 1995 *************** *** 123,129 **** $(RANLIB) $(ARLIB) $(SHLIB): piclist $(MULTITOP)/../libstdc++/piclist ! $(CXX) $(SHFLAGS) -shared -o $(SHLIB) `cat piclist` $(SHDEPS) $(SHARLIB): $(SHLIB) -rm -f t$(SHARLIB) --- 123,129 ---- $(RANLIB) $(ARLIB) $(SHLIB): piclist $(MULTITOP)/../libstdc++/piclist ! $(CC) $(SHFLAGS) -shared -o $(SHLIB) `cat piclist` $(SHDEPS) $(SHARLIB): $(SHLIB) -rm -f t$(SHARLIB) diff -c gnu/libg++/libg++/configure.in:1.1.1.5 gnu/libg++/libg++/configure.in:1.7 *** gnu/libg++/libg++/configure.in:1.1.1.5 Sat Nov 25 00:32:45 1995 --- gnu/libg++/libg++/configure.in Sat Nov 25 00:32:45 1995 *************** *** 134,140 **** ALL='libs rest-in-parallel' MOSTLYCLEAN='*.o pic stamp-picdir piclist core \#* temp.c dummy.out dummy.[Cc] TMP a.out list' CLEAN='.stmp-* _G_config.h $(BUILD_LIBS)' - DISTCLEAN='config.status Makefile target-mkfrag' INFO_FILES=libg++ INFO_SUBDIRS='$(SUBDIRS)' --- 134,139 ---- diff -c gnu/libg++/libg++/config/linux.ml:1.1.1.3 gnu/libg++/libg++/config/linux.ml:1.11 *** gnu/libg++/libg++/config/linux.ml:1.1.1.3 Sat Nov 25 00:32:45 1995 --- gnu/libg++/libg++/config/linux.ml Sat Nov 25 00:32:46 1995 *************** *** 5,8 **** MSHLINK = libg++.so.$(MAJOR_VERSION) BUILD_LIBS = $(ARLIB) $(SHLIB) $(SHLINK) $(MSHLINK) SHFLAGS = -Wl,-soname,$(MSHLINK) ! SHCURSES = -lcurses --- 5,8 ---- MSHLINK = libg++.so.$(MAJOR_VERSION) BUILD_LIBS = $(ARLIB) $(SHLIB) $(SHLINK) $(MSHLINK) SHFLAGS = -Wl,-soname,$(MSHLINK) ! SHCURSES = #-lcurses diff -c gnu/libg++/libg++/config/linux.mt:1.1.1.1 gnu/libg++/libg++/config/linux.mt:1.6 *** gnu/libg++/libg++/config/linux.mt:1.1.1.1 Sat Nov 25 00:32:46 1995 --- gnu/libg++/libg++/config/linux.mt Sat Nov 25 00:32:46 1995 *************** *** 10,12 **** --- 10,21 ---- G_CONFIG_ARGS = CONFIG_NM="nm -d" # Don't include iostream files in libg++.a. IO_OBJECTS_TO_GET = + # No rx.o + RX_OBJ= + # No curses + CURSESW_OBJ= + TCURSES= + _G_CONFIG_H= + + # That is where we keep the g++ header files. + gxx_includedir =$(prefix)/include/g++ diff -c /dev/null gnu/libg++/libg++/proto-kit/Makefile:1.1.1.1 *** /dev/null Sat Nov 25 00:32:51 1995 --- gnu/libg++/libg++/proto-kit/Makefile Sat Nov 25 00:32:52 1995 *************** *** 0 **** --- 1,379 ---- + #****************************************************************************** + # This GNUmakefile is useful for large and complex projects which involve + # both G++ library prototypes, and prototypes added by the user(s). It + # is assumed that certain conventions are followed. + # + # 1) each object has its own source and header files. For example class W + # would have W.h and W.cc + # + # 2) each prototype object has its own source and header files (W.hP and W.ccP) + # + # 3) object header files are contained in directory $(IDIR) (for Include + # DIRectory) + # + # 4) object source files are contained in the current directory + # + # 5) prototype instantiations are contained in $(PC) (for Prototype C++ + # directory) + # + # 6) user prototype files (both header and source) are contained in $(IPP) + # + # 7) non-class code is contained in .h and .cc files, which live in $(IDIR) + # and the current directory respectively + # + # *) as an extra, I have added the convention that whenever a W.cc file + # is being compiled, the macro _W_cc is defined. This is useful + # particularly for conditional parts of header files (for example, + # W.h could have ifdef _W_cc ... + # + # The makefile works in the following manner: the source dependencies are + # contained in .Makefile.S_DEP, while the (machine generated) object + # dependencies are contained in .Makefile.O_DEP. The types needed by + # the program are defined by several variables, and the makefile generates + # the necessary dependencies (both source and object) from those variables. + # The prototype lists are contained in .Makefile.TYPES. + # + # NOTE: in order to create the machine generated files .Makefile.TYPES, + # .Makefile.S_DEP, and .Makefile.O_DEP, empty versions of these + # file must exist. They can be easily created using "touch ". + # + # -- Carl Staelin + # staelin@princeton.edu + #****************************************************************************** + + #****************************************************************************** + # standard Makefile definitions + + comma := , + space := $(empty) $(empty) + tab := $(empty) $(empty) + + #****************************************************************************** + # definitions from environment variables + + # the CPATH include directories + cpath-include-directories := $(addprefix -I, $(subst :,$(space),$(CPATH))) + + # the LPATH load directories + lpath-load-directories := $(addprefix -L, $(subst :,$(space),$(LPATH))) + + #****************************************************************************** + # Basic definitions + + HOST := $(shell hostname) + + BASE := + + # CMU Directories + USR := $(BASE)/usr + MACH := $(BASE)/usr/mach + CS := $(BASE)/usr/cs + + # GNU directories + GNULIBDIR := $(BASE)/usr/local/lib + GNUIDIR := $(GNULIBDIR)/g++-include + + # the g++ library prototypes... + LPP := $(GNUIDIR) + PC := ../libg++ + + # the user's library prototypes... + IPP := ../proto + + # the include directory + IDIR := ../include + + # the include directories needed... + IDIRS := -I$(IDIR) -I$(PC) -I$(GNUIDIR) $(cpath-include-directories) + + # the directories where the libraries live... + LDIRS := $(lpath-load-directories) + + #****************************************************************************** + # standard function (and associated variables) definitions + + C++ = g++ + C++FLAGS = -pipe -O $(IDIRS) + -Dc_plusplus \ + -DDEBUG \ + -D$(strip $(subst .,_, _$(basename $(@F))_cc)) + + + GENCLASS = ../bin/genclass.extnsn + PREPEND = ../bin/prepend + HIERARCHY = ../bin/hierarchy + MAKE_TYPES = ../bin/make-types + PROTOTYPE = ../bin/prototype + + #****************************************************************************** + # implicit rules + + %.o : %.cc + $(C++) $(C++FLAGS) \ + -c -o $@ $(@D)$(basename $(@F)).cc + + #****************************************************************************** + # User types + + BASIC_TYPES = \ + int \ + u_int \ + l_int \ + l_u_int + + # generated by this make file (initially create an empty .Makefile.TYPES + # so that "make dependencies" can create the real file) + include .Makefile.TYPES + + #****************************************************************************** + # User types (with sample values filled in) + # + # NOTE: do NOT add .h to the end of these, MAKE does it for you! + + HEADER_FILES = \ + disk_set \ + file_types \ + include \ + inode \ + inode_t \ + lib \ + main \ + nfs_functions \ + nfs_mount \ + nfs_params \ + nfs_prot \ + system + + SOURCE_FILES = \ + disk_set \ + lib \ + nfs_auxil \ + nfs_dirent \ + nfs_fh \ + nfs_ipcress \ + nfs_links \ + nfs_main \ + nfs_mnt_serv \ + nfs_mount_xdr \ + nfs_prot_xdr \ + nfs_serv1 \ + nfs_serv2 \ + nfs_serv3 \ + nfs_serv4 \ + + #****************************************************************************** + # some sample machine generated user-file stuff + # + ../include/file_types.h : ../include/file_types.type.h ../include/file_types.operation.h + ../include/Substrate_file.h : ../include/file_types.includes.h + + ../include/file_types.type.h : ../include/file_types.hierarchy + $(HIERARCHY) -voutput_type=type ../include/file_types.hierarchy > $@ + + ../include/file_types.includes.h : ../include/file_types.hierarchy + $(HIERARCHY) -voutput_type=general -vpreamble='#include "' \ + -vpostamble='.h"' -vprint_first=1 ../include/file_types.hierarchy > $@ + + ../include/file_types.operation.h : ../include/file_types.hierarchy + (echo '#define FILE_TYPES_OPERATION(OPERATION) \' ; \ + $(HIERARCHY) -voutput_type=general -vpreamble='OPERATION(' \ + -vpostamble=') \' -vprint_first=1 ../include/file_types.hierarchy ; \ + echo ; ) | sed 's/\.//g' > $@ ; + + #****************************************************************************** + # source files... + + HEADERS := $(wildcard $(addprefix $(IDIR)/, $(addsuffix .h, $(USER_TYPES) $(HEADER_FILES)))) + + SOURCES := $(wildcard $(addsuffix .cc, $(USER_TYPES) $(SOURCE_FILES))) + + OBJECTS := $(patsubst %.cc,%.o,$(SOURCES)) + + #****************************************************************************** + # User prototype instantiations + + USER_PROTO_HEADERS := $(addprefix $(PC)/, $(addsuffix .h, $(foreach type, $(basename $(notdir $(wildcard $(addprefix $(IPP)/, $(addsuffix .hP, $(USER_BASE_PROTO_TYPES)))))), $(filter %.$(type), $(USER_PROTO_TYPES))))) + + USER_PROTO_SOURCES := $(addprefix $(PC)/, $(addsuffix .cc, $(foreach type, $(basename $(notdir $(wildcard $(addprefix $(IPP)/, $(addsuffix .ccP, $(USER_BASE_PROTO_TYPES)))))), $(filter %.$(type), $(USER_PROTO_TYPES))))) + + USER_PROTO_OBJECTS := $(patsubst %.cc, %.o, $(USER_PROTO_SOURCES)) + + USER_PROTO_TYPE_SOURCES := $(wildcard $(addprefix $(IPP)/, $(addsuffix .hP, $(USER_BASE_PROTO_TYPES)) $(addsuffix .ccP, $(USER_BASE_PROTO_TYPES)))) + + #****************************************************************************** + # libg++ prototype instantiations + + LIB_PROTO_HEADERS := $(addprefix $(PC)/, $(addsuffix .h, $(foreach type, $(basename $(notdir $(wildcard $(addprefix $(LPP)/, $(addsuffix .hP, $(LIB_BASE_PROTO_TYPES)))))), $(filter %.$(type), $(LIB_PROTO_TYPES))))) + + LIB_PROTO_SOURCES := $(addprefix $(PC)/, $(addsuffix .cc, $(foreach type, $(basename $(notdir $(wildcard $(addprefix $(LPP)/, $(addsuffix .ccP, $(LIB_BASE_PROTO_TYPES)))))), $(filter %.$(type), $(LIB_PROTO_TYPES))))) + + LIB_PROTO_OBJECTS := $(patsubst %.cc, %.o, $(LIB_PROTO_SOURCES)) + + .PHONY : test + test : + @echo LIB_PROTO_TYPES = "${LIB_PROTO_TYPES}"; + @echo LIB_BASE_PROTO_TYPES = "${LIB_BASE_PROTO_TYPES}" ; + @echo LIB_PROTO_OBJECTS = "${LIB_PROTO_OBJECTS}" ; + @echo LIB_PROTO_HEADERS = "${LIB_PROTO_HEADERS}" ; + + #***************************************************************************** + # main procedures.. + + # example: + foo : foo.o $(OBJECTS) + $(C++) $(C++FLAGS) -o $@ foo.o $(OBJECTS) $(LDIRS) + + sources : $(SOURCES) + + #****************************************************************************** + # various cleanup stuff... + + .PHONY : rmback clean realclean + + rmback : + cd .. ; rm -f proto/*~ include/*~ src/*~ + + clean : rmback + rm -f $(OBJECTS) $(PROTOLIB) $(LIB_PROTO_OBJECTS) $(USER_PROTO_OBJECTS) + + realclean : clean + rm -f $(LIB_PROTO_SOURCES) $(USER_PROTO_SOURCES) $(LIB_PROTO_HEADERS) $(USER_PROTO_HEADERS) + + + #***************************************************************************** + # debugging actions + + %.E : %.cc + $(C++) $(C++FLAGS) -E $(@D)$(basename $(@F)).cc > $@ + + %.s : %.cc + $(C++) -S $(C++FLAGS) $< -o $@ + + #****************************************************************************** + # "functions" for creating library source code from prototypes + + parameters = $(subst .,$(space),$(notdir $(basename $(basename $@)))) + ifdef_filename = $(subst .,_,$(notdir $(basename $@))) + + generic-type = $(subst .,,$(suffix $(basename $(notdir $@)))) + + # + # return the type if it should be a "val" type (pointer or basic type) + # + parameter-val-q = $(filter %_p, $(parameter)) $(filter-out %_p, $(filter $(parameter), $(BASIC_TYPES))) + + # + # return the list of pairs of types and their prototype type (val or ref) + # + proto-type-arg = $(parameter) \ + $(patsubst %, val, $(filter 1, $(words $(parameter-val-q)))) \ + $(patsubst %, ref, $(filter-out 1, $(words $(parameter-val-q)))) + + define make-proto-file + $(GENCLASS) \ + $(dir $<) \ + $(dir $@) \ + $(suffix $@) \ + $(foreach parameter, $(parameters), $(proto-type-arg)) \ + $(generic-type) ; + endef + + + define prepend-proto-includes + $(PREPEND) \ + $(addsuffix .h, $(basename $@)) \ + '#include "include.h"' \ + $(patsubst %, '#include "%.h"', $(foreach type, $(USER_TYPES) $(USER_PROTO_TYPES) $(LIB_PROTO_TYPES), $(patsubst %, $(type), $(filter $(subst .,, $(type)), $(patsubst %_p, %, $(parameters)))))) ; + endef + + #****************************************************************************** + # libg++ prototype dependencies + + + # + # Used to automatically generate a %_p.defs file, which is required by classes + # which do comparisons, for pointer types to objects which have the real + # comparison code. + # + # this will cat the appropriate strings + # + $(addprefix $(PC)/, $(addsuffix .h, $(filter-out char_p.defs, $(filter %_p.defs, $(LIB_PROTO_TYPES))))) : + @ echo creating $@ ; \ + ( ifdef_filename=$(strip $(ifdef_filename)) \ + p=$(strip $(patsubst %_p, %, $(parameters))) \ + ../bin/make-defs-file ) > $@ ; + + lib_proto_intermediate_sources = \ + $(filter-out %_p.defs.h, $(LIB_PROTO_HEADERS) $(LIB_PROTO_SOURCES)) \ + $(addprefix $(PC)/, $(addsuffix .h, char_p.defs)) + + lib_type_and_suffix_list = $(sort $(join $(suffix $(basename $(lib_proto_intermediate_sources))), $(addprefix ., $(suffix $(lib_proto_intermediate_sources))))) + + #****************************************************************************** + # prototype dependencies + + proto_intermediate_sources = \ + $(USER_PROTO_HEADERS) \ + $(USER_PROTO_SOURCES) + + type_and_suffix_list = $(sort $(join $(suffix $(basename $(proto_intermediate_sources))), $(addprefix ., $(suffix $(proto_intermediate_sources))))) + + #****************************************************************************** + # generate machine generated dependencies + + H_FILES = $(HEADERS) $(LIB_PROTO_HEADERS) $(USER_PROTO_HEADERS) + CC_FILES = $(SOURCES) $(LIB_PROTO_SOURCES) $(USER_PROTO_SOURCES) + + DEPENDENCIES = $(addsuffix .d, $(basename $(CC_FILES))) + + $(addsuffix .d, $(basename $(CC_FILES))) : %.d : %.cc + ( echo -n $(@D) ; $(C++) -M $(C++FLAGS) $*.cc) > $@; + + #****************************************************************************** + # machine generated type stuff + # + + $(DEPENDENCIES) : $(H_FILES) + + .PHONY : dependencies source-dependencies object-dependencies + + dependencies : type-definitions source-dependencies + @ $(MAKE) object-dependencies + + object-dependencies : $(DEPENDENCIES) + @echo making object dependencies... ; \ + rm .Makefile.O_DEP ; \ + ls . | grep '\.d$$' > /tmp/dependencies ; \ + ls $(PC) | gawk '{printf "$(PC)/%s\n", $$0 ; }' | grep '\.d$$' >> \ + /tmp/dependencies ; \ + for file in `cat /tmp/dependencies` ; do \ + cat $$file ; \ + done > .Makefile.O_DEP.tmp ; \ + mv .Makefile.O_DEP.tmp .Makefile.O_DEP ; \ + for file in `cat /tmp/dependencies` ; do \ + rm $$file ; \ + done ; \ + rm /tmp/dependencies ; + + + source-dependencies : + @ echo making source dependencies... ; \ + ($(PROTOTYPE) -voutput_type=libg++-prototypes \ + ../include/prototype.dependencies | \ + gawk '($$1 !~ "_p.defs$$") || ($$1 == "char_p.defs") { print ; }' | \ + PROTO_SOURCE=$(LPP) PP=LPP ../bin/make-source-dependencies ; \ + ($(PROTOTYPE) -voutput_type=user-prototypes \ + ../include/prototype.dependencies ; \ + $(HIERARCHY) -voutput_type=general ../include/file_types.hierarchy) | \ + PROTO_SOURCE=$(IPP) PP=IPP ../bin/make-source-dependencies ; \ + ) > .Makefile.S_DEP ; + + type-definitions : + @ echo make type definitions... ; \ + $(MAKE_TYPES) > .Makefile.TYPES ; + + #****************************************************************************** + # include machine generated dependencies + + include .Makefile.S_DEP + include .Makefile.O_DEP diff -c gnu/libg++/libg++/src/Makefile.in:1.1.1.4 gnu/libg++/libg++/src/Makefile.in:1.4 *** gnu/libg++/libg++/src/Makefile.in:1.1.1.4 Sat Nov 25 00:32:55 1995 --- gnu/libg++/libg++/src/Makefile.in Sat Nov 25 00:32:55 1995 *************** *** 33,38 **** --- 33,39 ---- PlotFile.o SFile.o REGEX_OBJ= + CURSESW_OBJ=CursesW.o BIT_OBJS = bitand.o bitany.o bitblt.o bitclear.o bitcopy.o bitcount.o\ bitinvert.o bitlcomp.o bitset1.o bitxor.o OBJS = AllocRing.o Obstack.o builtin.o \ *************** *** 41,47 **** Normal.o NegExp.o Weibull.o Erlang.o DiscUnif.o \ Uniform.o Poisson.o HypGeom.o Geom.o Binomial.o \ RNG.o ACG.o MLCG.o RndInt.o \ ! Fix.o Fix16.o Fix24.o CursesW.o GetOpt.o \ chr.o error.o gcd.o hash.o \ lg.o fmtq.o ioob.o pow.o sqrt.o str.o timer.o \ compare.o $(BIT_OBJS) \ --- 42,48 ---- Normal.o NegExp.o Weibull.o Erlang.o DiscUnif.o \ Uniform.o Poisson.o HypGeom.o Geom.o Binomial.o \ RNG.o ACG.o MLCG.o RndInt.o \ ! Fix.o Fix16.o Fix24.o $(CURSESW_OBJ) GetOpt.o \ chr.o error.o gcd.o hash.o \ lg.o fmtq.o ioob.o pow.o sqrt.o str.o timer.o \ compare.o $(BIT_OBJS) \ diff -c gnu/libg++/libg++/src/configure.in:1.1.1.4 gnu/libg++/libg++/src/configure.in:1.6 *** gnu/libg++/libg++/src/configure.in:1.1.1.4 Sat Nov 25 00:32:56 1995 --- gnu/libg++/libg++/src/configure.in Sat Nov 25 00:32:56 1995 *************** *** 16,30 **** LIBDIR=yes TOLIBGXX=../ ! ALL='$(OBJS)' EXTRA_DISTCLEAN=rx.h MOSTLYCLEAN='*.o pic stamp-picdir core libgxx.list' XCINCLUDES='-I$(MULTITOP)/../../libio' (. ${srcdir}/../config.shared) >${package_makefile_frag} ! files=../../librx/rx.h ! links=rx.h # post-target: --- 16,36 ---- LIBDIR=yes TOLIBGXX=../ ! ALL=libgxx.list EXTRA_DISTCLEAN=rx.h MOSTLYCLEAN='*.o pic stamp-picdir core libgxx.list' XCINCLUDES='-I$(MULTITOP)/../../libio' (. ${srcdir}/../config.shared) >${package_makefile_frag} ! case "${target}" in ! *-*-linux*) ! ;; ! *) ! files=../../librx/rx.h ! links=rx.h ! ;; ! esac # post-target: diff -c gnu/libg++/libg++/src/depend:1.1.1.3 gnu/libg++/libg++/src/depend:1.3 *** gnu/libg++/libg++/src/depend:1.1.1.3 Sat Nov 25 00:32:56 1995 --- gnu/libg++/libg++/src/depend Sat Nov 25 00:32:56 1995 *************** *** 2,11 **** ACG.o: $(srcdir)/ACG.cc \ $(srcdir)/ACG.h \ ! $(srcdir)/RNG.h \ ! $(MULTITOP)/../../libio/_G_config.h AllocRing.o: $(srcdir)/AllocRing.cc \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 2,10 ---- ACG.o: $(srcdir)/ACG.cc \ $(srcdir)/ACG.h \ ! $(srcdir)/RNG.h AllocRing.o: $(srcdir)/AllocRing.cc \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 22,28 **** $(srcdir)/../../libstdc++/std/new.h Binomial.o: $(srcdir)/Binomial.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 21,27 ---- $(srcdir)/../../libstdc++/std/new.h Binomial.o: $(srcdir)/Binomial.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 44,50 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ - $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ --- 43,48 ---- *************** *** 72,78 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ - $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/bitprims.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ --- 70,75 ---- *************** *** 97,103 **** $(srcdir)/../../libio/strfile.h CursesW.o: $(srcdir)/CursesW.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 94,100 ---- $(srcdir)/../../libio/strfile.h CursesW.o: $(srcdir)/CursesW.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 122,128 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(MULTITOP)/../../libio/_G_config.h $(srcdir)/builtin.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ --- 119,125 ---- $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(srcdir)/builtin.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ *************** *** 141,147 **** $(srcdir)/Pix.h DiscUnif.o: $(srcdir)/DiscUnif.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 138,144 ---- $(srcdir)/Pix.h DiscUnif.o: $(srcdir)/DiscUnif.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 160,166 **** $(srcdir)/DiscUnif.h Erlang.o: $(srcdir)/Erlang.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 157,163 ---- $(srcdir)/DiscUnif.h Erlang.o: $(srcdir)/Erlang.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 183,189 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(MULTITOP)/../../libio/_G_config.h $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 180,186 ---- $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 211,217 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(MULTITOP)/../../libio/_G_config.h $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 208,214 ---- $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 229,235 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(MULTITOP)/../../libio/_G_config.h $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 226,232 ---- $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 243,249 **** $(srcdir)/../../libstdc++/std/cerrno.h Geom.o: $(srcdir)/Geom.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 240,246 ---- $(srcdir)/../../libstdc++/std/cerrno.h Geom.o: $(srcdir)/Geom.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 262,268 **** $(srcdir)/Geom.h GetOpt.o: $(srcdir)/GetOpt.cc \ $(srcdir)/GetOpt.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 259,265 ---- $(srcdir)/Geom.h GetOpt.o: $(srcdir)/GetOpt.cc \ $(srcdir)/GetOpt.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 276,282 **** $(srcdir)/../../libstdc++/std/cerrno.h HypGeom.o: $(srcdir)/HypGeom.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 273,279 ---- $(srcdir)/../../libstdc++/std/cerrno.h HypGeom.o: $(srcdir)/HypGeom.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 298,311 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ - $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/Integer.hP Integer.o: $(srcdir)/Integer.cc \ $(srcdir)/Integer.h \ $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(MULTITOP)/../../libio/_G_config.h $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 295,307 ---- $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ $(srcdir)/Integer.hP Integer.o: $(srcdir)/Integer.cc \ $(srcdir)/Integer.h \ $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 327,333 **** $(srcdir)/Integer.hP LogNorm.o: $(srcdir)/LogNorm.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 323,329 ---- $(srcdir)/Integer.hP LogNorm.o: $(srcdir)/LogNorm.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 347,357 **** $(srcdir)/LogNorm.h MLCG.o: $(srcdir)/MLCG.cc \ $(srcdir)/MLCG.h \ ! $(srcdir)/RNG.h \ ! $(MULTITOP)/../../libio/_G_config.h NegExp.o: $(srcdir)/NegExp.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 343,352 ---- $(srcdir)/LogNorm.h MLCG.o: $(srcdir)/MLCG.cc \ $(srcdir)/MLCG.h \ ! $(srcdir)/RNG.h NegExp.o: $(srcdir)/NegExp.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 370,376 **** $(srcdir)/NegExp.h Normal.o: $(srcdir)/Normal.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 365,371 ---- $(srcdir)/NegExp.h Normal.o: $(srcdir)/Normal.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 389,395 **** $(srcdir)/Normal.h Obstack.o: $(srcdir)/Obstack.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 384,390 ---- $(srcdir)/Normal.h Obstack.o: $(srcdir)/Obstack.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 408,414 **** $(srcdir)/../../libstdc++/std/new.h Poisson.o: $(srcdir)/Poisson.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 403,409 ---- $(srcdir)/../../libstdc++/std/new.h Poisson.o: $(srcdir)/Poisson.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 427,433 **** $(srcdir)/Poisson.h RNG.o: $(srcdir)/RNG.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 422,428 ---- $(srcdir)/Poisson.h RNG.o: $(srcdir)/RNG.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 444,458 **** $(srcdir)/RNG.h Random.o: $(srcdir)/Random.cc \ $(srcdir)/Random.h \ ! $(srcdir)/RNG.h \ ! $(MULTITOP)/../../libio/_G_config.h Rational.o: $(srcdir)/Rational.cc \ $(srcdir)/Rational.h \ $(srcdir)/Integer.h \ $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ - $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ --- 439,451 ---- $(srcdir)/RNG.h Random.o: $(srcdir)/Random.cc \ $(srcdir)/Random.h \ ! $(srcdir)/RNG.h Rational.o: $(srcdir)/Rational.cc \ $(srcdir)/Rational.h \ $(srcdir)/Integer.h \ $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ *************** *** 469,475 **** $(srcdir)/../../libstdc++/cmath \ $(srcdir)/../../libstdc++/std/cmath.h Regex.o: $(srcdir)/Regex.cc \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 462,468 ---- $(srcdir)/../../libstdc++/cmath \ $(srcdir)/../../libstdc++/std/cmath.h Regex.o: $(srcdir)/Regex.cc \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 486,502 **** $(srcdir)/builtin.h \ $(srcdir)/../../libstdc++/cmath \ $(srcdir)/../../libstdc++/std/cmath.h \ ! rx.h $(srcdir)/Regex.h RndInt.o: $(srcdir)/RndInt.cc \ $(srcdir)/RndInt.h \ ! $(srcdir)/RNG.h \ ! $(MULTITOP)/../../libio/_G_config.h SLList.o: $(srcdir)/SLList.cc \ $(srcdir)/../../libio/stream.h \ $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(MULTITOP)/../../libio/_G_config.h $(srcdir)/builtin.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ --- 479,494 ---- $(srcdir)/builtin.h \ $(srcdir)/../../libstdc++/cmath \ $(srcdir)/../../libstdc++/std/cmath.h \ ! $(srcdir)/Regex.h RndInt.o: $(srcdir)/RndInt.cc \ $(srcdir)/RndInt.h \ ! $(srcdir)/RNG.h SLList.o: $(srcdir)/SLList.cc \ $(srcdir)/../../libio/stream.h \ $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(srcdir)/builtin.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ *************** *** 518,524 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ - $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/SmplStat.h \ $(srcdir)/builtin.h \ $(srcdir)/std.h \ --- 510,515 ---- *************** *** 541,547 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ - $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/SmplHist.h \ $(srcdir)/SmplStat.h \ $(srcdir)/builtin.h \ --- 532,537 ---- *************** *** 564,570 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ - $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/SmplStat.h \ $(srcdir)/builtin.h \ $(srcdir)/std.h \ --- 554,559 ---- *************** *** 586,592 **** $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(MULTITOP)/../../libio/_G_config.h $(srcdir)/Regex.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ --- 575,581 ---- $(srcdir)/../../libio/iostream.h \ $(srcdir)/../../libio/streambuf.h \ $(srcdir)/../../libio/libio.h \ ! $(srcdir)/Regex.h \ $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ *************** *** 606,612 **** $(srcdir)/../../libstdc++/std/cmath.h Uniform.o: $(srcdir)/Uniform.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 595,601 ---- $(srcdir)/../../libstdc++/std/cmath.h Uniform.o: $(srcdir)/Uniform.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 625,631 **** $(srcdir)/Uniform.h Weibull.o: $(srcdir)/Weibull.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 614,620 ---- $(srcdir)/Uniform.h Weibull.o: $(srcdir)/Weibull.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 644,650 **** $(srcdir)/Weibull.h builtin.o: $(srcdir)/builtin.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 633,639 ---- $(srcdir)/Weibull.h builtin.o: $(srcdir)/builtin.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 660,666 **** $(srcdir)/../../libstdc++/std/cmath.h chr.o: $(srcdir)/chr.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 649,655 ---- $(srcdir)/../../libstdc++/std/cmath.h chr.o: $(srcdir)/chr.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 678,684 **** compare.o: $(srcdir)/compare.cc \ $(srcdir)/compare.h \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 667,673 ---- compare.o: $(srcdir)/compare.cc \ $(srcdir)/compare.h \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 694,700 **** $(srcdir)/../../libstdc++/std/cmath.h dtoa.o: $(srcdir)/dtoa.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 683,689 ---- $(srcdir)/../../libstdc++/std/cmath.h dtoa.o: $(srcdir)/dtoa.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 711,717 **** $(srcdir)/AllocRing.h error.o: $(srcdir)/error.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 700,706 ---- $(srcdir)/AllocRing.h error.o: $(srcdir)/error.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 727,733 **** $(srcdir)/../../libstdc++/std/cmath.h fmtq.o: $(srcdir)/fmtq.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 716,722 ---- $(srcdir)/../../libstdc++/std/cmath.h fmtq.o: $(srcdir)/fmtq.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 744,750 **** $(srcdir)/AllocRing.h gcd.o: $(srcdir)/gcd.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 733,739 ---- $(srcdir)/AllocRing.h gcd.o: $(srcdir)/gcd.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 760,766 **** $(srcdir)/../../libstdc++/std/cmath.h hash.o: $(srcdir)/hash.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 749,755 ---- $(srcdir)/../../libstdc++/std/cmath.h hash.o: $(srcdir)/hash.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 776,782 **** $(srcdir)/../../libstdc++/std/cmath.h ioob.o: $(srcdir)/ioob.cc \ $(srcdir)/Obstack.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 765,771 ---- $(srcdir)/../../libstdc++/std/cmath.h ioob.o: $(srcdir)/ioob.cc \ $(srcdir)/Obstack.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 790,796 **** $(srcdir)/../../libstdc++/std/cerrno.h lg.o: $(srcdir)/lg.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 779,785 ---- $(srcdir)/../../libstdc++/std/cerrno.h lg.o: $(srcdir)/lg.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 805,814 **** $(srcdir)/../../libstdc++/cmath \ $(srcdir)/../../libstdc++/std/cmath.h minmax.o: $(srcdir)/minmax.cc \ ! $(srcdir)/minmax.h $(MULTITOP)/../../libio/_G_config.h pow.o: $(srcdir)/pow.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 794,803 ---- $(srcdir)/../../libstdc++/cmath \ $(srcdir)/../../libstdc++/std/cmath.h minmax.o: $(srcdir)/minmax.cc \ ! $(srcdir)/minmax.h pow.o: $(srcdir)/pow.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 824,830 **** $(srcdir)/../../libstdc++/std/cmath.h sqrt.o: $(srcdir)/sqrt.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 813,819 ---- $(srcdir)/../../libstdc++/std/cmath.h sqrt.o: $(srcdir)/sqrt.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 840,846 **** $(srcdir)/../../libstdc++/std/cmath.h str.o: $(srcdir)/str.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h $(MULTITOP)/../../libio/_G_config.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ --- 829,835 ---- $(srcdir)/../../libstdc++/std/cmath.h str.o: $(srcdir)/str.cc \ $(srcdir)/builtin.h \ ! $(srcdir)/std.h \ $(srcdir)/../../libstdc++/stddef \ $(srcdir)/../../libstdc++/std/stddef.h \ $(srcdir)/../../libstdc++/std/cstddef.h \ *************** *** 885,889 **** $(srcdir)/bitprims.h \ $(srcdir)/bitdo2.h malloc.o: $(srcdir)/malloc.c ! timer.o: $(srcdir)/timer.c \ ! $(MULTITOP)/../../libio/_G_config.h --- 874,877 ---- $(srcdir)/bitprims.h \ $(srcdir)/bitdo2.h malloc.o: $(srcdir)/malloc.c ! timer.o: $(srcdir)/timer.c diff -c gnu/libg++/libg++/tests/Makefile.sh:1.1.1.2 gnu/libg++/libg++/tests/Makefile.sh:1.2 *** gnu/libg++/libg++/tests/Makefile.sh:1.1.1.2 Sat Nov 25 00:32:59 1995 --- gnu/libg++/libg++/tests/Makefile.sh Sat Nov 25 00:32:59 1995 *************** *** 14,20 **** cat <${package_makefile_frag} # post-target: --- 19,27 ---- MOSTLYCLEAN='*.out *.o \#* core trie-gen ffile streamfile i*.cc i*.h CXX.hack* test.bye test.bye2 test.shell $(LIBTEST) $(TOUTS)' CLEAN= ! echo TCURSES=tCurses > ${package_makefile_frag} ! ! (. ${srcdir}/../config.shared) >>${package_makefile_frag} # post-target: diff -c gnu/libg++/libiberty/Makefile.in:1.1.1.5 gnu/libg++/libiberty/Makefile.in:1.6 *** gnu/libg++/libiberty/Makefile.in:1.1.1.5 Sat Nov 25 00:33:03 1995 --- gnu/libg++/libiberty/Makefile.in Sat Nov 25 00:33:03 1995 *************** *** 160,166 **** REQUIRED_OFILES = argv.o basename.o concat.o cplus-dem.o fdmatch.o \ getopt.o getopt1.o getruntime.o hex.o \ floatformat.o obstack.o spaces.o strerror.o strsignal.o \ ! vasprintf.o xatexit.o xexit.o xmalloc.o xstrerror.o # Do we want/need any config overrides? # --- 160,166 ---- REQUIRED_OFILES = argv.o basename.o concat.o cplus-dem.o fdmatch.o \ getopt.o getopt1.o getruntime.o hex.o \ floatformat.o obstack.o spaces.o strerror.o strsignal.o \ ! xatexit.o xexit.o xmalloc.o xstrerror.o # Do we want/need any config overrides? # diff -c gnu/libg++/libiberty/functions.def:1.1.1.2 gnu/libg++/libiberty/functions.def:1.3 *** gnu/libg++/libiberty/functions.def:1.1.1.2 Sat Nov 25 00:33:03 1995 --- gnu/libg++/libiberty/functions.def Sat Nov 25 00:33:03 1995 *************** *** 62,65 **** --- 62,68 ---- DEFFUNC(strerror, char*, (), NOTHING) DEFFUNC(psignal, void, (signo, message), unsigned signo AND char *message) + DEFFUNC(basename, char *, (name), CONST char *name) + DEFFUNC(strsignal, char*, (), NOTHING) + DEFFUNC(vasprintf, int, (), NOTHING) diff -c gnu/libg++/libiberty/strsignal.c:1.1.1.2 gnu/libg++/libiberty/strsignal.c:1.3 *** gnu/libg++/libiberty/strsignal.c:1.1.1.2 Sat Nov 25 00:33:03 1995 --- gnu/libg++/libiberty/strsignal.c Sat Nov 25 00:33:03 1995 *************** *** 400,405 **** --- 400,407 ---- */ + #ifdef NEED_strsignal + const char * strsignal (signo) int signo; *************** *** 435,440 **** --- 437,444 ---- return (msg); } + + #endif /* NEED_strsignal */ /* diff -c gnu/libg++/libio/Makefile.in:1.1.1.5 gnu/libg++/libio/Makefile.in:1.8 *** gnu/libg++/libio/Makefile.in:1.1.1.5 Sat Nov 25 00:33:04 1995 --- gnu/libg++/libio/Makefile.in Sat Nov 25 00:33:04 1995 *************** *** 29,35 **** iofgetpos.o iofread.o iofscanf.o \ iofsetpos.o iogetdelim.o iogetline.o \ ioprintf.o ioseekoff.o ioseekpos.o \ ! outfloat.o strops.o iofclose.o iopopen.o ioungetc.o # These emulate stdio functionality, but with a different name (_IO_ungetc # instead of ungetc), and using _IO_FILE instead of FILE. --- 29,35 ---- iofgetpos.o iofread.o iofscanf.o \ iofsetpos.o iogetdelim.o iogetline.o \ ioprintf.o ioseekoff.o ioseekpos.o \ ! outfloat.o strops.o iofclose.o iopopen.o ioungetc.o stdfiles.o # These emulate stdio functionality, but with a different name (_IO_ungetc # instead of ungetc), and using _IO_FILE instead of FILE. *************** *** 55,61 **** OSPRIM_OBJECTS = ioprims.o iostrerror.o cleanup.o LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(OSPRIM_OBJECTS) ! LIBIO_OBJECTS = $(IO_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) stdfiles.o LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) --- 55,61 ---- OSPRIM_OBJECTS = ioprims.o iostrerror.o cleanup.o LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(OSPRIM_OBJECTS) ! LIBIO_OBJECTS = $(IO_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) *************** *** 65,74 **** #### package, host, target, and site dependent Makefile fragments come in here. ## ! libio.a: $(_G_CONFIG_H) $(LIBIO_OBJECTS) -rm -rf libio.a ! $(AR) $(AR_FLAGS) libio.a $(LIBIO_OBJECTS) $(RANLIB) libio.a libiostream.a: $(_G_CONFIG_H) $(LIBIOSTREAM_DEP) -rm -rf libiostream.a --- 65,78 ---- #### package, host, target, and site dependent Makefile fragments come in here. ## ! libio.a: $(_G_CONFIG_H) $(LIBIO_OBJECTS) dummy.o -rm -rf libio.a ! $(AR) $(AR_FLAGS) libio.a $(LIBIO_OBJECTS) \ ! `test x = x$(LIBIO_OBJECTS) && echo dummy.o` $(RANLIB) libio.a + + dummy.c: Makefile + echo '/* empty file */' > dummy.c libiostream.a: $(_G_CONFIG_H) $(LIBIOSTREAM_DEP) -rm -rf libiostream.a diff -c gnu/libg++/libio/config.shared:1.1.1.5 gnu/libg++/libio/config.shared:1.7 *** gnu/libg++/libio/config.shared:1.1.1.5 Sat Nov 25 00:33:04 1995 --- gnu/libg++/libio/config.shared Sat Nov 25 00:33:04 1995 *************** *** 370,376 **** MOSTLYCLEAN="${MOSTLYCLEAN-*.o pic stamp-picdir core} `if test -n "${TOUCH_ON_COMPILE}"; then echo stamp; else true; fi`" CLEAN="${CLEAN-${TARGETPROG} ${TARGETLIB}}" ! DISTCLEAN="${DISTCLEAN-config.status Makefile *~ Make.pack ${EXTRA_DISTCLEAN-}}" REALCLEAN="${REALCLEAN-depend *.info*}" --- 370,376 ---- MOSTLYCLEAN="${MOSTLYCLEAN-*.o pic stamp-picdir core} `if test -n "${TOUCH_ON_COMPILE}"; then echo stamp; else true; fi`" CLEAN="${CLEAN-${TARGETPROG} ${TARGETLIB}}" ! DISTCLEAN="${DISTCLEAN-config.status Makefile *~ Make.pack target-mkfrag ${EXTRA_DISTCLEAN-}}" REALCLEAN="${REALCLEAN-depend *.info*}" diff -c gnu/libg++/libio/configure.in:1.1.1.5 gnu/libg++/libio/configure.in:1.9 *** gnu/libg++/libio/configure.in:1.1.1.5 Sat Nov 25 00:33:04 1995 --- gnu/libg++/libio/configure.in Sat Nov 25 00:33:04 1995 *************** *** 19,29 **** case "${target}" in *-hpux*) frags=hpux.mt ;; ! *-linux*) ! echo "WARNING: The I/O implementation in libg++ 2.7.x is not" ! echo " compatible with Linux libc through 5.2.x." ! echo " YOU ARE ON YOUR OWN!" ! frags=linux.mt ;; *-sco3.2v4*) frags=sco4.mt ;; *-isc*) frags=isc.mt ;; *-netware*) frags=netware.mt ;; --- 19,25 ---- case "${target}" in *-hpux*) frags=hpux.mt ;; ! *-linux*) frags=linux.mt ;; *-sco3.2v4*) frags=sco4.mt ;; *-isc*) frags=isc.mt ;; *-netware*) frags=netware.mt ;; *************** *** 52,62 **** LIBDIR=yes TO_TOPDIR=../ ! ALL='$(_G_CONFIG_H) libio.a libiostream.a' XCINCLUDES='-I. -I$(srcdir)' XCXXINCLUDES='-I. -I$(srcdir)' MOSTLYCLEAN='*.o pic stamp-picdir core iostream.list' ! DISTCLEAN='config.status Makefile *~ Make.pack target-mkfrag' CLEAN='_G_config.h *.a' INFO_FILES=iostream (. ${srcdir}/config.shared) >${package_makefile_frag} --- 48,58 ---- LIBDIR=yes TO_TOPDIR=../ ! ALL='libio.a libiostream.a' XCINCLUDES='-I. -I$(srcdir)' XCXXINCLUDES='-I. -I$(srcdir)' MOSTLYCLEAN='*.o pic stamp-picdir core iostream.list' ! EXTRA_DISTCLEAN=dummy.c CLEAN='_G_config.h *.a' INFO_FILES=iostream (. ${srcdir}/config.shared) >${package_makefile_frag} diff -c gnu/libg++/libio/iostream.cc:1.1.1.5 gnu/libg++/libio/iostream.cc:1.8 *** gnu/libg++/libio/iostream.cc:1.1.1.5 Sat Nov 25 00:33:04 1995 --- gnu/libg++/libio/iostream.cc Sat Nov 25 00:33:04 1995 *************** *** 35,40 **** --- 35,46 ---- #include #include #include "floatio.h" + #ifdef __linux__ + #include + extern "C" int __printf_fp __P ((FILE *, + const struct printf_info *, + const void **const)); + #endif #define BUF (MAXEXP+MAXFRACT+1) /* + decimal point */ *************** *** 321,327 **** --- 327,337 ---- istream& istream::operator>>(long double& x) { if (ipfx0()) + #ifdef __linux__ + scan("%Lg", &x); + #else scan("%lg", &x); + #endif return *this; } *************** *** 551,556 **** --- 561,608 ---- } #endif /*__GNUC__*/ + #ifdef __linux__ + ostream& ostream::operator<<(long double n) + { + if (opfx()) { + int format_char; + if ((flags() & ios::floatfield) == ios::fixed) + format_char = 'f'; + else if ((flags() & ios::floatfield) == ios::scientific) + format_char = flags() & ios::uppercase ? 'E' : 'e'; + else + format_char = flags() & ios::uppercase ? 'G' : 'g'; + + int prec = precision(); + if (prec <= 0 && !(flags() & ios::fixed)) + prec = 6; /* default */ + + // Do actual conversion. + struct printf_info info; + + info.prec = prec; + info.width = width (0); + info.spec = format_char; + info.is_long_double = 1; + info.is_short = 0; + info.is_long = 0; + info.alt = flags() & ios::showpoint; + info.space = 0; + info.left = flags() & ios::left; + info.showsign = flags() & ios::showpos; + info.group = 0; + info.pad = fill(); + + _IO_va_list p = (_IO_va_list) &n; + + if (__printf_fp (rdbuf(), &info, &p) < 0) + set(ios::badbit|ios::failbit); // ?? + osfx(); + } + return *this; + } + #endif + ostream& ostream::operator<<(double n) { if (opfx()) { *************** *** 570,575 **** --- 622,648 ---- prec = 6; /* default */ // Do actual conversion. + #ifdef __linux__ + struct printf_info info; + + info.prec = prec; + info.width = width (0); + info.spec = format_char; + info.is_long_double = 0; + info.is_short = 0; + info.is_long = 0; + info.alt = flags() & ios::showpoint; + info.space = 0; + info.left = flags() & ios::left; + info.showsign = flags() & ios::showpos; + info.group = 0; + info.pad = fill(); + + _IO_va_list p = (_IO_va_list) &n; + + if (__printf_fp (rdbuf(), &info, &p) < 0) + set(ios::badbit|ios::failbit); // ?? + #else #ifdef _IO_USE_DTOA if (_IO_outfloat(n, rdbuf(), format_char, width(0), prec, flags(), *************** *** 625,630 **** --- 698,704 ---- if (pad_kind == (ios::fmtflags)ios::left) // Left adjustment for (i = padding; --i >= 0; ) sbuf->sputc(fill_char); + #endif #endif osfx(); } diff -c gnu/libg++/libio/iostream.h:1.1.1.4 gnu/libg++/libio/iostream.h:1.5 *** gnu/libg++/libio/iostream.h:1.1.1.4 Sat Nov 25 00:33:04 1995 --- gnu/libg++/libio/iostream.h Sat Nov 25 00:33:04 1995 *************** *** 96,102 **** --- 96,106 ---- #endif ostream& operator<<(double n); ostream& operator<<(float n) { return operator<<((double)n); } + #ifdef __linux__ + ostream& operator<<(long double n); + #else ostream& operator<<(long double n) { return operator<<((double)n); } + #endif ostream& operator<<(__omanip func) { return (*func)(*this); } ostream& operator<<(__manip func) {(*func)(*this); return *this;} ostream& operator<<(streambuf*); diff -c gnu/libg++/libio/libio.h:1.1.1.4 gnu/libg++/libio/libio.h:1.6 *** gnu/libg++/libio/libio.h:1.1.1.4 Sat Nov 25 00:33:04 1995 --- gnu/libg++/libio/libio.h Sat Nov 25 00:33:05 1995 *************** *** 70,76 **** --- 70,78 ---- #ifndef __STDC__ #define const #endif + #ifndef __linux__ #define _IO_USE_DTOA + #endif #define _IO_UNIFIED_JUMPTABLES 1 #if 0 *************** *** 141,146 **** --- 143,157 ---- #define _IO_STDIO 040000 #define _IO_DONT_CLOSE 0100000 + /* The reentrent version of the libio implementation needs a semaphore for + each _IO_FILE struture. Because we don't know how the semaphore + will be implemented we try to be very general. */ + struct _IO_lock_t { + void *ptr; + short int field1; + short int field2; + }; + /* A streammarker remembers a position in a buffer. */ struct _IO_jump_t; struct _IO_FILE; *************** *** 197,202 **** --- 208,215 ---- char _shortbuf[1]; /* char* _save_gptr; char* _save_egptr; */ + + struct _IO_lock_t _IO_lock; }; #ifndef __cplusplus diff -c gnu/libg++/libio/libioP.h:1.1.1.4 gnu/libg++/libio/libioP.h:1.5 *** gnu/libg++/libio/libioP.h:1.1.1.4 Sat Nov 25 00:33:05 1995 --- gnu/libg++/libio/libioP.h Sat Nov 25 00:33:05 1995 *************** *** 29,34 **** --- 29,44 ---- #include "iolibio.h" + #if !defined(__cplusplus) && defined(__linux__) + #include "linux.h" + #endif + + #ifdef __linux__ + + #include + + #else /* __linux__ */ + #if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(__cplusplus) /* All known AIX compilers implement these things (but don't always define __STDC__). The RISC/OS MIPS compiler defines these things *************** *** 48,53 **** --- 58,65 ---- #define DEFUN_VOID(name) name() #endif /* ANSI C. */ + #endif /* __linux__ */ + #ifdef __cplusplus extern "C" { #endif *************** *** 413,418 **** --- 425,434 ---- #define _IO_pos_0 ((_IO_fpos_t)0) #endif + extern char* _IO_gen_tempname __P ((const char * dir, const char *pfx, + int dir_search, _IO_size_t *lenptr, + _IO_FILE **streamptr)); + #ifdef __cplusplus } #endif *************** *** 469,475 **** #define MAYBE_SET_EINVAL /* nothing */ #endif ! #ifdef DEBUG #define CHECK_FILE(FILE,RET) \ if ((FILE) == NULL) { MAYBE_SET_EINVAL; return RET; } \ else { COERCE_FILE(FILE); \ --- 485,491 ---- #define MAYBE_SET_EINVAL /* nothing */ #endif ! #ifdef _IO_DEBUG #define CHECK_FILE(FILE,RET) \ if ((FILE) == NULL) { MAYBE_SET_EINVAL; return RET; } \ else { COERCE_FILE(FILE); \ diff -c /dev/null gnu/libg++/libio/linux.h:1.1 *** /dev/null Sat Nov 25 00:33:05 1995 --- gnu/libg++/libio/linux.h Sat Nov 25 00:33:05 1995 *************** *** 0 **** --- 1,32 ---- + #ifndef _CONFIG_LINUX_H + #define _CONFIG_LINUX_H + + #undef _STDIO_USES_IOSTREAM + #define _STDIO_USES_IOSTREAM 1 + + #undef _IO_HAVE_ST_BLKSIZE + #define _IO_HAVE_ST_BLKSIZE 1 + + #undef _IO_DEBUG + #define _IO_DEBUG + + #define _IO_open __open + #define _IO_close __close + #define _IO_fork __fork + #define _IO_fcntl __fcntl + #define _IO__exit _exit + #define _IO_read __read + #define _IO_write __write + #define _IO_lseek __lseek + #define _IO_getdtablesize __getdtablesize + #define _IO_pipe __pipe + #define _IO_dup2 __dup2 + #define _IO_execl execl + #define _IO_waitpid __waitpid + #define _IO_stat __stat + #define _IO_getpid __getpid + #define _IO_geteuid __geteuid + #define _IO_getegid __getegid + #define _IO_fstat __fstat + + #endif /* _CONFIG_LINUX_H */ diff -c gnu/libg++/libio/config/linux.mt:1.1.1.2 gnu/libg++/libio/config/linux.mt:1.5 *** gnu/libg++/libio/config/linux.mt:1.1.1.2 Sat Nov 25 00:33:05 1995 --- gnu/libg++/libio/config/linux.mt Sat Nov 25 00:33:05 1995 *************** *** 1,26 **** # Since the Linux C library has libio, we have to be very careful. # By default, we build libio and use it. If someone wants to not # build it, let them go to extra work. The reason is that the user # may want a newer, bug fixed libio, also on a linux 1.0.8 system # things just won't build with the bottom section uncommented. # Comment this out to avoid including the stdio functions in libiostream.a: ! LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) ! LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stdio.list ! LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) `cat stdio.list` # Comment the above and uncomment the below to use the code in the Linux libc: # We have _G_config.h in /usr/include. ! # _G_CONFIG_H= # We have those in libc.a. ! # IO_OBJECTS= ! # STDIO_WRAP_OBJECTS= ! # OSPRIM_OBJECTS= # We have the rest in /usr/include. ! # USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \ ! # indstream.h iomanip.h iostream.h istream.h ostream.h \ ! # parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \ ! # streambuf.h strfile.h strstream.h --- 1,29 ---- # Since the Linux C library has libio, we have to be very careful. + # That is where we keep the g++ header files. + gxx_includedir =$(prefix)/include/g++ + # By default, we build libio and use it. If someone wants to not # build it, let them go to extra work. The reason is that the user # may want a newer, bug fixed libio, also on a linux 1.0.8 system # things just won't build with the bottom section uncommented. # Comment this out to avoid including the stdio functions in libiostream.a: ! # LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) ! # LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stdio.list ! # LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) `cat stdio.list` # Comment the above and uncomment the below to use the code in the Linux libc: # We have _G_config.h in /usr/include. ! _G_CONFIG_H= # We have those in libc.a. ! IO_OBJECTS= ! STDIO_WRAP_OBJECTS= ! OSPRIM_OBJECTS= # We have the rest in /usr/include. ! USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \ ! indstream.h iomanip.h iostream.h istream.h ostream.h \ ! parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \ ! streambuf.h strfile.h strstream.h diff -c gnu/libg++/librx/rx.c:1.1.1.3 gnu/libg++/librx/rx.c:1.4 *** gnu/libg++/librx/rx.c:1.1.1.3 Sat Nov 25 00:33:07 1995 --- gnu/libg++/librx/rx.c Sat Nov 25 00:33:07 1995 *************** *** 5814,5819 **** --- 5814,5821 ---- case 'w': case 'W': + if (syntax & RE_NO_GNU_OPS) + goto normal_char; { rx_Bitset cs = rx_cset (&rxb->rx); struct rexp_node * n = (cs ? rx_mk_r_cset (&rxb->rx, cs) : 0); *************** *** 5837,5867 **** --- 5839,5881 ---- * chars). */ case '<': + if (syntax & RE_NO_GNU_OPS) + goto normal_char; side = (rx_side_effect)re_se_wordbeg; goto add_side_effect; break; case '>': + if (syntax & RE_NO_GNU_OPS) + goto normal_char; side = (rx_side_effect)re_se_wordend; goto add_side_effect; break; case 'b': + if (syntax & RE_NO_GNU_OPS) + goto normal_char; side = (rx_side_effect)re_se_wordbound; goto add_side_effect; break; case 'B': + if (syntax & RE_NO_GNU_OPS) + goto normal_char; side = (rx_side_effect)re_se_notwordbound; goto add_side_effect; break; case '`': + if (syntax & RE_NO_GNU_OPS) + goto normal_char; side = (rx_side_effect)re_se_begbuf; goto add_side_effect; break; case '\'': + if (syntax & RE_NO_GNU_OPS) + goto normal_char; side = (rx_side_effect)re_se_endbuf; goto add_side_effect; break; *************** *** 6407,6413 **** --- 6421,6431 ---- if (pos->pos == pos->end) return *closure->string2; else + #if 0 return pos->pos[1]; + #else + return pos->pos[offset]; /* FIXME */ + #endif } diff -c gnu/libg++/librx/rx.h:1.1.1.2 gnu/libg++/librx/rx.h:1.3 *** gnu/libg++/librx/rx.h:1.1.1.2 Sat Nov 25 00:33:07 1995 --- gnu/libg++/librx/rx.h Sat Nov 25 00:33:07 1995 *************** *** 1,5 **** ! #if !defined(RXH) || defined(RX_WANT_SE_DEFS) ! #define RXH /* Copyright (C) 1992, 1993 Free Software Foundation, Inc. --- 1,5 ---- ! #if !defined(_RX_H) || defined(RX_WANT_SE_DEFS) ! #define _RX_H /* Copyright (C) 1992, 1993 Free Software Foundation, Inc. *************** *** 24,32 **** ! #ifndef RX_WANT_SE_DEFS --- 24,37 ---- + #include + #define __need_size_t + #include ! #if RX_WANT_SE_DEFS != 1 ! __BEGIN_DECLS ! #endif #ifndef RX_WANT_SE_DEFS *************** *** 1407,1412 **** --- 1412,1421 ---- If not set, then an unmatched ) is invalid. */ #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) + /* If this bit is set, do not process the GNU regex operators. + IF not set, then the GNU regex operators are recognized. */ + #define RE_NO_GNU_OPS (RE_UNMATCHED_RIGHT_PAREN_ORD << 1) + /* This global variable defines the particular regexp syntax to use (for some interfaces). When a regexp is compiled, the syntax used is stored in the pattern buffer, so changing this does not affect *************** *** 3727,3732 **** --- 3736,3745 ---- RX_DEF_CPLX_SE(0, re_se_end_iter, = re_se_iter + 1) RX_DEF_CPLX_SE(0, re_se_tv, = re_se_end_iter + 1) + #endif + + #if RX_WANT_SE_DEFS != 1 + __END_DECLS #endif #endif diff -c gnu/libg++/libstdc++/Makefile.in:1.1.1.5 gnu/libg++/libstdc++/Makefile.in:1.10 *** gnu/libg++/libstdc++/Makefile.in:1.1.1.5 Sat Nov 25 00:33:08 1995 --- gnu/libg++/libstdc++/Makefile.in Sat Nov 25 00:33:08 1995 *************** *** 45,51 **** IO_DIR = $(MULTITOP)/../libio$(MULTISUBDIR) LIBIBERTY_DIR = $(MULTITOP)/../libiberty$(MULTISUBDIR) ! LIBIBERTY_OBJS = `cat $(LIBIBERTY_DIR)/needed-list` strerror.o tooldir = $(exec_prefix)/$(target) INSTALLDIR = $(libdir)$(MULTISUBDIR) --- 45,51 ---- IO_DIR = $(MULTITOP)/../libio$(MULTISUBDIR) LIBIBERTY_DIR = $(MULTITOP)/../libiberty$(MULTISUBDIR) ! LIBIBERTY_OBJS = `cat $(LIBIBERTY_DIR)/needed-list` `test -f $(LIBIBERTY_DIR)/strerror.o && echo strerror.o` tooldir = $(exec_prefix)/$(target) INSTALLDIR = $(libdir)$(MULTISUBDIR) *************** *** 90,96 **** $(RANLIB) $(ARLIB) $(SHLIB): piclist ! $(CXX) $(SHFLAGS) -shared -o $(SHLIB) `cat piclist` $(SHDEPS) $(SHARLIB): $(SHLIB) -rm -f t$(SHARLIB) --- 90,96 ---- $(RANLIB) $(ARLIB) $(SHLIB): piclist ! $(CC) $(SHFLAGS) -shared -o $(SHLIB) `cat piclist` $(SHDEPS) $(SHARLIB): $(SHLIB) -rm -f t$(SHARLIB) diff -c gnu/libg++/libstdc++/configure.in:1.1.1.5 gnu/libg++/libstdc++/configure.in:1.8 *** gnu/libg++/libstdc++/configure.in:1.1.1.5 Sat Nov 25 00:33:08 1995 --- gnu/libg++/libstdc++/configure.in Sat Nov 25 00:33:08 1995 *************** *** 37,42 **** --- 37,46 ---- esac fi + case "${target}" in + *-*-linux*) frags="${frags} linux.mt" ;; + esac + for frag in ${frags}; do frag=${srcdir}/config/$frag if [ -f ${frag} ]; then *************** *** 55,61 **** XCXXINCLUDES="-I${srcdir} -I"'$(MULTITOP)/'"${TO_TOPDIR}libio -I${srcdir}/${TO_TOPDIR}libio" MOSTLYCLEAN='*.o pic stamp-picdir core so_locations $(MOSTLYCLEAN_JUNK)' CLEAN='$(CLEAN_JUNK)' - DISTCLEAN='config.status Makefile target-mkfrag' (. ${srcdir}/${TO_TOPDIR}libio/config.shared) >${package_makefile_frag} --- 59,64 ---- diff -c /dev/null gnu/libg++/libstdc++/config/linux.mt:1.1 *** /dev/null Sat Nov 25 00:33:08 1995 --- gnu/libg++/libstdc++/config/linux.mt Sat Nov 25 00:33:09 1995 *************** *** 0 **** --- 1,2 ---- + # That is where we keep the g++ header files. + gxx_includedir =$(prefix)/include/g++ diff -c gnu/libg++/libstdc++/stl/configure.in:1.1.1.3 gnu/libg++/libstdc++/stl/configure.in:1.2 *** gnu/libg++/libstdc++/stl/configure.in:1.1.1.3 Sat Nov 25 00:33:09 1995 --- gnu/libg++/libstdc++/stl/configure.in Sat Nov 25 00:33:09 1995 *************** *** 17,22 **** --- 17,23 ---- TO_TOPDIR=../../ ALL='stl.list' XCXXINCLUDES="-I${srcdir} -I${srcdir}/.. -I"'$(MULTITOP)/'"${TO_TOPDIR}libio -I${srcdir}/${TO_TOPDIR}libio" + EXTRA_DISTCLEAN=stl.list (. ${srcdir}/${TO_TOPDIR}libio/config.shared) >${package_makefile_frag} # post-target: