Module Name:    src
Committed By:   snj
Date:           Sun Sep 12 04:52:45 UTC 2010

Modified Files:
        src/lib/libc/stdlib [netbsd-5]: exit.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1451):
        lib/libc/stdlib/exit.c: revision 1.13
Only do the __libc_init hack in libc, i.e. remove it from ld.elf_so.
This fixes hppa ld.elf_so by reducing the number of PLABELs required to
the number before the hack was applied.


To generate a diff of this commit:
cvs rdiff -u -r1.11.12.1 -r1.11.12.2 src/lib/libc/stdlib/exit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/stdlib/exit.c
diff -u src/lib/libc/stdlib/exit.c:1.11.12.1 src/lib/libc/stdlib/exit.c:1.11.12.2
--- src/lib/libc/stdlib/exit.c:1.11.12.1	Fri Jul 16 18:34:08 2010
+++ src/lib/libc/stdlib/exit.c	Sun Sep 12 04:52:45 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: exit.c,v 1.11.12.1 2010/07/16 18:34:08 riz Exp $	*/
+/*	$NetBSD: exit.c,v 1.11.12.2 2010/09/12 04:52:45 snj Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)exit.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: exit.c,v 1.11.12.1 2010/07/16 18:34:08 riz Exp $");
+__RCSID("$NetBSD: exit.c,v 1.11.12.2 2010/09/12 04:52:45 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -45,10 +45,12 @@
 #include "atexit.h"
 #endif
 
+#ifdef _LIBC
 extern void __libc_init(void);
 #ifndef __lint
 static void (*force_ref)(void) __used = __libc_init;
 #endif
+#endif
 
 void (*__cleanup) __P((void));
 

Reply via email to