diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makerules | 18 | ||||
| -rw-r--r-- | sysdeps/mach/configure | 17 | ||||
| -rw-r--r-- | sysdeps/mach/configure.in | 15 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/configure.in | 13 |
5 files changed, 14 insertions, 56 deletions
diff --git a/ChangeLog b/ChangeLog index 8a9c09d2bf..cd4eb5df7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ Sun May 12 11:16:58 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> + * Makerules ($(libdir)/libc.so): Make the file an ld script. + + * sysdeps/mach/hurd/configure.in: Don't grok --with-hurd option. + + * sysdeps/mach/configure.in: File removed. + * sysdeps/mach/configure: File removed. + * mach/Machrules (%.udeps rule): Write deps for %_server.[ch] too. (%_server.[ch] rule): Don't depend on %.defs; use #include to get installed .defs file. diff --git a/Makerules b/Makerules index 66a5f28281..07e4da5e2e 100644 --- a/Makerules +++ b/Makerules @@ -577,17 +577,13 @@ ifndef subdir # 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 +$(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \ + $(common-objpfx)libc.a + (echo '/* Use the shared library, but some functions are only in';\ + echo ' the static library, so try that secondarily. */';\ + echo 'GROUP ( $(^F) )') > $@.new + mv -f $@.new $@ + endif else diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure deleted file mode 100644 index dafdac5abb..0000000000 --- a/sysdeps/mach/configure +++ /dev/null @@ -1,17 +0,0 @@ - -# If configure is passed `--with-mach=DIR', set `mach-srcdir' to DIR in -# config.make. - -ac_help="$ac_help - --with-mach=DIRECTORY find Mach kernel source code in DIRECTORY [../mach]" -# Check whether --with-mach or --without-mach was given. -if test "${with_mach+set}" = set; then - withval="$with_mach" - case z"$with_mach" in -z | zno | zyes) ;; # Not specified, or specified with no value. -z*) config_vars="$config_vars -mach-srcdir = $with_mach" ;; -esac - -fi - diff --git a/sysdeps/mach/configure.in b/sysdeps/mach/configure.in deleted file mode 100644 index 2628886f1f..0000000000 --- a/sysdeps/mach/configure.in +++ /dev/null @@ -1,15 +0,0 @@ -sinclude(./aclocal.m4)dnl Autoconf lossage. -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - -# If configure is passed `--with-mach=DIR', set `mach-srcdir' to DIR in -# config.make. - -AC_ARG_WITH(mach, dnl -[ --with-mach=DIRECTORY find Mach kernel source code in DIRECTORY [../mach]], - [dnl -case z"$with_mach" in -z | zno | zyes) ;; # Not specified, or specified with no value. -z*) config_vars="$config_vars -mach-srcdir = $with_mach" ;; -esac -]) diff --git a/sysdeps/mach/hurd/configure.in b/sysdeps/mach/hurd/configure.in index 39e1002d6e..d9ebba5f4b 100644 --- a/sysdeps/mach/hurd/configure.in +++ b/sysdeps/mach/hurd/configure.in @@ -1,19 +1,6 @@ sinclude(./aclocal.m4)dnl Autoconf lossage. GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. -# If configure is passed `--with-hurd=DIR', set `hurd-srcdir' to DIR in -# config.make. - -AC_ARG_WITH(hurd, dnl -[ --with-hurd=DIRECTORY find Hurd source code in DIRECTORY [../hurd]], - [dnl -case z"$with_hurd" in -z | zno | zyes) ;; # Not specified, or specified with no value. -z*) config_vars="$config_vars -hurd-srcdir = $with_hurd" ;; -esac -]) - # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes |