about summary refs log tree commit diff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-09-23 00:24:55 +0000
committerUlrich Drepper <drepper@redhat.com>1996-09-23 00:24:55 +0000
commite320cbc913f2d70b3f68ba1005c02fb76adc4245 (patch)
tree322d23fcdd451a7aaad7bea9973401c19470784a /sysdeps/unix/sysv
parent7816fbdf7aec9e431535b2a23483ea746476443f (diff)
downloadglibc-e320cbc913f2d70b3f68ba1005c02fb76adc4245.tar.gz
glibc-e320cbc913f2d70b3f68ba1005c02fb76adc4245.tar.xz
glibc-e320cbc913f2d70b3f68ba1005c02fb76adc4245.zip
update from main archive 960922 cvs/libc-960923
Sun Sep 22 15:18:41 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/init-first.c: Define dummy function
 	`_dl_start' so that linking fails if this file should ever be used
 	in ld.so.

	* catgets/gencat.c (main): Change --version message according to
 	RMS' last standard revision.
	* db/makedb.c: Likewise.
	* locale/programs/locale.c: Likewise.
	* locale/programs/localedef.c: Likewise.

	(__get_nproc_conf): New function.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/init-first.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c
index 9f0a3c0f51..75ada19610 100644
--- a/sysdeps/unix/sysv/linux/init-first.c
+++ b/sysdeps/unix/sysv/linux/init-first.c
@@ -87,3 +87,15 @@ __libc_init_first (void)
 SYSDEP_CALL_INIT(__libc_init_first, init);
 
 #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 ();
+}