diff options
| author | pgoyette <pgoyette@NetBSD.org> | 2019-01-27 02:08:33 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@NetBSD.org> | 2019-01-27 02:08:33 +0000 |
| commit | cc17ee2ece085d7d746bcd8fa9be19170855aaac (patch) | |
| tree | 5be40613f405cb081b2c44410b1506781927f8e3 /lib/libc | |
| parent | 10dd4cc92542aa04b0e59469a484a48e4c3cdd24 (diff) | |
Merge the [pgoyette-compat] branch
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/arch/m68k/gen/fabs.S | 8 | ||||
| -rw-r--r-- | lib/libc/sys/modctl.2 | 26 | ||||
| -rw-r--r-- | lib/libc/time/asctime.c | 6 | ||||
| -rw-r--r-- | lib/libc/time/difftime.c | 6 | ||||
| -rw-r--r-- | lib/libc/time/localtime.c | 6 | ||||
| -rw-r--r-- | lib/libc/time/zdump.c | 4 |
6 files changed, 37 insertions, 19 deletions
diff --git a/lib/libc/arch/m68k/gen/fabs.S b/lib/libc/arch/m68k/gen/fabs.S index 6bad9e6217d..b97daf2b529 100644 --- a/lib/libc/arch/m68k/gen/fabs.S +++ b/lib/libc/arch/m68k/gen/fabs.S @@ -1,4 +1,4 @@ -/* $NetBSD: fabs.S,v 1.12 2018/11/07 22:21:42 riastradh Exp $ */ +/* $NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -32,7 +32,11 @@ #include <machine/asm.h> #include <machine/math.h> -RCSID("$NetBSD: fabs.S,v 1.12 2018/11/07 22:21:42 riastradh Exp $") +RCSID("$NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $") + +#ifndef __HAVE_LONG_DOUBLE +STRONG_ALIAS(fabsl, fabs) +#endif #ifndef __HAVE_LONG_DOUBLE STRONG_ALIAS(fabsl, fabs) diff --git a/lib/libc/sys/modctl.2 b/lib/libc/sys/modctl.2 index b40ab8bc622..db9fa2a88fd 100644 --- a/lib/libc/sys/modctl.2 +++ b/lib/libc/sys/modctl.2 @@ -1,4 +1,4 @@ -.\" $NetBSD: modctl.2,v 1.13 2017/07/03 21:32:50 wiz Exp $ +.\" $NetBSD: modctl.2,v 1.14 2019/01/27 02:08:35 pgoyette Exp $ .\" .\" Copyright (c) 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -74,9 +74,19 @@ In this case, the argument should be a .Em struct iovec pointing to a suitable block of memory. -The kernel will fill this block with an array of +The kernel will fill this block with +.Bl -bullet +.It +a count of the number of modules loaded (including aliases), +.It +an array of .Em modstat_t -structures, one per loaded module. +structures, one per loaded module, and +.It +a series of NUL-terminated strings containing the modules' +required modules lists. +.El +.Pp If the block is not large enough, the data returned will be truncated to fit. The kernel will then update the @@ -146,9 +156,6 @@ contains the following elements, which are filled in by the kernel: .Bl -tag -width aaaaaaaa .It Fa "char ms_name[MAXMODNAME]" The name of the module. -.It Fa "char ms_required[MAXMODNAME * MAXMODDEPS]" -The list of modules required by this module -as a comma-delimited list of module names. .It Fa "modsrc_t ms_source" One of the following enumerated constants: .Bl -tag -compact -width "MODULE_SOURCE_FILESYS" @@ -172,14 +179,13 @@ Device driver. Executable file format. .It Dv MODULE_CLASS_MISC Miscellaneous. -.It Dv MODULE_CLASS_ANY -Any module class. -.\" XXX: is MODULE_CLASS_ANY ever returned by this interface? .El .It Fa "uint64_t ms_addr" The load address within the kernel. +(This value is available only for privileged users.) .It Fa "u_int ms_size" Loaded size of the module. +(This value is available only for privileged users.) .It Fa "u_int ms_refcnt" Current number of live references to this module. .It Fa "u_int ms_flags" @@ -190,6 +196,8 @@ The "force" flag must be specified to reload this module. .It Dv MODFLAG_AUTO_LOADED The module was auto-loaded by the operating system. .El +.It Fa "uint_ms_reqoffset" +The offset (in bytes) from the beginning of the required-module data. .El .Sh RETURN VALUES Upon successful completion, the value returned is 0. diff --git a/lib/libc/time/asctime.c b/lib/libc/time/asctime.c index a43baefd218..468c845d88e 100644 --- a/lib/libc/time/asctime.c +++ b/lib/libc/time/asctime.c @@ -1,4 +1,6 @@ -/* $NetBSD: asctime.c,v 1.25 2018/05/04 15:51:00 christos Exp $ */ +/* $NetBSD: asctime.c,v 1.26 2019/01/27 02:08:35 pgoyette Exp $ */ + +/* asctime and asctime_r a la POSIX and ISO C, except pad years before 1000. */ /* asctime and asctime_r a la POSIX and ISO C, except pad years before 1000. */ @@ -18,7 +20,7 @@ #if 0 static char elsieid[] = "@(#)asctime.c 8.5"; #else -__RCSID("$NetBSD: asctime.c,v 1.25 2018/05/04 15:51:00 christos Exp $"); +__RCSID("$NetBSD: asctime.c,v 1.26 2019/01/27 02:08:35 pgoyette Exp $"); #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libc/time/difftime.c b/lib/libc/time/difftime.c index 65315775cf1..2a89136c8c3 100644 --- a/lib/libc/time/difftime.c +++ b/lib/libc/time/difftime.c @@ -1,4 +1,6 @@ -/* $NetBSD: difftime.c,v 1.19 2018/10/19 23:05:35 christos Exp $ */ +/* $NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $ */ + +/* Return the difference between two timestamps. */ /* Return the difference between two timestamps. */ @@ -12,7 +14,7 @@ #if 0 static char elsieid[] = "@(#)difftime.c 8.1"; #else -__RCSID("$NetBSD: difftime.c,v 1.19 2018/10/19 23:05:35 christos Exp $"); +__RCSID("$NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $"); #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c index 15f258a8ef2..526178bfac9 100644 --- a/lib/libc/time/localtime.c +++ b/lib/libc/time/localtime.c @@ -1,4 +1,6 @@ -/* $NetBSD: localtime.c,v 1.114 2019/01/01 03:04:56 christos Exp $ */ +/* $NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $ */ + +/* Convert timestamp from time_t to struct tm. */ /* Convert timestamp from time_t to struct tm. */ @@ -12,7 +14,7 @@ #if 0 static char elsieid[] = "@(#)localtime.c 8.17"; #else -__RCSID("$NetBSD: localtime.c,v 1.114 2019/01/01 03:04:56 christos Exp $"); +__RCSID("$NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $"); #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libc/time/zdump.c b/lib/libc/time/zdump.c index 84ee1b75ac3..ba8bde3f739 100644 --- a/lib/libc/time/zdump.c +++ b/lib/libc/time/zdump.c @@ -1,4 +1,4 @@ -/* $NetBSD: zdump.c,v 1.51 2019/01/01 03:04:56 christos Exp $ */ +/* $NetBSD: zdump.c,v 1.52 2019/01/27 02:08:35 pgoyette Exp $ */ /* Dump time zone data in a textual format. */ /* @@ -8,7 +8,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: zdump.c,v 1.51 2019/01/01 03:04:56 christos Exp $"); +__RCSID("$NetBSD: zdump.c,v 1.52 2019/01/27 02:08:35 pgoyette Exp $"); #endif /* !defined lint */ #ifndef NETBSD_INSPIRED |
