From 7c713e287e50dc338779ed1a6c6ac701720a3a41 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 9 May 1996 00:37:21 +0000 Subject: Wed May 8 20:04:29 1996 Roland McGrath * Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir). [! libc.so-version]: Clear static-only-routines. ($(common-objpfx)sor-$(subdir)): New target. [static-only-routines]: New static pattern rule for these .so's. * Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed. [libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so): New targets replace it. (install) [libc.so-version]: Depend on $(libdir)/libc.so instead of $(slibdir)/libc.so. * io/Makefile (static-only-routines): New variable. * configure.in: Check for tools objdump and objcopy, and for awk. * config.make.in (OBJDUMP, OBJCOPY, AWK): New variables. Thu May 9 01:24:00 1996 Ulrich Drepper * locale/programs/config.h: Remove definition of wint_t. * locale/programs/ld-collate.c: Include instead of . * manual/time.texi: Add some more description for %U and %W format of strftime. Describe new format %V of strftime. * resolv/gethnamaddr.c: Prevent warning by preventing variable definition. * stdio-common/_itoa.c: Ditto. Tue May 7 23:43:07 1996 Ulrich Drepper * libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c, libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c, libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c, libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c, libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c, libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c, libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c, libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c, stdio-common/vfscanf.c: Prepare for reentrent libio. * libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c, libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c, libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files. Used in reentrent libio. * misc/getusershell.c: Prevent warnings. --- Makerules | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index d206a6edca..6305ad753b 100644 --- a/Makerules +++ b/Makerules @@ -550,7 +550,6 @@ install-lib := $(filter-out %.so %_pic.a,$(install-lib)) ifeq (yes,$(build-shared)) install-lib-nosubdir: $(install-lib.so:%=$(libdir)/%) -install: $(slibdir)/libc.so # Find which .so's have versions. versioned := $(foreach so,$(install-lib.so),\ @@ -567,12 +566,29 @@ ifdef libc.so-version # libc.so -> libc.so.N (e.g. libc.so.6) # libc.so.6 -> libc-VERSION.so (e.g. libc-1.10.so) -$(slibdir)/libc.so: $(slibdir)/libc.so$(libc.so-version) - $(make-link) $(slibdir)/libc.so$(libc.so-version): $(slibdir)/libc-$(version).so $(make-link) $(slibdir)/libc-$(version).so: $(common-objpfx)libc.so; $(do-install-program) + +# What we install as libc.so for programs to link against is in fact an +# archive. It contains the various $(static-only-routines) objects, and +# the special object libc-syms.so that contains just the dynamic symbol +# table of the shared libc object. +install: $(libdir)/libc.so +$(libdir)/libc.so: $(common-objpfx)libc-syms.so subdir_install + $(AR) crvs $@ $< `cat $(addprefix $(common-objpfx)sor-,$(subdirs))` + +# Extract from the shared object file just the dynamic symbol table +# needed to link against the shared library. +$(common-objpfx)libc-syms.so: $(common-objpfx)libc.so + AWK='$(AWK)' OBJCOPY='$(OBJCOPY)' OBJDUMP='$(OBJDUMP)' \ + ./extract-dynsym $< $@ +ifndef subdir +generated += libc-syms.so +endif + else +install: $(slibdir)/libc.so $(slibdir)/libc.so: $(common-objpfx)libc.so; $(do-install-program) endif -- cgit v1.2.3