Libraries updates and cleanup
* Updating common/lib * Updating lib/csu * Updating lib/libc * Updating libexec/ld.elf_so * Corrected test on __minix in featuretest to actually follow the meaning of the comment. * Cleaned up _REENTRANT-related defintions. * Disabled -D_REENTRANT for libfetch * Removing some unneeded __NBSD_LIBC defines and tests Change-Id: Ic1394baef74d11b9f86b312f5ff4bbc3cbf72ce2
This commit is contained in:
@@ -1,9 +1,6 @@
|
||||
# Makefile for libsys
|
||||
.include <bsd.own.mk>
|
||||
|
||||
# LSC For now
|
||||
NOGCCERROR:= yes
|
||||
|
||||
LIB= sys
|
||||
|
||||
SRCS= \
|
||||
@@ -151,7 +148,6 @@ CPPFLAGS+= -DUSE_SYSDEBUG
|
||||
.endif
|
||||
|
||||
CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR}
|
||||
CPPFLAGS.vprintf.c+= -D__NBSD_LIBC
|
||||
|
||||
.if (${CC} == "gcc") || (${CC} == "clang")
|
||||
LDADD+= -lminc
|
||||
|
||||
@@ -41,10 +41,8 @@ void panic(const char *fmt, ...)
|
||||
/* Try exit */
|
||||
_exit(1);
|
||||
|
||||
#ifndef __NBSD_LIBC
|
||||
/* Try to signal ourself */
|
||||
abort();
|
||||
#endif
|
||||
|
||||
/* If exiting nicely through PM fails for some reason, try to
|
||||
* commit suicide. E.g., message to PM might fail due to deadlock.
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
/*===========================================================================*
|
||||
* tickdelay *
|
||||
*===========================================================================*/
|
||||
int tickdelay(ticks)
|
||||
long ticks; /* number of ticks to wait */
|
||||
int tickdelay(clock_t ticks)
|
||||
{
|
||||
/* This function uses the synchronous alarm to delay for a while. This works
|
||||
* even if a previous synchronous alarm was scheduled, because the remaining
|
||||
|
||||
@@ -8,15 +8,9 @@
|
||||
/* vprintf() uses kputc() to print characters. */
|
||||
void kputc(int c);
|
||||
|
||||
#ifdef __NBSD_LIBC
|
||||
#define count_kputc(c) do { charcount++; putf((c), farg); } while(0)
|
||||
|
||||
int __fvprintf(void (*putf)(int, void *), const char *fmt, va_list argp, void *farg)
|
||||
#else /* !NBSD_LIBC */
|
||||
#define count_kputc(c) do { charcount++; kputc(c); } while(0)
|
||||
|
||||
int vprintf(const char *fmt, va_list argp)
|
||||
#endif /* NBSD_LIBC */
|
||||
{
|
||||
int c, charcount = 0;
|
||||
enum { LEFT, RIGHT } adjust;
|
||||
@@ -186,15 +180,11 @@ int vprintf(const char *fmt, va_list argp)
|
||||
}
|
||||
|
||||
/* Mark the end with a null (should be something else, like -1). */
|
||||
#ifdef __NBDS_LIBC
|
||||
putf(0, farg);
|
||||
#else
|
||||
kputc(0);
|
||||
#endif
|
||||
|
||||
return charcount;
|
||||
}
|
||||
|
||||
#ifdef __NBSD_LIBC
|
||||
#include <sys/cdefs.h>
|
||||
#include <assert.h>
|
||||
#include <unistd.h>
|
||||
@@ -230,7 +220,6 @@ int _vfprintf(FILE *fp, const char *fmt, va_list argp)
|
||||
{
|
||||
return __fvprintf(__xfputc, fmt, argp, fp);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* $PchId: kprintf.c,v 1.5 1996/04/11 06:59:05 philip Exp $
|
||||
|
||||
Reference in New Issue
Block a user