diff options
| author | Thomas Bushnell, BSG <thomas@gnu.org> | 1996-09-21 20:05:50 +0000 |
|---|---|---|
| committer | Thomas Bushnell, BSG <thomas@gnu.org> | 1996-09-21 20:05:50 +0000 |
| commit | 8a080f40d83e12be3af8a5cbfb1f6a2f65bc9981 (patch) | |
| tree | 3c206c61897359b4ce667a1f8ea4c8e2c1f73ce1 /sysdeps/mach | |
| parent | 8de8ca1b9429b95aab124e2351d0c45fcf2a369e (diff) | |
| download | glibc-8a080f40d83e12be3af8a5cbfb1f6a2f65bc9981.tar.gz glibc-8a080f40d83e12be3af8a5cbfb1f6a2f65bc9981.tar.xz glibc-8a080f40d83e12be3af8a5cbfb1f6a2f65bc9981.zip | |
*** empty log message ***
Sat Sep 21 14:59:22 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * shlib-versions (*-*-gnu*): Increment libc to 0.2 for upcoming binary distribution. * sysdeps/mach/hurd/Makefile (rtld-installed-name): Provide definition to override dangerous one in Makeconfig. * hurd/Makefile (install-headers-nosubdir): Install <rpc/netdb.h>. ($(includedir)/rpc/netdb.h): New rule. [ This is XXX until sunrpc can be built; <rpc/netdb.h> is essential. ] Fri Sep 20 16:06:06 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/i386/init-first.c (_dl_start): Add definition, to guarantee link errors if this is included in ld.so.
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index c33cb7d5fe..fa2f66ac5f 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -18,7 +18,12 @@ ifdef in-Makerules +# This should be in a more global place, because the problem it solves +# is universal, but this is good enough for here. +rtld-installed-name := ld.so$(libc.so-version) + subdirs := $(filter-out sunrpc,$(subdirs)) # XXX skip broken dirs +# See hurd/Makefile for commands that install some crucial sunrpc headers. # Look for header files in hurd/ under the top-level library source directory. # Look for generated header files where they get created. diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index 5203b4c146..331362370b 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For i386/Hurd. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -248,3 +248,15 @@ __libc_init_first (int argc __attribute__ ((unused)), ...) _hurd_startup ((void **) &argc, &doinit); #endif } + + +/* This function is defined here so that if this file ever gets into + ld.so we will get a link error. Having this file silently included + in ld.so causes disaster, because the _init definition above will + cause ld.so to gain an init function, which is not a cool thing. */ + +void +_dl_start () +{ + abort (); +} |