From 4788ab4637d4385a7faaf4a1a819f8191bd84127 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 21 Mar 1995 04:19:38 +0000 Subject: * Makerules (lib): Depend on lib-noranlib. (lib-noranlib): Depend on $(install-lib) in objdir. (common-mostlyclean): Remove $(install-lib) and stub-$(subdir) from objdir. Don't remove TAGS; it comes in the distribution. * malloc/malloc.c (morecore): Save errno around call to _realloc_internal. Don't account for the additional new blocks of the info table itself when choosing the new table size for the first crack; if it succeeds, the new blocks will have been found in existing free space already described by the existing info table. Changes from Germano Caronni : Changes from Germano Caronni : --- ChangeLog | 14 ++++++++++++++ Makerules | 8 ++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77df609dfd..7efbe7b581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ Mon Mar 20 03:19:23 1995 Roland McGrath + * Makerules (lib): Depend on lib-noranlib. + (lib-noranlib): Depend on $(install-lib) in objdir. + (common-mostlyclean): Remove $(install-lib) and stub-$(subdir) + from objdir. Don't remove TAGS; it comes in the distribution. + + * malloc/malloc.c (morecore): Save errno around call to + _realloc_internal. Don't account for the additional new blocks of + the info table itself when choosing the new table size for the + first crack; if it succeeds, the new blocks will have been found + in existing free space already described by the existing info + table. + * stdio/vfscanf.c (%n): Use READ_IN - 1, so as not to count the read-ahead character. @@ -204,6 +216,7 @@ Sun Mar 12 18:21:10 1995 Roland McGrath * malloc/malloc.c (_malloc_internal): Renamed from malloc; don't use __malloc_hook. (malloc): New function; call __malloc_hook ?: _malloc_internal. + Changes from Germano Caronni : (initialize): Set up _heaplimit to cover the _heapinfo table. (morecore_recursing): New static variable. (morecore): If that is set, return null immediately. @@ -417,6 +430,7 @@ Mon Feb 27 07:00:57 1995 Roland McGrath Sun Feb 26 15:51:00 1995 Roland McGrath + Changes from Germano Caronni : * malloc/malloc.c (morecore): Account in NEWSIZE for the malloc_info structures for each new block. diff --git a/Makerules b/Makerules index d8d571d993..6eb317e662 100644 --- a/Makerules +++ b/Makerules @@ -331,7 +331,7 @@ ARFLAGS := r$(verbose) # This makes all the object files in the parent library archive. .PHONY: lib libobjs lib-noranlib -lib: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) +lib: lib-noranlib $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) # Pattern rule for libraries: depend on the __.SYMDEF member updated by ranlib. lib%.a: lib%.a(__.SYMDEF) ; @@ -347,7 +347,7 @@ endif libobjs: $(foreach o,$(object-suffixes),\ $(common-objpfx)$(patsubst %,$(libtype$o),c)(\ $(notdir $(objects:.o=$o)))) -lib-noranlib: libobjs +lib-noranlib: libobjs $(addprefix $(objpfx),$(install-lib)) ifdef objects @@ -561,8 +561,8 @@ common-mostlyclean: -rm -f $(addprefix $(objpfx),$(tests) $(others) \ $(addsuffix .o,$(tests) $(others)) \ $(addsuffix .out,$(tests))) - -rm -f $(addprefix $(objpfx),$(extra-objs)) - -rm -f core TAGS + -rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib)) + -rm -f core $(objpfx)stub-$(subdir) $(rmobjs) define rmobjs $(foreach o,$(object-suffixes), -- cgit 1.4.1