From 05f732b361988d0df967c78f151ae43d4c208be0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 8 Nov 1998 10:40:28 +0000 Subject: Update. 1998-11-05 1998 H.J. Lu * libio/iofgets.c (_IO_fgets): Don't report error if something was read in and errno is set to EAGAIN. * libio/iofgets_u.c (fgets_unlocked): Likewise. 1998-11-05 Philip Blundell * sysdeps/unix/sysv/linux/net/if_packet.h: Don't include kernel header; it defines too much. Provide a local definition of struct sockaddr_pkt and a comment advising against its use. 1998-11-06 1998 Andreas Schwab * extra-lib.mk: Avoid empty include list. 1998-11-04 Andreas Schwab * extra-lib.mk: Add support for $(lib)-shared-only-routines. * elf/Makefile (libdl-routines): Add dlopenold only if doing versioning. (libdl-shared-only-routines): New variable. 1998-11-06 Paul Eggert Don't invoke localtime_r or gmtime_r unless it's the GNU C library's localtime_r and gmtime_r; there are too many buggy implementations of localtime_r and gmtime_r out there, and it's not worth keeping track of all the different bugs. * time/mktime.c (__EXTENSIONS__): Remove. (): No need to include. * time/strftime.c: Likewise. * time/mktime.c (_POSIX_THREAD_SAFE_FUNCTIONS, HAVE_LOCALTIME_R): Remove. (my_mktime_localtime_r): Renamed from localtime_r; all uses changed. Base it on localtime unless _LIBC. * time/strftime.c (my_strftime_gmtime_r): Renamed from gmtime_r; all uses changed. (my_strftime_localtime_r): Renamed from localtime_r; all uses changed. Base them on localtime/gmtime if not _LIBC. 1998-11-07 Ulrich Drepper * sysdeps/generic/isastream.c: Always return 0 unless it is an invalid file descriptor. This makes this function actually usable. Proposed by Mark Kettenis . --- extra-lib.mk | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'extra-lib.mk') diff --git a/extra-lib.mk b/extra-lib.mk index 87d4fa3863..e33f958ad7 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -19,8 +19,13 @@ extra-objs := $(extra-objs) # Add each flavor of library to the lists of things to build and install. install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o))) -extra-objs += $(foreach o,$(object-suffixes-$(lib)),\ - $(patsubst %,%$o,$($(lib)-routines))) +extra-objs += $(foreach o,$(object-suffixes-$(lib):.os=),\ + $(patsubst %,%$o,$(filter-out \ + $($(lib)-shared-only-routines),\ + $($(lib)-routines)))) +ifneq (,$(filter .os,$(object-suffixes-$(lib)))) +extra-objs += $($(lib)-routines:=.os) +endif alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\ $(objpfx)$(patsubst %,$(libtype$o),\ $(lib:lib%=%))) @@ -42,12 +47,23 @@ endif # Use o-iterator.mk to generate a rule for each flavor of library. +ifneq (,$(filter-out .os,$(object-suffices-$(lib)))) define o-iterator-doit $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ - $($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib) + $(patsubst %,$(objpfx)%$o,\ + $(filter-out $($(lib)-shared-only-routines),\ + $($(lib)-routines))); \ + $$(build-extra-lib) endef -object-suffixes-left = $(object-suffixes-$(lib)) -include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib))) +object-suffixes-left = $(object-suffixes-$(lib):.os=) +include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib):.os=)) +endif + +ifneq (,$(filter .os,$(object-suffixes-$(lib)))) +$(objpfx)$(patsubst %,$(libtype.os),$(lib:lib%=%)): \ + $($(lib)-routines:%=$(objpfx)%.os) + $(build-extra-lib) +endif ifeq ($(versioning),yes) # Add the version script to the dependencies of the shared library. -- cgit 1.4.1