Module Name: src
Committed By: matt
Date: Wed Apr 21 05:26:00 UTC 2010
Modified Files:
src/include [matt-nb5-mips64]: dlfcn.h link_elf.h math.h paths.h util.h
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.16.1 src/include/dlfcn.h
cvs rdiff -u -r1.7 -r1.7.36.1 src/include/link_elf.h
cvs rdiff -u -r1.47 -r1.47.16.1 src/include/math.h
cvs rdiff -u -r1.34 -r1.34.12.1 src/include/paths.h
cvs rdiff -u -r1.49 -r1.49.18.1 src/include/util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/dlfcn.h
diff -u src/include/dlfcn.h:1.19 src/include/dlfcn.h:1.19.16.1
--- src/include/dlfcn.h:1.19 Mon Apr 28 20:22:54 2008
+++ src/include/dlfcn.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dlfcn.h,v 1.19 2008/04/28 20:22:54 martin Exp $ */
+/* $NetBSD: dlfcn.h,v 1.19.16.1 2010/04/21 05:26:00 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
#if defined(_NETBSD_SOURCE)
int dladdr(const void * __restrict, Dl_info * __restrict);
int dlctl(void *, int, void *);
+int dlinfo(void *, int, void *);
#endif
__aconst char *dlerror(void);
__END_DECLS
@@ -88,4 +89,23 @@
#endif /* 0 */
#endif /* defined(_NETBSD_SOURCE) */
+/*
+ * dlinfo() commands
+ *
+ * From Solarisa: http://docs.sun.com/app/docs/doc/816-5168/dlinfo-3c?a=view
+ */
+#if defined(_NETBSD_SOURCE)
+#define RTLD_DI_LINKMAP 3
+#if 0
+#define RTLD_DI_ARGSINFO 1
+#define RTLD_DI_CONFIGADDR 2
+#define RTLD_DI_LMID 4
+#define RTLD_DI_SERINFO 5
+#define RTLD_DI_SERINFOSIZE 6
+#define RTLD_DI_ORIGIN 7
+#define RTLD_DI_GETSIGNAL 8
+#define RTLD_DI_SETSIGNAL 9
+#endif
+#endif /* _NETBSD_SOURCE */
+
#endif /* !defined(_DLFCN_H_) */
Index: src/include/link_elf.h
diff -u src/include/link_elf.h:1.7 src/include/link_elf.h:1.7.36.1
--- src/include/link_elf.h:1.7 Wed Jan 11 22:50:35 2006
+++ src/include/link_elf.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: link_elf.h,v 1.7 2006/01/11 22:50:35 uwe Exp $ */
+/* $NetBSD: link_elf.h,v 1.7.36.1 2010/04/21 05:26:00 matt Exp $ */
/*
* This only exists for GDB.
@@ -11,7 +11,7 @@
#include <machine/elf_machdep.h>
-struct link_map {
+typedef struct link_map {
caddr_t l_addr; /* Base Address of library */
#ifdef __mips__
caddr_t l_offs; /* Load Offset of library */
@@ -20,7 +20,7 @@
void *l_ld; /* Pointer to .dynamic in memory */
struct link_map *l_next; /* linked list of of mapped libs */
struct link_map *l_prev;
-};
+} Link_map;
struct r_debug {
int r_version; /* not used */
Index: src/include/math.h
diff -u src/include/math.h:1.47 src/include/math.h:1.47.16.1
--- src/include/math.h:1.47 Fri Apr 25 21:20:57 2008
+++ src/include/math.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: math.h,v 1.47 2008/04/25 21:20:57 christos Exp $ */
+/* $NetBSD: math.h,v 1.47.16.1 2010/04/21 05:26:00 matt Exp $ */
/*
* ====================================================
@@ -59,8 +59,12 @@
* ANSI/POSIX
*/
/* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */
+#if __GNUC_PREREQ__(3, 3)
+#define HUGE_VAL __builtin_huge_val()
+#else
extern const union __double_u __infinity;
#define HUGE_VAL __infinity.__val
+#endif
/*
* ISO C99
@@ -72,14 +76,21 @@
((_XOPEN_SOURCE - 0) >= 600) || \
defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
/* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */
+#if __GNUC_PREREQ__(3, 3)
+#define HUGE_VALF __builtin_huge_valf()
+#define HUGE_VALL __builtin_huge_vall()
+#else
extern const union __float_u __infinityf;
#define HUGE_VALF __infinityf.__val
extern const union __long_double_u __infinityl;
#define HUGE_VALL __infinityl.__val
+#endif
/* 7.12#4 INFINITY */
-#ifdef __INFINITY
+#if __GNUC_PREREQ__(3, 3)
+#define INFINITY __builtin_inff()
+#elif defined(__INFINITY)
#define INFINITY __INFINITY /* float constant which overflows */
#else
#define INFINITY HUGE_VALF /* positive infinity */
@@ -348,6 +359,15 @@
#define islessequal(x, y) (!isunordered((x), (y)) && (x) <= (y))
#define islessgreater(x, y) (!isunordered((x), (y)) && \
((x) > (y) || (y) > (x)))
+double fdim(double, double);
+double fmax(double, double);
+double fmin(double, double);
+float fdimf(float, float);
+float fmaxf(float, float);
+float fminf(float, float);
+long double fdiml(long double, long double);
+long double fmaxl(long double, long double);
+long double fminl(long double, long double);
#endif /* !_ANSI_SOURCE && ... */
Index: src/include/paths.h
diff -u src/include/paths.h:1.34 src/include/paths.h:1.34.12.1
--- src/include/paths.h:1.34 Sun Sep 28 06:38:02 2008
+++ src/include/paths.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: paths.h,v 1.34 2008/09/28 06:38:02 lukem Exp $ */
+/* $NetBSD: paths.h,v 1.34.12.1 2010/04/21 05:26:00 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -82,6 +82,7 @@
#define _PATH_MIXER0 "/dev/mixer0"
#define _PATH_NOLOGIN "/etc/nologin"
#define _PATH_PRINTCAP "/etc/printcap"
+#define _PATH_PUD "/dev/pud"
#define _PATH_PUFFS "/dev/puffs"
#define _PATH_RANDOM "/dev/random"
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
Index: src/include/util.h
diff -u src/include/util.h:1.49 src/include/util.h:1.49.18.1
--- src/include/util.h:1.49 Fri Dec 14 16:36:19 2007
+++ src/include/util.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.49 2007/12/14 16:36:19 christos Exp $ */
+/* $NetBSD: util.h,v 1.49.18.1 2010/04/21 05:26:00 matt Exp $ */
/*-
* Copyright (c) 1995
@@ -80,6 +80,8 @@
void logwtmp(const char *, const char *, const char *);
void logwtmpx(const char *, const char *, const char *, int, int);
int opendisk(const char *, int, char *, size_t, int);
+int opendisk1(const char *, int, char *, size_t, int,
+ int (*)(const char *, int, ...));
int openpty(int *, int *, char *, struct termios *,
struct winsize *);
time_t parsedate(const char *, const time_t *, const int *);
