Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so Add __diagassert13() so that if libc is co...



details:   https://anonhg.NetBSD.org/src/rev/a638b4518e8c
branches:  trunk
changeset: 778059:a638b4518e8c
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Mar 15 00:16:07 2012 +0000

description:
Add __diagassert13() so that if libc is compiled with _DIAGNOSTIC, it does
not end up bringing in all of stdio.
XXX: This is temporary.

diffstat:

 libexec/ld.elf_so/Makefile     |  4 ++--
 libexec/ld.elf_so/diagassert.c |  9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 155d067b6b53 -r a638b4518e8c libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Thu Mar 15 00:09:08 2012 +0000
+++ b/libexec/ld.elf_so/Makefile        Thu Mar 15 00:16:07 2012 +0000
@@ -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 @@
 
 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
diff -r 155d067b6b53 -r a638b4518e8c libexec/ld.elf_so/diagassert.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/libexec/ld.elf_so/diagassert.c    Thu Mar 15 00:16:07 2012 +0000
@@ -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();
+}



Home | Main Index | Thread Index | Old Index