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:
2012-11-15 12:06:41 +01:00
parent f6aac1c3b5
commit f14fb60209
1285 changed files with 44244 additions and 14308 deletions

View File

@@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.17 2009/10/21 01:07:45 snj Exp $ */
/* $NetBSD: extern.h,v 1.21 2012/10/11 17:09:56 christos Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -24,12 +24,18 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __minix
#include <sys/types.h>
#endif
#include <stdarg.h>
#include <ucontext.h>
__BEGIN_DECLS
extern char *__minbrk;
int __getcwd(char *, size_t);
int __getlogin(char *, size_t);
int __setlogin(const char *);
void _resumecontext(void);
void _resumecontext(void) __dead;
const char *__strerror(int , char *, size_t);
const char *__strsignal(int , char *, size_t);
char *__dtoa(double, int, int, int *, int *, char **);
@@ -46,23 +52,26 @@ char *__hldtoa(long double, const char *, int, int *, int *, char **);
char *__ldtoa(long double *, int, int, int *, int *, char **);
#endif
#ifndef __LIBC12_SOURCE__
struct syslog_data;
void syslog_ss(int, struct syslog_data *, const char *, ...)
__attribute__((__format__(__printf__,3,4)));
void vsyslog_ss(int, struct syslog_data *, const char *, _BSD_VA_LIST_);
void vsyslog_ss(int, struct syslog_data *, const char *, _BSD_VA_LIST_)
__attribute__((__format__(__printf__,3,0)));
__RENAME(__syslog_ss60) __printflike(3, 4);
void vsyslog_ss(int, struct syslog_data *, const char *, va_list)
__RENAME(__vsyslog_ss60) __printflike(3, 0);
void syslogp_ss(int, struct syslog_data *, const char *, const char *,
const char *, ...) __attribute__((__format__(__printf__,5,0)));
const char *, ...) __RENAME(__syslogp_ss60) __printflike(5, 0);
void vsyslogp_ss(int, struct syslog_data *, const char *, const char *,
const char *, _BSD_VA_LIST_) __attribute__((__format__(__printf__,5,0)));
const char *, va_list) __RENAME(__vsyslogp_ss60) __printflike(5, 0);
#endif
int snprintf_ss(char * __restrict, size_t, const char * __restrict, ...)
__attribute__((__format__(__printf__, 3, 4)));
__printflike(3, 4);
int vsnprintf_ss(char * __restrict, size_t, const char * __restrict,
_BSD_VA_LIST_) __attribute__((__format__(__printf__, 3, 0)));
va_list) __printflike(3, 0);
void _malloc_prefork(void);
void _malloc_postfork(void);
int _sys_setcontext(const ucontext_t *);
__END_DECLS

View File

@@ -1,4 +1,4 @@
/* $NetBSD: namespace.h,v 1.146 2010/12/16 18:38:06 christos Exp $ */
/* $NetBSD: namespace.h,v 1.156 2012/08/20 21:38:10 dsl Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@
#define catopen _catopen
#define daylight _daylight
#define difftime _difftime
#define devname_r _devname_r
#define err _err
#define errx _errx
#ifdef _REENTRANT
@@ -156,6 +157,10 @@
#define alarm _alarm
#define alphasort _alphasort
#define arc4random _arc4random
#define arc4random_addrandom _arc4random_addrandom
#define arc4random_buf _arc4random_buf
#define arc4random_stir _arc4random_stir
#define arc4random_uniform _arc4random_uniform
#define asctime_r _asctime_r
#define asprintf _asprintf
#define atoll _atoll
@@ -267,9 +272,11 @@
#define fnmatch _fnmatch
#define fparseln _fparseln
#define fpgetmask _fpgetmask
#define fpgetprec _fpgetprec
#define fpgetround _fpgetround
#define fpgetsticky _fpgetsticky
#define fpsetmask _fpsetmask
#define fpsetprec _fpsetprec
#define fpsetround _fpsetround
#define fpsetsticky _fpsetsticky
#define freenetconfigent _freenetconfigent
@@ -326,6 +333,8 @@
#define getopt_long _getopt_long
#define getpagesize _getpagesize
#define getpass _getpass
#define getpassfd _getpassfd
#define getpass_r _getpass_r
#define getprogname _getprogname
#define getprotobyname _getprotobyname
#define getprotobyname_r _getprotobyname_r
@@ -439,6 +448,7 @@
#define lockf _lockf
#define lrand48 _lrand48
#define lseek _lseek
#define membar_producer _membar_producer
#define mergesort _mergesort
#define mi_vector_hash _mi_vector_hash
#define mkstemp _mkstemp
@@ -453,6 +463,7 @@
#define mq_timedreceive _mq_timedreceive
#define mq_timedsend _mq_timedsend
#define mrand48 _mrand48
#define murmurhash2 _murmurhash2
#define nc_perror _nc_perror
#define nc_sperror _nc_sperror
#define nanosleep _nanosleep
@@ -598,11 +609,8 @@
#define strsignal _strsignal
#define strsuftoll _strsuftoll
#define strsuftollx _strsuftollx
#define strsvis _strsvis
#define strsvisx _strsvisx
#define strtok_r _strtok_r
#define strunvis _strunvis
#define strvis _strvis
#define strnunvisx _strnunvisx
#define strvisx _strvisx
#define svc_auth_reg _svc_auth_reg
#define svc_create _svc_create
@@ -635,7 +643,6 @@
#define svcudp_bufcreate _svcudp_bufcreate
#define svcudp_create _svcudp_create
#define svcudp_enablecache _svcudp_enablecache
#define svis _svis
#define sysarch _sys_sysarch
#define sysctl _sysctl
#define sysctlbyname _sysctlbyname
@@ -674,7 +681,6 @@
#define ualarm _ualarm
#define uname _uname
#define unsetenv _unsetenv
#define unvis _unvis
#define user_from_uid _user_from_uid
#define usleep _usleep
#define utime _utime
@@ -682,7 +688,6 @@
#define uuid_is_nil _uuid_is_nil
#define valloc _valloc
#define vdprintf _vdprintf
#define vis _vis
#define vdprintf _vdprintf
#ifndef vsnprintf
#define vsnprintf _vsnprintf
@@ -758,6 +763,7 @@
#define xdr_rpcbs _xdr_rpcbs
#define xdr_rpcbs _xdr_rpcbs
#define xdr_short _xdr_short
#define xdr_sizeof _xdr_sizeof
#define xdr_string _xdr_string
#define xdr_u_char _xdr_u_char
#define xdr_u_hyper _xdr_u_hyper
@@ -810,6 +816,7 @@
#define yp_unbind _yp_unbind
#define yperr_string _yperr_string
#define ypprot_err _ypprot_err
#define yp_setbindtries _yp_setbindtries
#define dlopen __dlopen
#define dlclose __dlclose
#define dlsym __dlsym

View File

@@ -1,4 +1,4 @@
/* $NetBSD: reentrant.h,v 1.14 2009/01/11 02:46:28 christos Exp $ */
/* $NetBSD: reentrant.h,v 1.15 2012/06/03 21:27:30 joerg Exp $ */
/*-
* Copyright (c) 1997, 1998, 2003 The NetBSD Foundation, Inc.
@@ -254,7 +254,17 @@ __END_DECLS
#define thr_getspecific(k)
#define thr_keydelete(k)
#define thr_once(o, f)
#if !defined(__minix)
static inline int
thr_once(once_t *once_control, void (*routine)(void))
{
if (__predict_false(once_control->pto_done == 0)) {
(*routine)();
once_control->pto_done = 1;
}
return 0;
}
#endif /* defined(__minix) */
#define thr_sigsetmask(f, n, o)
#define thr_self()
#define thr_errno()