Module Name: src
Committed By: christos
Date: Thu Mar 15 00:16:07 UTC 2012
Modified Files:
src/libexec/ld.elf_so: Makefile
Added Files:
src/libexec/ld.elf_so: diagassert.c
Log Message:
Add __diagassert13() so that if libc is compiled with _DIAGNOSTIC, it does
not end up bringing in all of stdio.
XXX: This is temporary.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r0 -r1.1 src/libexec/ld.elf_so/diagassert.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.110 src/libexec/ld.elf_so/Makefile:1.111
--- src/libexec/ld.elf_so/Makefile:1.110 Fri Oct 7 05:15:21 2011
+++ src/libexec/ld.elf_so/Makefile Wed Mar 14 20:16:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2011/10/07 09:15:21 mrg Exp $
+# $NetBSD: Makefile,v 1.111 2012/03/15 00:16:07 christos Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -63,7 +63,7 @@ CLIBOBJ!= cd ${NETBSDSRCDIR}/lib/libc &&
SRCS+= rtld.c reloc.c symbol.c xmalloc.c xprintf.c debug.c \
map_object.c load.c search.c headers.c paths.c expand.c \
- tls.c symver.c
+ tls.c symver.c diagassert.c
.if ${USE_FORT} == "yes"
.PATH.c: ${NETBSDSRCDIR}/lib/libc/misc
Added files:
Index: src/libexec/ld.elf_so/diagassert.c
diff -u /dev/null src/libexec/ld.elf_so/diagassert.c:1.1
--- /dev/null Wed Mar 14 20:16:07 2012
+++ src/libexec/ld.elf_so/diagassert.c Wed Mar 14 20:16:07 2012
@@ -0,0 +1,9 @@
+#include <assert.h>
+#include <stdlib.h>
+
+void
+/*ARGSUSED*/
+__diagassert13(const char *fn, int fl, const char *fu, const char *m)
+{
+ abort();
+}
