CVS commit: src/usr.bin/getconf
Module Name:src Committed By: jkoshy Date: Sun Feb 18 19:35:38 UTC 2024 Modified Files: src/usr.bin/getconf: getconf.1 Log Message: getconf.1: Note that leading underscores in configuration variable names are ignored by getconf(1). While here, add a section with examples, and make the synopsis more concise. PR bin/57875 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/getconf/getconf.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/getconf/getconf.1 diff -u src/usr.bin/getconf/getconf.1:1.13 src/usr.bin/getconf/getconf.1:1.14 --- src/usr.bin/getconf/getconf.1:1.13 Sun Apr 13 01:45:34 2014 +++ src/usr.bin/getconf/getconf.1 Sun Feb 18 19:35:38 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: getconf.1,v 1.13 2014/04/13 01:45:34 snj Exp $ +.\" $NetBSD: getconf.1,v 1.14 2024/02/18 19:35:38 jkoshy Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 9, 2011 +.Dd February 18, 2024 .Dt GETCONF 1 .Os .Sh NAME @@ -37,13 +37,10 @@ .Nm .Ar system_var .Nm -.Fl a -.Nm .Ar path_var .Ar pathname .Nm -.Fl a -.Ar pathname +.Fl a Op Ar pathname .Sh DESCRIPTION The .Nm @@ -80,8 +77,28 @@ standard output, in the format = .Va value .Dc . +.Pp +For compatibility with other operating systems, +.Nm +will ignore leading underscores in the names specified in the +.Ar system_var +and +.Ar path_var +arguments. .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +To retrieve the number of configured processors, use: +.Bd -literal -offset indent +$ getconf NPROCESSORS_CONF +.Ed +.Pp +To retrieve the maximum number of bytes (excluding the trailing +.Dv NUL ) +for a filename in the current directory, use: +.Bd -literal -offset indent +$ getconf NAME_MAX . +.Ed .Sh SEE ALSO .Xr pathconf 2 , .Xr confstr 3 ,
CVS commit: src/usr.bin/getconf
Module Name:src Committed By: jkoshy Date: Sun Feb 18 19:35:38 UTC 2024 Modified Files: src/usr.bin/getconf: getconf.1 Log Message: getconf.1: Note that leading underscores in configuration variable names are ignored by getconf(1). While here, add a section with examples, and make the synopsis more concise. PR bin/57875 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/getconf/getconf.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ftpd
Module Name:src Committed By: jkoshy Date: Fri Feb 16 19:32:38 UTC 2024 Modified Files: src/libexec/ftpd: ftpcmd.y Log Message: Remove obsolete code. Per src/doc/CHANGES.prev support for the NI_WITHSCOPEID flag was removed in NetBSD 1.6. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/libexec/ftpd/ftpcmd.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ftpd
Module Name:src Committed By: jkoshy Date: Fri Feb 16 19:32:38 UTC 2024 Modified Files: src/libexec/ftpd: ftpcmd.y Log Message: Remove obsolete code. Per src/doc/CHANGES.prev support for the NI_WITHSCOPEID flag was removed in NetBSD 1.6. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/libexec/ftpd/ftpcmd.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ftpd/ftpcmd.y diff -u src/libexec/ftpd/ftpcmd.y:1.95 src/libexec/ftpd/ftpcmd.y:1.96 --- src/libexec/ftpd/ftpcmd.y:1.95 Fri Sep 22 11:23:28 2023 +++ src/libexec/ftpd/ftpcmd.y Fri Feb 16 19:32:38 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: ftpcmd.y,v 1.95 2023/09/22 11:23:28 shm Exp $ */ +/* $NetBSD: ftpcmd.y,v 1.96 2024/02/16 19:32:38 jkoshy Exp $ */ /*- * Copyright (c) 1997-2009 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ #if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: ftpcmd.y,v 1.95 2023/09/22 11:23:28 shm Exp $"); +__RCSID("$NetBSD: ftpcmd.y,v 1.96 2024/02/16 19:32:38 jkoshy Exp $"); #endif #endif /* not lint */ @@ -1825,11 +1825,7 @@ port_check(const char *cmd, int family) { char h1[NI_MAXHOST], h2[NI_MAXHOST]; char s1[NI_MAXHOST], s2[NI_MAXHOST]; -#ifdef NI_WITHSCOPEID - const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID; -#else const int niflags = NI_NUMERICHOST | NI_NUMERICSERV; -#endif if (epsvall) { reply(501, "%s disallowed after EPSV ALL", cmd);
CVS commit: src/include
Module Name:src Committed By: jkoshy Date: Fri Feb 16 11:13:59 UTC 2024 Modified Files: src/include: netdb.h Log Message: Note that the NI_WITHSCOPEID flag is obsolete. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/include/netdb.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/netdb.h diff -u src/include/netdb.h:1.71 src/include/netdb.h:1.72 --- src/include/netdb.h:1.71 Mon Aug 9 20:49:08 2021 +++ src/include/netdb.h Fri Feb 16 11:13:59 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: netdb.h,v 1.71 2021/08/09 20:49:08 andvar Exp $ */ +/* $NetBSD: netdb.h,v 1.72 2024/02/16 11:13:59 jkoshy Exp $ */ /* * ++Copyright++ 1980, 1983, 1988, 1993 @@ -296,7 +296,7 @@ struct addrinfo { #define NI_NAMEREQD 0x0004 #define NI_NUMERICSERV 0x0008 #define NI_DGRAM 0x0010 -#define NI_WITHSCOPEID 0x0020 +#define NI_WITHSCOPEID 0x0020 /* Obsolete. */ #define NI_NUMERICSCOPE 0x0040 /*%
CVS commit: src/include
Module Name:src Committed By: jkoshy Date: Fri Feb 16 11:13:59 UTC 2024 Modified Files: src/include: netdb.h Log Message: Note that the NI_WITHSCOPEID flag is obsolete. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/include/netdb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/net
Module Name:src Committed By: jkoshy Date: Thu Feb 15 15:08:23 UTC 2024 Modified Files: src/lib/libc/net: getnameinfo.3 Log Message: Document the NI_NUMERICSCOPE flag. PR lib/57832 To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/libc/net/getnameinfo.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/net/getnameinfo.3 diff -u src/lib/libc/net/getnameinfo.3:1.42 src/lib/libc/net/getnameinfo.3:1.43 --- src/lib/libc/net/getnameinfo.3:1.42 Mon Jul 3 21:32:49 2017 +++ src/lib/libc/net/getnameinfo.3 Thu Feb 15 15:08:23 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: getnameinfo.3,v 1.42 2017/07/03 21:32:49 wiz Exp $ +.\" $NetBSD: getnameinfo.3,v 1.43 2024/02/15 15:08:23 jkoshy Exp $ .\" $KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $ .\" $OpenBSD: getnameinfo.3,v 1.36 2004/12/21 09:48:20 jmc Exp $ .\" @@ -17,7 +17,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.Dd August 18, 2013 +.Dd February 15, 2024 .Dt GETNAMEINFO 3 .Os .Sh NAME @@ -106,6 +106,10 @@ If the host name cannot be found in DNS a non-zero error code is returned. If the host name is not found and the flag is not set, the address is returned in numeric form. +.It NI_NUMERICSCOPE +For IPv6 addresses the numeric form of the IPv6 scope identifier is +returned. +This flag is ignored for non-IPv6 addresses. .It NI_NUMERICSERV The service name is returned as a digit string representing the port number. .It NI_DGRAM
CVS commit: src/lib/libc/net
Module Name:src Committed By: jkoshy Date: Thu Feb 15 15:08:23 UTC 2024 Modified Files: src/lib/libc/net: getnameinfo.3 Log Message: Document the NI_NUMERICSCOPE flag. PR lib/57832 To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/libc/net/getnameinfo.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: jkoshy Date: Fri Feb 2 21:16:42 UTC 2024 Modified Files: src/lib/libc/gen: err.3 Log Message: Make the err(3) manual clearer to read. - Mention that the 'fmt' argument to these functions holds a printf(3)-like format specification. - Clarify that the err()/warn()/errc()/warnc() family of functions will append an additional error message to the output. - Add whitespace to separate paragraphs describing distinct concepts. - Move the sentence mentioning the final output newline to a less ambiguous location within the text. - Add a cross-reference to printf(3). To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/err.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: jkoshy Date: Fri Feb 2 21:16:42 UTC 2024 Modified Files: src/lib/libc/gen: err.3 Log Message: Make the err(3) manual clearer to read. - Mention that the 'fmt' argument to these functions holds a printf(3)-like format specification. - Clarify that the err()/warn()/errc()/warnc() family of functions will append an additional error message to the output. - Add whitespace to separate paragraphs describing distinct concepts. - Move the sentence mentioning the final output newline to a less ambiguous location within the text. - Add a cross-reference to printf(3). To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/err.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/err.3 diff -u src/lib/libc/gen/err.3:1.23 src/lib/libc/gen/err.3:1.24 --- src/lib/libc/gen/err.3:1.23 Thu Jan 5 15:13:57 2023 +++ src/lib/libc/gen/err.3 Fri Feb 2 21:16:41 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: err.3,v 1.23 2023/01/05 15:13:57 kre Exp $ +.\" $NetBSD: err.3,v 1.24 2024/02/02 21:16:41 jkoshy Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)err.3 8.1 (Berkeley) 6/9/93 .\" -.Dd January 5, 2023 +.Dd February 2, 2024 .Dt ERR 3 .Os .Sh NAME @@ -81,27 +81,30 @@ and .Fn warn family of functions display a formatted error message on the standard error output. -In all cases, the last component of the program name, a colon character, -and a space are output. +.Pp +In all cases these functions output the last component of the program name, +a colon character, and a space. If the .Fa fmt argument is not .Dv NULL , -the formatted error message is output. +it is used as a +.Xr printf 3 Ns +-like format specification for the error message. +.Pp In the case of the .Fn err , .Fn verr , .Fn warn , and .Fn vwarn -functions, the error message string affiliated with the current value of -the global variable +functions, an additional error message string affiliated with the current +value of the global variable .Va errno is output next, preceded by a colon character and a space if .Fa fmt is not .Dv NULL . -In all cases, the output is followed by a newline character. The .Fn errc , .Fn verrc , @@ -119,7 +122,9 @@ The .Fn warnx , and .Fn vwarnx -functions will not output this error message string. +functions will not output an additional error message string. +.Pp +In all cases, the output is terminated by a newline character. .Pp The .Fn err , @@ -168,6 +173,7 @@ if ((fd = open(block_device, O_RDONLY, 0 .Sh SEE ALSO .Xr exit 3 , .Xr getprogname 3 , +.Xr printf 3 , .Xr strerror 3 .Sh HISTORY The
CVS commit: src/external/bsd/elftoolchain/dist/common
Module Name:src Committed By: jkoshy Date: Sun Dec 17 18:59:19 UTC 2023 Modified Files: src/external/bsd/elftoolchain/dist/common: utarray.h uthash.h Log Message: Sync ut{array,hash}.h to elftoolchain [r4024]. This change updates these files to UTARRAY/UTHASH v2.3.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/elftoolchain/dist/common/utarray.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/elftoolchain/dist/common/uthash.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/utarray.h diff -u src/external/bsd/elftoolchain/dist/common/utarray.h:1.3 src/external/bsd/elftoolchain/dist/common/utarray.h:1.4 --- src/external/bsd/elftoolchain/dist/common/utarray.h:1.3 Wed Nov 18 22:23:05 2020 +++ src/external/bsd/elftoolchain/dist/common/utarray.h Sun Dec 17 18:59:19 2023 @@ -1,7 +1,7 @@ -/* $NetBSD: utarray.h,v 1.3 2020/11/18 22:23:05 jkoshy Exp $ */ +/* $NetBSD: utarray.h,v 1.4 2023/12/17 18:59:19 jkoshy Exp $ */ -/* -Copyright (c) 2008-2018, Troy D. Hanson http://troydhanson.github.com/uthash/ +/*- +Copyright (c) 2008-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ All rights reserved. Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #ifndef UTARRAY_H #define UTARRAY_H -#define UTARRAY_VERSION 2.1.0 +#define UTARRAY_VERSION 2.3.0 #include /* size_t */ #include /* memset, etc */ @@ -234,8 +234,9 @@ typedef struct { /* last we pre-define a few icd for common utarrays of ints and strings */ static void utarray_str_cpy(void *dst, const void *src) { - char *const*_src = (char*const*)src, **_dst = (char**)dst; - *_dst = (*_src == NULL) ? NULL : strdup(*_src); + char *const *srcc = (char *const *)src; + char **dstc = (char**)dst; + *dstc = (*srcc == NULL) ? NULL : strdup(*srcc); } static void utarray_str_dtor(void *elt) { char **eltc = (char**)elt; Index: src/external/bsd/elftoolchain/dist/common/uthash.h diff -u src/external/bsd/elftoolchain/dist/common/uthash.h:1.4 src/external/bsd/elftoolchain/dist/common/uthash.h:1.5 --- src/external/bsd/elftoolchain/dist/common/uthash.h:1.4 Mon Nov 30 22:26:30 2020 +++ src/external/bsd/elftoolchain/dist/common/uthash.h Sun Dec 17 18:59:19 2023 @@ -1,7 +1,7 @@ -/* $NetBSD: uthash.h,v 1.4 2020/11/30 22:26:30 jkoshy Exp $ */ +/* $NetBSD: uthash.h,v 1.5 2023/12/17 18:59:19 jkoshy Exp $ */ -/* -Copyright (c) 2003-2018, Troy D. Hanson http://troydhanson.github.com/uthash/ +/*- +Copyright (c) 2003-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ All rights reserved. Redistribution and use in source and binary forms, with or without @@ -26,12 +26,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #ifndef UTHASH_H #define UTHASH_H -#define UTHASH_VERSION 2.1.0 +#define UTHASH_VERSION 2.3.0 #include/* memcmp, memset, strlen */ #include/* ptrdiff_t */ #include/* exit */ +#if defined(HASH_DEFINE_OWN_STDINT) && HASH_DEFINE_OWN_STDINT +/* This codepath is provided for backward compatibility, but I plan to remove it. */ +#warning "HASH_DEFINE_OWN_STDINT is deprecated; please use HASH_NO_STDINT instead" +typedef unsigned int uint32_t; +typedef unsigned char uint8_t; +#elif defined(HASH_NO_STDINT) && HASH_NO_STDINT +#else +#include/* uint8_t, uint32_t */ +#endif + /* These macros use decltype or the earlier __typeof GNU extension. As decltype is only available in newer compilers (VS2010 or gcc 4.3+ when compiling c++ source) this code uses whatever method is needed @@ -64,25 +74,6 @@ do { } while (0) #endif -/* a number of the hash function use uint32_t which isn't defined on Pre VS2010 */ -#if defined(_WIN32) -#if defined(_MSC_VER) && _MSC_VER >= 1600 -#include -#elif defined(__WATCOMC__) || defined(__MINGW32__) || defined(__CYGWIN__) -#include -#else -typedef unsigned int uint32_t; -typedef unsigned char uint8_t; -#endif -#elif defined(__GNUC__) && !defined(__VXWORKS__) -#include -#elif defined(__lint__) -#include -#else -typedef unsigned int uint32_t; -typedef unsigned char uint8_t; -#endif - #ifndef uthash_malloc #define uthash_malloc(sz) malloc(sz) /* malloc fcn */ #endif @@ -96,15 +87,12 @@ typedef unsigned char uint8_t; #define uthash_strlen(s) strlen(s) #endif -#ifdef uthash_memcmp -/* This warning will not catch programs that define uthash_memcmp AFTER including uthash.h. */ -#warning "uthash_memcmp is deprecated; please use HASH_KEYCMP instead" -#else -#define uthash_memcmp(a,b,n) memcmp(a,b,n) +#ifndef HASH_FUNCTION +#define HASH_FUNCTION(keyptr,keylen,hashv) HASH_JEN(keyptr, keylen, hashv) #endif #ifndef HASH_KEYCMP -#define HASH_KEYCMP(a,b,n) uthash_memcmp(a,b,n) +#define HASH_KEYCMP(a,b,n) memcmp(a,b,n) #endif #ifndef uthash_noexpand_fyi
CVS commit: src/external/bsd/elftoolchain/dist/common
Module Name:src Committed By: jkoshy Date: Sun Dec 17 18:59:19 UTC 2023 Modified Files: src/external/bsd/elftoolchain/dist/common: utarray.h uthash.h Log Message: Sync ut{array,hash}.h to elftoolchain [r4024]. This change updates these files to UTARRAY/UTHASH v2.3.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/elftoolchain/dist/common/utarray.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/elftoolchain/dist/common/uthash.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Sat Dec 9 19:42:41 UTC 2023 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 Log Message: Update elfconstants.m4 to upstream [r4003]: - Use signed integer literals for DT_* values. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.5 src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.6 --- src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.5 Thu Dec 7 17:28:36 2023 +++ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Sat Dec 9 19:42:41 2023 @@ -1,4 +1,4 @@ -dnl $NetBSD: elfconstants.m4,v 1.5 2023/12/07 17:28:36 jkoshy Exp $ +dnl $NetBSD: elfconstants.m4,v 1.6 2023/12/09 19:42:41 jkoshy Exp $ # Copyright (c) 2010,2021 Joseph Koshy # All rights reserved. @@ -33,7 +33,7 @@ dnl $NetBSD: elfconstants.m4,v 1.5 2023 # - The "Linkers and Libraries Guide", from Sun Microsystems. define(`VCSID_ELFCONSTANTS_M4', - `$Id: elfconstants.m4,v 1.5 2023/12/07 17:28:36 jkoshy Exp $') + `$Id: elfconstants.m4,v 1.6 2023/12/09 19:42:41 jkoshy Exp $') # In the following definitions, `_' is an M4 macro that is meant to be # expanded later. Its intended usage is: @@ -188,205 +188,205 @@ _(`DT_PREINIT_ARRAYSZ', 33, `size of pre-initialization array') _(`DT_MAXPOSTAGS', 34, `the number of positive tags') -_(`DT_LOOS', 0x600DUL, +_(`DT_LOOS', 0x600D, `start of OS-specific types') -_(`DT_SUNW_AUXILIARY', 0x600DUL, +_(`DT_SUNW_AUXILIARY', 0x600D, `offset of string naming auxiliary filtees') -_(`DT_SUNW_RTLDINF', 0x600EUL, +_(`DT_SUNW_RTLDINF', 0x600E, `rtld internal use') -_(`DT_SUNW_FILTER', 0x600FUL, +_(`DT_SUNW_FILTER', 0x600F, `offset of string naming standard filtees') -_(`DT_SUNW_CAP', 0x6010UL, +_(`DT_SUNW_CAP', 0x6010, `address of hardware capabilities section') -_(`DT_SUNW_ASLR',0x6023UL, +_(`DT_SUNW_ASLR',0x6023, `Address Space Layout Randomization flag') -_(`DT_HIOS', 0x6000UL, +_(`DT_HIOS', 0x6000, `end of OS-specific types') -_(`DT_VALRNGLO', 0x6D00UL, +_(`DT_VALRNGLO', 0x6D00, `start of range using the d_val field') -_(`DT_GNU_PRELINKED',0x6DF5UL, +_(`DT_GNU_PRELINKED',0x6DF5, `prelinking timestamp') -_(`DT_GNU_CONFLICTSZ', 0x6DF6UL, +_(`DT_GNU_CONFLICTSZ', 0x6DF6, `size of conflict section') -_(`DT_GNU_LIBLISTSZ',0x6DF7UL, +_(`DT_GNU_LIBLISTSZ',0x6DF7, `size of library list') -_(`DT_CHECKSUM', 0x6DF8UL, +_(`DT_CHECKSUM', 0x6DF8, `checksum for the object') -_(`DT_PLTPADSZ', 0x6DF9UL, +_(`DT_PLTPADSZ', 0x6DF9, `size of PLT padding') -_(`DT_MOVEENT', 0x6DFAUL, +_(`DT_MOVEENT', 0x6DFA, `size of DT_MOVETAB entries') -_(`DT_MOVESZ', 0x6DFBUL, +_(`DT_MOVESZ', 0x6DFB, `total size of the MOVETAB table') -_(`DT_FEATURE', 0x6DFCUL, +_(`DT_FEATURE', 0x6DFC, `feature values') -_(`DT_POSFLAG_1',0x6DFDUL, +_(`DT_POSFLAG_1',0x6DFD, `dynamic position flags') -_(`DT_SYMINSZ', 0x6DFEUL, +_(`DT_SYMINSZ', 0x6DFE, `size of the DT_SYMINFO table') -_(`DT_SYMINENT', 0x6DFFUL, +_(`DT_SYMINENT', 0x6DFF, `size of a DT_SYMINFO entry') -_(`DT_VALRNGHI', 0x6DFFUL, +_(`DT_VALRNGHI', 0x6DFF, `end of range using the d_val field') -_(`DT_ADDRRNGLO',0x6E00UL, +_(`DT_ADDRRNGLO',0x6E00, `start of range using the d_ptr field') -_(`DT_GNU_HASH', 0x6EF5UL, +_(`DT_GNU_HASH', 0x6EF5, `GNU style hash tables') -_(`DT_TLSDESC_PLT', 0x6EF6UL, +_(`DT_TLSDESC_PLT', 0x6EF6, `location of PLT entry for TLS descriptor resolver calls') -_(`DT_TLSDESC_GOT', 0x6EF7UL, +_(`DT_TLSDESC_GOT', 0x6EF7, `location of GOT entry used by TLS descriptor resolver PLT entry') -_(`DT_GNU_CONFLICT', 0x6EF8UL, +_(`DT_GNU_CONFLICT', 0x6EF8, `address of conflict section') -_(`DT_GNU_LIBLIST', 0x6EF9UL, +_(`DT_GNU_LIBLIST', 0x6EF9, `address of conflict section') -_(`DT_CONFIG', 0x6EFAUL, +_(`DT_CONFIG', 0x6EFA, `configuration file') -_(`DT_DEPAUDIT', 0x6EFBUL, +_(`DT_DEPAUDIT', 0x6EFB, `string defining audit libraries') -_(`DT_AUDIT',0x6EFCUL, +_(`DT_AUDIT',0x6EFC, `string defi
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Sat Dec 9 19:42:41 UTC 2023 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 Log Message: Update elfconstants.m4 to upstream [r4003]: - Use signed integer literals for DT_* values. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Thu Dec 7 17:28:36 UTC 2023 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 Log Message: Update elfconstants.m4 to upstream [r3986]. - Add the NetBSD spelling of a 386 relocation. - Add VAX relocations. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Thu Dec 7 17:28:36 UTC 2023 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 Log Message: Update elfconstants.m4 to upstream [r3986]. - Add the NetBSD spelling of a 386 relocation. - Add VAX relocations. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.4 src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.5 --- src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.4 Mon May 2 20:27:43 2022 +++ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Thu Dec 7 17:28:36 2023 @@ -1,4 +1,4 @@ -dnl $NetBSD: elfconstants.m4,v 1.4 2022/05/02 20:27:43 jkoshy Exp $ +dnl $NetBSD: elfconstants.m4,v 1.5 2023/12/07 17:28:36 jkoshy Exp $ # Copyright (c) 2010,2021 Joseph Koshy # All rights reserved. @@ -33,7 +33,7 @@ dnl $NetBSD: elfconstants.m4,v 1.4 2022 # - The "Linkers and Libraries Guide", from Sun Microsystems. define(`VCSID_ELFCONSTANTS_M4', - `Id: elfconstants.m4 3980 2022-05-02 19:50:00Z jkoshy') + `$Id: elfconstants.m4,v 1.5 2023/12/07 17:28:36 jkoshy Exp $') # In the following definitions, `_' is an M4 macro that is meant to be # expanded later. Its intended usage is: @@ -1605,6 +1605,7 @@ _(R_386_GOT32, 3) _(R_386_PLT32, 4) _(R_386_COPY, 5) _(R_386_GLOB_DAT, 6) +_(R_386_JMP_SLOT, 7) _(R_386_JUMP_SLOT, 7) _(R_386_RELATIVE, 8) _(R_386_GOTOFF, 9) @@ -2402,6 +2403,22 @@ _(R_SPARC_GOTDATA_OP, 84) _(R_SPARC_H34, 85) ') +define(`DEFINE_VAX_RELOCATIONS',` +_(R_VAX_NONE, 0) +_(R_VAX_32, 1) +_(R_VAX_16, 2) +_(R_VAX_8, 3) +_(R_VAX_PC32, 4) +_(R_VAX_PC16, 5) +_(R_VAX_PC8,6) +_(R_VAX_GOT32, 7) +_(R_VAX_PLT32, 13) +_(R_VAX_COPY, 19) +_(R_VAX_GLOB_DAT, 20) +_(R_VAX_JMP_SLOT, 21) +_(R_VAX_RELATIVE, 22) +') + define(`DEFINE_X86_64_RELOCATIONS',` _(R_X86_64_NONE, 0) _(R_X86_64_64, 1) @@ -2457,6 +2474,7 @@ DEFINE_PPC32_RELOCATIONS() DEFINE_PPC64_RELOCATIONS() DEFINE_RISCV_RELOCATIONS() DEFINE_SPARC_RELOCATIONS() +DEFINE_VAX_RELOCATIONS() DEFINE_X86_64_RELOCATIONS() ')
Re: CVS commit: src/sbin/mount_procfs
jk> mount_procfs(8): Document the format of the region descriptor jk> lines contained in the 'map' and 'maps' special files. This is to the best of my understanding, based on reading the code and the UVM usenix paper [1]. Corrections welcome. [1]: https://chuck.cranor.org/p/uvm_usenix.pdf Regards, Joseph Koshy
CVS commit: src/sbin/mount_procfs
Module Name:src Committed By: jkoshy Date: Tue Apr 18 18:42:20 UTC 2023 Modified Files: src/sbin/mount_procfs: mount_procfs.8 Log Message: mount_procfs(8): Document the format of the region descriptor lines contained in the 'map' and 'maps' special files. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sbin/mount_procfs/mount_procfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_procfs/mount_procfs.8 diff -u src/sbin/mount_procfs/mount_procfs.8:1.38 src/sbin/mount_procfs/mount_procfs.8:1.39 --- src/sbin/mount_procfs/mount_procfs.8:1.38 Wed Jan 8 12:04:57 2020 +++ src/sbin/mount_procfs/mount_procfs.8 Tue Apr 18 18:42:20 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_procfs.8,v 1.38 2020/01/08 12:04:57 ad Exp $ +.\" $NetBSD: mount_procfs.8,v 1.39 2023/04/18 18:42:20 jkoshy Exp $ .\" .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -34,7 +34,7 @@ .\" @(#)mount_procfs.8 8.3 (Berkeley) 6/1/94 .\" .\" -.Dd January 8, 2020 +.Dd April 18, 2023 .Dt MOUNT_PROCFS 8 .Os .Sh NAME @@ -108,9 +108,103 @@ This can be used to gain access to the p or to start another copy of the process. .It Pa map A map of the process' virtual memory. +This file comprises lines describing the memory regions of the process, +where each line contains the following fields: +.Pp +.Bl -tag -compact -width max-protection +.It start-address +The starting address of the region (inclusive). +.It end-address +The ending address of the region (exclusive). +.It protection +The access permissions for the region, represented as +a three-character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It max-protection +The maximum access permissions for the region represented as +a three character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It copy-on-write +Whether the region is copy-on-write. +One of: +.Bl -tag -compact -width NCOW +.It COW +A region that is copy-on-write. +.It NCOW +A region that is not copy-on-write. +.El +.It needs-copy +Whether the region needs a copy. +One of: +.Bl -tag -compact -width NNC +.It NC +The region needs a copy. +.It NNC +The region does not need a copy. +.El +.It inheritance +The inheritance code for the region, as set by +.Xr minherit 2 . +.It wired-count +The wired count for the region. +The region can be paged out if its wired count is zero. +.It advice +The advice value set by a prior call to +.Xr madvise 2 +for the region. +.El .It Pa maps A map of the process' virtual memory in a form like the proc filesystem as implemented in Linux. +This file comprises lines describing the memory regions of +the process, where each line contains the following fields: +.Pp +.Bl -tag -compact -width start-address +.It start-address +The starting address of the region (inclusive). +.It end-address +The ending address of the region (exclusive). +.It protection +The access permissions for the region, represented as +a three-character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It copy-on-write +Whether the region is copy-on-write. +One of: +.Bl -tag -compact -width ".Sq p" +.It Sq p +The region is copy-on-write. +.It Sq s +The region is shared. +.El +.It offset +The offset into the file being mapped by the region. +.It device-id +The major and minor number of the device containing the file +being mapped by the region. +.It fileid +The inode for the file associated with the region. +.It path +The pathname to the file associated with the region. +.El .It Pa mem The complete virtual memory image of the process. Only those addresses which exist in the process can be accessed.
CVS commit: src/sbin/mount_procfs
Module Name:src Committed By: jkoshy Date: Tue Apr 18 18:42:20 UTC 2023 Modified Files: src/sbin/mount_procfs: mount_procfs.8 Log Message: mount_procfs(8): Document the format of the region descriptor lines contained in the 'map' and 'maps' special files. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sbin/mount_procfs/mount_procfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Fri Dec 30 21:12:45 UTC 2022 Modified Files: src/share/misc: style Log Message: Move a style recommendation closer to the syntax that it describes. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Fri Dec 30 21:12:45 UTC 2022 Modified Files: src/share/misc: style Log Message: Move a style recommendation closer to the syntax that it describes. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/style diff -u src/share/misc/style:1.66 src/share/misc/style:1.67 --- src/share/misc/style:1.66 Fri Dec 30 17:02:31 2022 +++ src/share/misc/style Fri Dec 30 21:12:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $ */ +/* $NetBSD: style,v 1.67 2022/12/30 21:12:44 jkoshy Exp $ */ /* * The revision control tag appears first, with a blank line after it. @@ -30,7 +30,7 @@ #include __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $"); +__RCSID("$NetBSD: style,v 1.67 2022/12/30 21:12:44 jkoshy Exp $"); /* * VERY important single-line comments look like this. @@ -260,11 +260,13 @@ main(int argc, char *argv[]) * Braces around single-line bodies are optional; use discretion. * * Use narrow scopes for loop variables where possible. - * - * Forever loops are done with for's, not while's. */ for (char *p = buf; *p != '\0'; ++p) continue; /* Explicit no-op */ + + /* + * Forever loops are done with for's, not while's. + */ for (;;) stmt;
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Fri Dec 30 17:02:31 UTC 2022 Modified Files: src/share/misc: style Log Message: C99: Suggest using narrow scopes for loop indices. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/style diff -u src/share/misc/style:1.65 src/share/misc/style:1.66 --- src/share/misc/style:1.65 Thu Dec 29 18:23:37 2022 +++ src/share/misc/style Fri Dec 30 17:02:31 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: style,v 1.65 2022/12/29 18:23:37 jkoshy Exp $ */ +/* $NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $ */ /* * The revision control tag appears first, with a blank line after it. @@ -30,7 +30,7 @@ #include __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: style,v 1.65 2022/12/29 18:23:37 jkoshy Exp $"); +__RCSID("$NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $"); /* * VERY important single-line comments look like this. @@ -259,9 +259,11 @@ main(int argc, char *argv[]) * * Braces around single-line bodies are optional; use discretion. * + * Use narrow scopes for loop variables where possible. + * * Forever loops are done with for's, not while's. */ - for (p = buf; *p != '\0'; ++p) + for (char *p = buf; *p != '\0'; ++p) continue; /* Explicit no-op */ for (;;) stmt;
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Fri Dec 30 17:02:31 UTC 2022 Modified Files: src/share/misc: style Log Message: C99: Suggest using narrow scopes for loop indices. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Thu Dec 29 18:23:37 UTC 2022 Modified Files: src/share/misc: style Log Message: Terminate a sentence with a full stop. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/style diff -u src/share/misc/style:1.64 src/share/misc/style:1.65 --- src/share/misc/style:1.64 Thu Mar 10 23:39:12 2022 +++ src/share/misc/style Thu Dec 29 18:23:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: style,v 1.64 2022/03/10 23:39:12 rillig Exp $ */ +/* $NetBSD: style,v 1.65 2022/12/29 18:23:37 jkoshy Exp $ */ /* * The revision control tag appears first, with a blank line after it. @@ -30,7 +30,7 @@ #include __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: style,v 1.64 2022/03/10 23:39:12 rillig Exp $"); +__RCSID("$NetBSD: style,v 1.65 2022/12/29 18:23:37 jkoshy Exp $"); /* * VERY important single-line comments look like this. @@ -432,7 +432,7 @@ dirinfo(const char *p, struct stat *sb, /* * To printf quantities that might be larger than "long", - * cast quantities to intmax_t or uintmax_t and use %j + * cast quantities to intmax_t or uintmax_t and use %j. */ (void)printf("The size of %s is %jd (%#ju)\n", p, (intmax_t)sb->st_size, (uintmax_t)sb->st_size);
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Thu Dec 29 18:23:37 UTC 2022 Modified Files: src/share/misc: style Log Message: Terminate a sentence with a full stop. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: jkoshy Date: Mon May 30 21:18:37 UTC 2022 Modified Files: src/sys/arch/aarch64/include: elf_machdep.h Log Message: Use the ABI value for 'R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC'. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/include/elf_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: jkoshy Date: Mon May 30 21:18:37 UTC 2022 Modified Files: src/sys/arch/aarch64/include: elf_machdep.h Log Message: Use the ABI value for 'R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC'. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/include/elf_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/aarch64/include/elf_machdep.h diff -u src/sys/arch/aarch64/include/elf_machdep.h:1.4 src/sys/arch/aarch64/include/elf_machdep.h:1.5 --- src/sys/arch/aarch64/include/elf_machdep.h:1.4 Fri Oct 12 01:28:58 2018 +++ src/sys/arch/aarch64/include/elf_machdep.h Mon May 30 21:18:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: elf_machdep.h,v 1.4 2018/10/12 01:28:58 ryo Exp $ */ +/* $NetBSD: elf_machdep.h,v 1.5 2022/05/30 21:18:37 jkoshy Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -198,7 +198,7 @@ #define R_AARCH64_TLSLE_LDST128_TPREL_LO12 570 /* TPREL(S+A) */ #define R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC 571 /* TPREL(S+A) */ #define R_AARCH64_TLSLD_LDST128_DTPREL_LO12 572 /* DTPREL(S+A) */ -#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC 572 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC 573 /* DTPREL(S+A) */ /* Dynamic Relocations */ #define R_AARCH64_P32_COPY 180
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Sun May 8 17:28:14 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfdefinitions.m4 Log Message: Merge from upstream [r3984]: allow the use of the generated 'elfdefinitions.h' file in compilation environments lacking C99 headers. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.4 src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.5 --- src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.4 Mon May 2 20:27:43 2022 +++ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Sun May 8 17:28:14 2022 @@ -1,4 +1,4 @@ -dnl $NetBSD: elfdefinitions.m4,v 1.4 2022/05/02 20:27:43 jkoshy Exp $ +dnl $NetBSD: elfdefinitions.m4,v 1.5 2022/05/08 17:28:14 jkoshy Exp $ /*- * Copyright (c) 2010,2021 Joseph Koshy * All rights reserved. @@ -26,7 +26,7 @@ dnl $NetBSD: elfdefinitions.m4,v 1.4 20 */ divert(-1) define(`VCSID_ELFDEFINITIONS_M4', - `Id: elfdefinitions.m4 3980 2022-05-02 19:50:00Z jkoshy') + `Id: elfdefinitions.m4 3984 2022-05-06 11:22:42Z jkoshy') include(`elfconstants.m4')dnl define(`_',`ifelse(eval(len($1) <= 7),1, @@ -55,8 +55,6 @@ divert(0)dnl #ifndef _SYS_ELFDEFINITIONS_H_ #define _SYS_ELFDEFINITIONS_H_ -#include - /* * Types of capabilities. */
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Sun May 8 17:28:14 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfdefinitions.m4 Log Message: Merge from upstream [r3984]: allow the use of the generated 'elfdefinitions.h' file in compilation environments lacking C99 headers. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/tools
Module Name:src Committed By: jkoshy Date: Wed May 4 11:07:43 UTC 2022 Added Files: src/external/bsd/elftoolchain/dist/tools: netbsd-base-system-import.sh Log Message: Add a script from upstream that assists with importing upstream Elftoolchain sources. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/bsd/elftoolchain/dist/tools/netbsd-base-system-import.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/elftoolchain/dist/tools/netbsd-base-system-import.sh diff -u /dev/null src/external/bsd/elftoolchain/dist/tools/netbsd-base-system-import.sh:1.1 --- /dev/null Wed May 4 11:07:43 2022 +++ src/external/bsd/elftoolchain/dist/tools/netbsd-base-system-import.sh Wed May 4 11:07:43 2022 @@ -0,0 +1,230 @@ +#!/bin/sh +# +# Copy files from an Elftoolchain checkout and prepare them for import +# into the NetBSD 'src' tree. +# +# Usage: +# +# netbsd-base-system-import.sh [-D] -s SRCDIR -d DISTDIR -m MODULE \ +# [-m MODULE]... + +usage() { + echo "Usage: $0 [options]" + echo + echo "Prepare elftoolchain sources for importing into NetBSD src." + echo + echo "Options:" + echo " -DOnly show diffs." + echo " -d DISTDIRSet the 'dist' directory for the elftoolchain import." + echo "Defaults to './dist'." + echo " -hDisplay this help text." + echo " -m MODULE A subdirectory of the elftoolchain tree to be" + echo "imported, e.g. 'libelf', 'common', 'libdwarf', etc." + echo " -s SRCDIR The 'trunk' directory of an elftoolchain checkout." + echo " -vBe verbose." +} + +err() { + echo ERROR: "$@" 1>&2 + echo + usage + exit 1 +} + +## Parse options. +diff_only=NO +verbose=NO +options=":d:hs:m:vD" +while getopts "$options" var; do + case $var in + d) dstdir="$OPTARG";; + h) usage; exit 0;; + m) modules="$OPTARG $modules";; + s) srcdir="$OPTARG";; + v) verbose=YES;; + D) diff_only=YES;; + '?') err "Unknown option: '-$OPTARG'.";; + ':') err "Option '-$OPTARG' expects an argument.";; + esac + shift $((OPTIND - 1)) +done + +[ -n "${srcdir}" ] || err "Option -s must be specified." +[ -n "${modules}" ] || err "Option -m must be specified at least once." + +if [ -z "${dstdir}" ]; then + dstdir="./dist" +fi + +[ -d ${srcdir} ] || err "Missing source directory '$srcdir'." +[ -d ${dstdir} ] || err "Missing destination directory '$dstdir'." + +# Verify that the source modules exist. +for m in ${modules}; do + [ -d ${srcdir}/${m} ] || err "Missing source module '${srcdir}/${m}'" +done + +## Helpers. +rename_svn_id() { + sed -e '/\$Id:/ { +s/\$Id:/Id:/; +s/[ ]*\$// + }' +} + +handle_block_comment() { + sed -e '/^\/\*-/ { i\ +/* \$NetBSD\$ */\ + +}' +} + +transform_placeholders() { + sed -e \ +'/@ELFTC-DECLARE-DOWNSTREAM-VCSID@/ { +c \ +#if !defined(__RCSID)\ +#define __RCSID(ID) /**/\ +#endif /* !defined(__RCSID) */ +}' -e \ +'/@ELFTC-DEFINE-ELFTC-VCSID@/ { +c \ +#ifndef ELFTC_VCSID\ +#define ELFTC_VCSID(ID) /**/\ +#endif +}' -e \ +'/@ELFTC-USE-DOWNSTREAM-VCSID@/ { +c \ +__RCSID("$NetBSD: netbsd-base-system-import.sh,v 1.1 2022/05/04 11:07:43 jkoshy Exp $"); +}' -e \ +'/@ELFTC-INCLUDE-SYS-CDEFS@/ { +c \ +#include +}' +} + +# compare_and_move_or_diff filename generated_temp_file +compare_and_move_or_diff() { + local dstfile=${dstdir}/${1} + + egrep -v '\$NetBSD.*\$' ${2} > ${srccmptmp} + egrep -v '\$NetBSD.*\$' ${dstfile} > ${dstcmptmp} 2> /dev/null + + if cmp -s ${srccmptmp} ${dstcmptmp}; then +return 0 + fi + + if [ "${diff_only}" = YES ]; then +# Show the changes needed to update the destination. +if [ -f ${dstfile} ]; then + diff -u ${dstfile} ${2} +else + echo '--- new file' ${file} + diff -u /dev/null ${2} +fi + else +mv ${2} ${dstfile} || exit ${?} +changed_file="${1}" + fi +} + +# Manual pages need a CVS ID, and renaming of their SVN IDs. +handle_manual_page() { + echo '.\" $NetBSD: netbsd-base-system-import.sh,v 1.1 2022/05/04 11:07:43 jkoshy Exp $' > ${srctmp} + echo '.\"' >> ${srctmp} + rename_svn_id < ${srcdir}/${1} >> ${srctmp} + + compare_and_move_or_diff ${1} ${srctmp} +} + +# M4 files need a NetBSD RCS Id prepended, and any embedded +# VCS IDs transformed. +handle_m4_file() { + echo 'dnl $NetBSD: netbsd-base-system-import.sh,v 1.1 2022/05/04 11:07:43 jkoshy Exp $' > ${srctmp} + transform_placeholders < ${srcdir}/${1} | \ +rename_svn_id >> ${srctmp} + + compare_and_move_or_diff ${1} ${srctmp} +} + +# Regular files only need their SVN IDs renamed. +handle_regular_file() { + rename_svn_id < ${srcdir}/${1} > ${srctmp} + + compare_and_move_or_diff ${1} ${srctmp} +} + +# C sources need a NetBSD RCS Id prepended, the +# ELFTC macros and SVN ids transformed. +handle_c_source() { + handle_block_comment < ${srcdir}/${1} | \ +
CVS commit: src/external/bsd/elftoolchain/dist/tools
Module Name:src Committed By: jkoshy Date: Wed May 4 11:07:43 UTC 2022 Added Files: src/external/bsd/elftoolchain/dist/tools: netbsd-base-system-import.sh Log Message: Add a script from upstream that assists with importing upstream Elftoolchain sources. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/bsd/elftoolchain/dist/tools/netbsd-base-system-import.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/common
Module Name:src Committed By: jkoshy Date: Tue May 3 16:47:15 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common: _elftc.h Log Message: Catch up with Elftoolchain head: changes to support 'tools' builds out of the box. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/elftoolchain/dist/common/_elftc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/_elftc.h diff -u src/external/bsd/elftoolchain/dist/common/_elftc.h:1.8 src/external/bsd/elftoolchain/dist/common/_elftc.h:1.9 --- src/external/bsd/elftoolchain/dist/common/_elftc.h:1.8 Wed Mar 10 21:36:29 2021 +++ src/external/bsd/elftoolchain/dist/common/_elftc.h Tue May 3 16:47:15 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: _elftc.h,v 1.8 2021/03/10 21:36:29 jkoshy Exp $ */ +/* $NetBSD: _elftc.h,v 1.9 2022/05/03 16:47:15 jkoshy Exp $ */ /*- * Copyright (c) 2009 Joseph Koshy @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: _elftc.h 3933 2021-03-10 21:09:49Z jkoshy + * Id: _elftc.h 3975 2022-04-30 20:10:58Z jkoshy */ /** @@ -285,11 +285,11 @@ struct name { \ /* * VCS Ids. * - * The marker below is intended to be replaced with a project-specific + * The place holder below is intended to be replaced with a project-specific * definition of the ELFTC_VCSID macro. */ -#ifndef ELFTC_VCSID +#ifndef ELFTC_VCSID #define ELFTC_VCSID(ID) /**/ #endif @@ -317,6 +317,20 @@ struct name { \ #endif /* ELFTC_VCSID */ /* + * The place holder below is meant to be replaced by a declaration + * of the downstream project's revision control macro. + * + * E.g. on NetBSD, this place holder would be replaced by: + * + * #if !defined(__RCSID) + * #define __RCSID(ID) + * #endif + */ +#if !defined(__RCSID) +#define __RCSID(ID) /**/ +#endif /* !defined(__RCSID) */ + +/* * Provide an equivalent for getprogname(3). */
CVS commit: src/external/bsd/elftoolchain/dist/common
Module Name:src Committed By: jkoshy Date: Tue May 3 16:47:15 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common: _elftc.h Log Message: Catch up with Elftoolchain head: changes to support 'tools' builds out of the box. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/elftoolchain/dist/common/_elftc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: jkoshy Date: Tue May 3 12:09:19 UTC 2022 Modified Files: src/external/cddl/osnet/sys/sys: README Log Message: Minor: fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/README diff -u src/external/cddl/osnet/sys/sys/README:1.1 src/external/cddl/osnet/sys/sys/README:1.2 --- src/external/cddl/osnet/sys/sys/README:1.1 Sun Jun 3 20:59:49 2018 +++ src/external/cddl/osnet/sys/sys/README Tue May 3 12:09:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: README,v 1.1 2018/06/03 20:59:49 christos Exp $ +# $NetBSD: README,v 1.2 2022/05/03 12:09:19 jkoshy Exp $ General guidelines for system wrapper header maintainance. @@ -26,7 +26,7 @@ solaris/foo.h: #endif /* SOLARIS_SYS_FOO_H */ -Now there caaes where the solaris headers expose more stuff than ours, +Now there cases where the solaris headers expose more stuff than ours, so we need to include more of our system headers from theirs. When that happens the rule should be that:
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: jkoshy Date: Tue May 3 12:09:19 UTC 2022 Modified Files: src/external/cddl/osnet/sys/sys: README Log Message: Minor: fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/libctf
Module Name:src Committed By: jkoshy Date: Tue May 3 10:50:42 UTC 2022 Modified Files: src/tools/libctf: Makefile Log Message: Prepare the ground for to be used by the 'tools' build of 'libctf'. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tools/libctf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/libctf/Makefile diff -u src/tools/libctf/Makefile:1.8 src/tools/libctf/Makefile:1.9 --- src/tools/libctf/Makefile:1.8 Tue May 1 19:59:47 2018 +++ src/tools/libctf/Makefile Tue May 3 10:50:42 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:47 christos Exp $ +# $NetBSD: Makefile,v 1.9 2022/05/03 10:50:42 jkoshy Exp $ HOSTLIB= ctf @@ -34,7 +34,8 @@ CPPFLAGS+= -I${.CURDIR}/../compat \ -I${OPENSOLARIS_DISTDIR}/common/ctf \ -I${OPENSOLARIS_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_DISTDIR}/uts/common \ - -I${LIBELF_DIR} + -I${LIBELF_DIR} \ + -I${TOOLDIR}/include BUILD_OSTYPE!= uname -s
CVS commit: src/tools/libctf
Module Name:src Committed By: jkoshy Date: Tue May 3 10:50:42 UTC 2022 Modified Files: src/tools/libctf: Makefile Log Message: Prepare the ground for to be used by the 'tools' build of 'libctf'. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tools/libctf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Mon May 2 20:27:43 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 elfdefinitions.m4 Log Message: Catch up with Elftoolchain upstream . To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.3 src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.4 --- src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.3 Mon May 2 09:43:23 2022 +++ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Mon May 2 20:27:43 2022 @@ -1,4 +1,4 @@ -dnl $NetBSD: elfconstants.m4,v 1.3 2022/05/02 09:43:23 jkoshy Exp $ +dnl $NetBSD: elfconstants.m4,v 1.4 2022/05/02 20:27:43 jkoshy Exp $ # Copyright (c) 2010,2021 Joseph Koshy # All rights reserved. @@ -33,7 +33,7 @@ dnl $NetBSD: elfconstants.m4,v 1.3 2022/ # - The "Linkers and Libraries Guide", from Sun Microsystems. define(`VCSID_ELFCONSTANTS_M4', - `Id: elfconstants.m4 3946 2021-04-10 21:10:42Z jkoshy') + `Id: elfconstants.m4 3980 2022-05-02 19:50:00Z jkoshy') # In the following definitions, `_' is an M4 macro that is meant to be # expanded later. Its intended usage is: @@ -594,6 +594,12 @@ _(ELFMAG2, 0x4CU) _(ELFMAG3, 0x46U) ') +# Additional ELFMAG related constants. +define(`DEFINE_ELF_MAGIC_ADDITIONAL_CONSTANTS',` +_(ELFMAG, "\177ELF") +_(SELFMAG, 4) +') + # # ELF OS ABI field. # @@ -1500,6 +1506,12 @@ _(STT_HIPROC, 15, `end of processor-specific types') ') +# Additional symbol type related constants. +define(`DEFINE_SYMBOL_TYPES_ADDITIONAL_CONSTANTS',` +_(STT_NUM, 7, + `the number of symbol types') +') + # # Symbol binding. # Index: src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.3 src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.4 --- src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.3 Mon May 2 09:43:23 2022 +++ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Mon May 2 20:27:43 2022 @@ -1,4 +1,4 @@ -dnl $NetBSD: elfdefinitions.m4,v 1.3 2022/05/02 09:43:23 jkoshy Exp $ +dnl $NetBSD: elfdefinitions.m4,v 1.4 2022/05/02 20:27:43 jkoshy Exp $ /*- * Copyright (c) 2010,2021 Joseph Koshy * All rights reserved. @@ -26,7 +26,7 @@ dnl $NetBSD: elfdefinitions.m4,v 1.3 202 */ divert(-1) define(`VCSID_ELFDEFINITIONS_M4', - `Id: elfdefinitions.m4 3947 2021-04-10 21:15:17Z jkoshy') + `Id: elfdefinitions.m4 3980 2022-05-02 19:50:00Z jkoshy') include(`elfconstants.m4')dnl define(`_',`ifelse(eval(len($1) <= 7),1, @@ -101,6 +101,8 @@ DEFINE_ELF_DATA_ENDIANNESSES() * These numbers are: 0x7F, 'E', 'L' and 'F'. */ DEFINE_ELF_MAGIC_VALUES() +/* Additional magic-related constants. */ +DEFINE_ELF_MAGIC_ADDITIONAL_CONSTANTS() /* * ELF OS ABI field. @@ -175,6 +177,8 @@ DEFINE_SYMBOL_BINDINGS() * Symbol types */ DEFINE_SYMBOL_TYPES() +/* Additional constants related to symbol types. */ +DEFINE_SYMBOL_TYPES_ADDITIONAL_CONSTANTS() /* * Symbol binding.
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Mon May 2 20:27:43 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 elfdefinitions.m4 Log Message: Catch up with Elftoolchain upstream . To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: jkoshy Date: Mon May 2 20:09:48 UTC 2022 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_link.c Log Message: Follow FreeBSD revision <0e15d9fbeba4> and simplify #ifdef'ed code. This change avoids redefining 'SHN_SUNW_IGNORE' if the symbol is already present. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: jkoshy Date: Mon May 2 20:09:48 UTC 2022 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_link.c Log Message: Follow FreeBSD revision <0e15d9fbeba4> and simplify #ifdef'ed code. This change avoids redefining 'SHN_SUNW_IGNORE' if the symbol is already present. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.12 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.13 --- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.12 Tue Dec 3 22:10:56 2019 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c Mon May 2 20:09:48 2022 @@ -1678,11 +1678,8 @@ process_obj(dtrace_hdl_t *dtp, const cha * already been processed by an earlier link * invocation. */ -#ifndef illumos -#define SHN_SUNW_IGNORE SHN_ABS -#endif - if (rsym.st_shndx != SHN_SUNW_IGNORE) { -rsym.st_shndx = SHN_SUNW_IGNORE; + if (rsym.st_shndx != SHN_ABS) { +rsym.st_shndx = SHN_ABS; (void) gelf_update_sym(data_sym, ndx, ); } }
CVS commit: src/tools/elftoolchain/common
Module Name:src Committed By: jkoshy Date: Mon May 2 18:28:38 UTC 2022 Modified Files: src/tools/elftoolchain/common: Makefile Log Message: Bug fix: use the correct target path in a dependency. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/elftoolchain/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/elftoolchain/common
Module Name:src Committed By: jkoshy Date: Mon May 2 18:28:38 UTC 2022 Modified Files: src/tools/elftoolchain/common: Makefile Log Message: Bug fix: use the correct target path in a dependency. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/elftoolchain/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/elftoolchain/common/Makefile diff -u src/tools/elftoolchain/common/Makefile:1.1 src/tools/elftoolchain/common/Makefile:1.2 --- src/tools/elftoolchain/common/Makefile:1.1 Wed Apr 13 17:54:05 2022 +++ src/tools/elftoolchain/common/Makefile Mon May 2 18:28:38 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/04/13 17:54:05 jkoshy Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/02 18:28:38 jkoshy Exp $ .include @@ -23,7 +23,7 @@ ${HOST_INCSDIR}/${_f}: ${_f} install: .PHONY includes -includes: .PHONY ${HOST_INCSDIR} .WAIT ${INCS} +includes: .PHONY ${HOST_INCSDIR} .WAIT ${HOST_INCINSTFILES} all depend clean clobber:
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Mon May 2 09:43:23 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 elfdefinitions.m4 Log Message: Add NetBSD version control markers. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.2 src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.3 --- src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4:1.2 Thu Apr 29 17:40:42 2021 +++ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 Mon May 2 09:43:23 2022 @@ -1,3 +1,4 @@ +dnl $NetBSD: elfconstants.m4,v 1.3 2022/05/02 09:43:23 jkoshy Exp $ # Copyright (c) 2010,2021 Joseph Koshy # All rights reserved. Index: src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 diff -u src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.2 src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.3 --- src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4:1.2 Thu Apr 29 17:40:42 2021 +++ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Mon May 2 09:43:23 2022 @@ -1,3 +1,4 @@ +dnl $NetBSD: elfdefinitions.m4,v 1.3 2022/05/02 09:43:23 jkoshy Exp $ /*- * Copyright (c) 2010,2021 Joseph Koshy * All rights reserved.
CVS commit: src/external/bsd/elftoolchain/dist/common/sys
Module Name:src Committed By: jkoshy Date: Mon May 2 09:43:23 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/common/sys: elfconstants.m4 elfdefinitions.m4 Log Message: Add NetBSD version control markers. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 \ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/libelf
/elftoolchain/dist/libelf/elf.c:1.4 --- src/external/bsd/elftoolchain/dist/libelf/elf.c:1.3 Sat Feb 20 02:43:42 2016 +++ src/external/bsd/elftoolchain/dist/libelf/elf.c Sun May 1 19:41:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: elf.c,v 1.3 2016/02/20 02:43:42 christos Exp $ */ +/* $NetBSD: elf.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $ */ /*- * Copyright (c) 2006,2008,2011 Joseph Koshy @@ -30,8 +30,8 @@ #include "_libelf.h" -__RCSID("$NetBSD: elf.c,v 1.3 2016/02/20 02:43:42 christos Exp $"); -ELFTC_VCSID("Id: elf.c 2225 2011-11-26 18:55:54Z jkoshy "); +__RCSID("$NetBSD: elf.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $"); +ELFTC_VCSID("Id: elf.c 2225 2011-11-26 18:55:54Z jkoshy"); struct _libelf_globals _libelf = { .libelf_error = 0, Index: src/external/bsd/elftoolchain/dist/libelf/elf_begin.c diff -u src/external/bsd/elftoolchain/dist/libelf/elf_begin.c:1.3 src/external/bsd/elftoolchain/dist/libelf/elf_begin.c:1.4 --- src/external/bsd/elftoolchain/dist/libelf/elf_begin.c:1.3 Sat Feb 20 02:43:42 2016 +++ src/external/bsd/elftoolchain/dist/libelf/elf_begin.c Sun May 1 19:41:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: elf_begin.c,v 1.3 2016/02/20 02:43:42 christos Exp $ */ +/* $NetBSD: elf_begin.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $ */ /*- * Copyright (c) 2006,2008-2011 Joseph Koshy @@ -30,8 +30,8 @@ #include "_libelf.h" -__RCSID("$NetBSD: elf_begin.c,v 1.3 2016/02/20 02:43:42 christos Exp $"); -ELFTC_VCSID("Id: elf_begin.c 2364 2011-12-28 17:55:25Z jkoshy "); +__RCSID("$NetBSD: elf_begin.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $"); +ELFTC_VCSID("Id: elf_begin.c 2364 2011-12-28 17:55:25Z jkoshy"); Elf * elf_begin(int fd, Elf_Cmd c, Elf *a) Index: src/external/bsd/elftoolchain/dist/libelf/elf_cntl.c diff -u src/external/bsd/elftoolchain/dist/libelf/elf_cntl.c:1.3 src/external/bsd/elftoolchain/dist/libelf/elf_cntl.c:1.4 --- src/external/bsd/elftoolchain/dist/libelf/elf_cntl.c:1.3 Sat Feb 20 02:43:42 2016 +++ src/external/bsd/elftoolchain/dist/libelf/elf_cntl.c Sun May 1 19:41:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: elf_cntl.c,v 1.3 2016/02/20 02:43:42 christos Exp $ */ +/* $NetBSD: elf_cntl.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $ */ /*- * Copyright (c) 2006,2008 Joseph Koshy @@ -30,8 +30,8 @@ #include "_libelf.h" -__RCSID("$NetBSD: elf_cntl.c,v 1.3 2016/02/20 02:43:42 christos Exp $"); -ELFTC_VCSID("Id: elf_cntl.c 2225 2011-11-26 18:55:54Z jkoshy "); +__RCSID("$NetBSD: elf_cntl.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $"); +ELFTC_VCSID("Id: elf_cntl.c 2225 2011-11-26 18:55:54Z jkoshy"); int elf_cntl(Elf *e, Elf_Cmd c) Index: src/external/bsd/elftoolchain/dist/libelf/elf_data.c diff -u src/external/bsd/elftoolchain/dist/libelf/elf_data.c:1.3 src/external/bsd/elftoolchain/dist/libelf/elf_data.c:1.4 --- src/external/bsd/elftoolchain/dist/libelf/elf_data.c:1.3 Sat Feb 20 02:43:42 2016 +++ src/external/bsd/elftoolchain/dist/libelf/elf_data.c Sun May 1 19:41:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: elf_data.c,v 1.3 2016/02/20 02:43:42 christos Exp $ */ +/* $NetBSD: elf_data.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $ */ /*- * Copyright (c) 2006,2008,2011 Joseph Koshy @@ -38,8 +38,8 @@ #include "_libelf.h" -__RCSID("$NetBSD: elf_data.c,v 1.3 2016/02/20 02:43:42 christos Exp $"); -ELFTC_VCSID("Id: elf_data.c 3258 2015-11-20 18:59:43Z emaste "); +__RCSID("$NetBSD: elf_data.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $"); +ELFTC_VCSID("Id: elf_data.c 3258 2015-11-20 18:59:43Z emaste"); Elf_Data * elf_getdata(Elf_Scn *s, Elf_Data *ed) Index: src/external/bsd/elftoolchain/dist/libelf/elf_end.c diff -u src/external/bsd/elftoolchain/dist/libelf/elf_end.c:1.3 src/external/bsd/elftoolchain/dist/libelf/elf_end.c:1.4 --- src/external/bsd/elftoolchain/dist/libelf/elf_end.c:1.3 Sat Feb 20 02:43:42 2016 +++ src/external/bsd/elftoolchain/dist/libelf/elf_end.c Sun May 1 19:41:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: elf_end.c,v 1.3 2016/02/20 02:43:42 christos Exp $ */ +/* $NetBSD: elf_end.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $ */ /*- * Copyright (c) 2006,2008-2009,2011 Joseph Koshy @@ -42,8 +42,8 @@ #include #endif -__RCSID("$NetBSD: elf_end.c,v 1.3 2016/02/20 02:43:42 christos Exp $"); -ELFTC_VCSID("Id: elf_end.c 3174 2015-03-27 17:13:41Z emaste "); +__RCSID("$NetBSD: elf_end.c,v 1.4 2022/05/01 19:41:35 jkoshy Exp $"); +ELFTC_VCSID("Id: elf_end.c 3174 2015-03-27 17:13:41Z emaste"); int elf_end(Elf *e) Index: src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.c diff -u src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.c:1.3 src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.c:1.4 --- src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.c:1.3 Sat Feb 20 02:43:42 2016 +++ src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.c Sun May 1 19:41:35 2022 @@ -1,4
CVS commit: src/external/bsd/elftoolchain/dist/libelf
Module Name:src Committed By: jkoshy Date: Sun May 1 19:41:35 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/libelf: elf.c elf_begin.c elf_cntl.c elf_data.c elf_end.c elf_errmsg.c elf_errno.c elf_fill.c elf_flag.c elf_getarhdr.c elf_getarsym.c elf_getbase.c elf_getident.c elf_hash.c elf_kind.c elf_memory.c elf_next.c elf_phnum.c elf_rand.c elf_rawfile.c elf_scn.c elf_shnum.c elf_shstrndx.c elf_strptr.c elf_update.c elf_version.c gelf_cap.c gelf_checksum.c gelf_dyn.c gelf_ehdr.c gelf_fsize.c gelf_getclass.c gelf_move.c gelf_phdr.c gelf_rel.c gelf_rela.c gelf_shdr.c gelf_sym.c gelf_syminfo.c gelf_symshndx.c gelf_xlate.c libelf_align.c libelf_allocate.c libelf_ar.c libelf_ar_util.c libelf_checksum.c libelf_convert.m4 libelf_data.c libelf_ehdr.c libelf_extended.c libelf_fsize.m4 libelf_memory.c libelf_msize.m4 libelf_open.c libelf_phdr.c libelf_shdr.c libelf_xlate.c Log Message: Remove trailing whitespace from upstream revision strings. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/elftoolchain/dist/libelf/elf.c \ src/external/bsd/elftoolchain/dist/libelf/elf_begin.c \ src/external/bsd/elftoolchain/dist/libelf/elf_cntl.c \ src/external/bsd/elftoolchain/dist/libelf/elf_data.c \ src/external/bsd/elftoolchain/dist/libelf/elf_end.c \ src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.c \ src/external/bsd/elftoolchain/dist/libelf/elf_errno.c \ src/external/bsd/elftoolchain/dist/libelf/elf_fill.c \ src/external/bsd/elftoolchain/dist/libelf/elf_flag.c \ src/external/bsd/elftoolchain/dist/libelf/elf_getarhdr.c \ src/external/bsd/elftoolchain/dist/libelf/elf_getarsym.c \ src/external/bsd/elftoolchain/dist/libelf/elf_getbase.c \ src/external/bsd/elftoolchain/dist/libelf/elf_getident.c \ src/external/bsd/elftoolchain/dist/libelf/elf_hash.c \ src/external/bsd/elftoolchain/dist/libelf/elf_kind.c \ src/external/bsd/elftoolchain/dist/libelf/elf_memory.c \ src/external/bsd/elftoolchain/dist/libelf/elf_next.c \ src/external/bsd/elftoolchain/dist/libelf/elf_phnum.c \ src/external/bsd/elftoolchain/dist/libelf/elf_rand.c \ src/external/bsd/elftoolchain/dist/libelf/elf_rawfile.c \ src/external/bsd/elftoolchain/dist/libelf/elf_scn.c \ src/external/bsd/elftoolchain/dist/libelf/elf_shnum.c \ src/external/bsd/elftoolchain/dist/libelf/elf_shstrndx.c \ src/external/bsd/elftoolchain/dist/libelf/elf_strptr.c \ src/external/bsd/elftoolchain/dist/libelf/elf_update.c \ src/external/bsd/elftoolchain/dist/libelf/elf_version.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_cap.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_checksum.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_dyn.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_ehdr.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_fsize.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_getclass.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_move.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_phdr.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_rel.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_rela.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_shdr.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_sym.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_syminfo.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_symshndx.c \ src/external/bsd/elftoolchain/dist/libelf/gelf_xlate.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_allocate.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_ar.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_ar_util.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_checksum.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_convert.m4 \ src/external/bsd/elftoolchain/dist/libelf/libelf_data.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_ehdr.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_extended.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_fsize.m4 \ src/external/bsd/elftoolchain/dist/libelf/libelf_memory.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_msize.m4 \ src/external/bsd/elftoolchain/dist/libelf/libelf_open.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_phdr.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_shdr.c \ src/external/bsd/elftoolchain/dist/libelf/libelf_xlate.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/libelf/libelf_align.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/elftoolchain/libdwarf
Module Name:src Committed By: jkoshy Date: Sun May 1 17:25:19 UTC 2022 Modified Files: src/tools/elftoolchain/libdwarf: Makefile Log Message: Make the generated file visible when compiling libdwarf. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/elftoolchain/libdwarf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/elftoolchain/libdwarf/Makefile diff -u src/tools/elftoolchain/libdwarf/Makefile:1.1 src/tools/elftoolchain/libdwarf/Makefile:1.2 --- src/tools/elftoolchain/libdwarf/Makefile:1.1 Mon Apr 18 14:11:43 2022 +++ src/tools/elftoolchain/libdwarf/Makefile Sun May 1 17:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/04/18 14:11:43 jkoshy Exp $ +# $NetBSD: Makefile,v 1.2 2022/05/01 17:25:19 jkoshy Exp $ HOSTLIB=dwarf @@ -71,8 +71,11 @@ COMPATLIB_NO_LIB= yes # only the include .-include "${TOOLDIR}/share/compat/defs.mk" .endif +LIBDWARF_OBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR} + CPPFLAGS+= -I${.CURDIR}/../../compat CPPFLAGS+= -I${.CURDIR}/../../common +CPPFLAGS+= -I${LIBDWARF_OBJDIR}/../common CPPFLAGS+= -I${LIBDWARF_DIR} -I${LIBELF_DIR} -I${COMMON_DIR} CPPFLAGS+= -I${TOOLDIR}/include -I${TOOLDIR}/include/nbinclude
CVS commit: src/tools/elftoolchain/libdwarf
Module Name:src Committed By: jkoshy Date: Sun May 1 17:25:19 UTC 2022 Modified Files: src/tools/elftoolchain/libdwarf: Makefile Log Message: Make the generated file visible when compiling libdwarf. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/elftoolchain/libdwarf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/libdwarf
Id: dwarf_pro_weaks.m4 2074 2011-10-27 03:34:33Z jkoshy"); /* WARNING: GENERATED FROM __file__. */ Index: src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubnames.m4 diff -u src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubnames.m4:1.3 src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubnames.m4:1.4 --- src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubnames.m4:1.3 Sat Feb 20 02:43:41 2016 +++ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubnames.m4 Sun May 1 17:20:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwarf_pubnames.m4,v 1.3 2016/02/20 02:43:41 christos Exp $ */ +/* $NetBSD: dwarf_pubnames.m4,v 1.4 2022/05/01 17:20:47 jkoshy Exp $ */ /*- * Copyright (c) 2009 Kai Wang @@ -28,8 +28,8 @@ #include "_libdwarf.h" -__RCSID("$NetBSD: dwarf_pubnames.m4,v 1.3 2016/02/20 02:43:41 christos Exp $"); -ELFTC_VCSID("Id: dwarf_pubnames.m4 2074 2011-10-27 03:34:33Z jkoshy "); +__RCSID("$NetBSD: dwarf_pubnames.m4,v 1.4 2022/05/01 17:20:47 jkoshy Exp $"); +ELFTC_VCSID("Id: dwarf_pubnames.m4 2074 2011-10-27 03:34:33Z jkoshy"); /* WARNING: GENERATED FROM __file__. */ Index: src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubtypes.m4 diff -u src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubtypes.m4:1.3 src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubtypes.m4:1.4 --- src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubtypes.m4:1.3 Sat Feb 20 02:43:41 2016 +++ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubtypes.m4 Sun May 1 17:20:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwarf_pubtypes.m4,v 1.3 2016/02/20 02:43:41 christos Exp $ */ +/* $NetBSD: dwarf_pubtypes.m4,v 1.4 2022/05/01 17:20:47 jkoshy Exp $ */ /*- * Copyright (c) 2009 Kai Wang @@ -28,8 +28,8 @@ #include "_libdwarf.h" -__RCSID("$NetBSD: dwarf_pubtypes.m4,v 1.3 2016/02/20 02:43:41 christos Exp $"); -ELFTC_VCSID("Id: dwarf_pubtypes.m4 2074 2011-10-27 03:34:33Z jkoshy "); +__RCSID("$NetBSD: dwarf_pubtypes.m4,v 1.4 2022/05/01 17:20:47 jkoshy Exp $"); +ELFTC_VCSID("Id: dwarf_pubtypes.m4 2074 2011-10-27 03:34:33Z jkoshy"); /* WARNING: GENERATED FROM __file__. */ Index: src/external/bsd/elftoolchain/dist/libdwarf/dwarf_ranges.c diff -u src/external/bsd/elftoolchain/dist/libdwarf/dwarf_ranges.c:1.3 src/external/bsd/elftoolchain/dist/libdwarf/dwarf_ranges.c:1.4 --- src/external/bsd/elftoolchain/dist/libdwarf/dwarf_ranges.c:1.3 Sat Feb 20 02:43:41 2016 +++ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_ranges.c Sun May 1 17:20:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwarf_ranges.c,v 1.3 2016/02/20 02:43:41 christos Exp $ */ +/* $NetBSD: dwarf_ranges.c,v 1.4 2022/05/01 17:20:47 jkoshy Exp $ */ /*- * Copyright (c) 2009,2011 Kai Wang @@ -28,8 +28,8 @@ #include "_libdwarf.h" -__RCSID("$NetBSD: dwarf_ranges.c,v 1.3 2016/02/20 02:43:41 christos Exp $"); -ELFTC_VCSID("Id: dwarf_ranges.c 3029 2014-04-21 23:26:02Z kaiwang27 "); +__RCSID("$NetBSD: dwarf_ranges.c,v 1.4 2022/05/01 17:20:47 jkoshy Exp $"); +ELFTC_VCSID("Id: dwarf_ranges.c 3029 2014-04-21 23:26:02Z kaiwang27"); static int _dwarf_get_ranges(Dwarf_Debug dbg, Dwarf_CU cu, Dwarf_Off off, Index: src/external/bsd/elftoolchain/dist/libdwarf/dwarf_reloc.c diff -u src/external/bsd/elftoolchain/dist/libdwarf/dwarf_reloc.c:1.3 src/external/bsd/elftoolchain/dist/libdwarf/dwarf_reloc.c:1.4 --- src/external/bsd/elftoolchain/dist/libdwarf/dwarf_reloc.c:1.3 Sat Feb 20 02:43:41 2016 +++ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_reloc.c Sun May 1 17:20:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwarf_reloc.c,v 1.3 2016/02/20 02:43:41 christos Exp $ */ +/* $NetBSD: dwarf_reloc.c,v 1.4 2022/05/01 17:20:47 jkoshy Exp $ */ /*- * Copyright (c) 2010 Kai Wang @@ -28,8 +28,8 @@ #include "_libdwarf.h" -__RCSID("$NetBSD: dwarf_reloc.c,v 1.3 2016/02/20 02:43:41 christos Exp $"); -ELFTC_VCSID("Id: dwarf_reloc.c 3161 2015-02-15 21:43:36Z emaste "); +__RCSID("$NetBSD: dwarf_reloc.c,v 1.4 2022/05/01 17:20:47 jkoshy Exp $"); +ELFTC_VCSID("Id: dwarf_reloc.c 3161 2015-02-15 21:43:36Z emaste"); int dwarf_set_reloc_application(int apply) Index: src/external/bsd/elftoolchain/dist/libdwarf/dwarf_seterror.c diff -u src/external/bsd/elftoolchain/dist/libdwarf/dwarf_seterror.c:1.3 src/external/bsd/elftoolchain/dist/libdwarf/dwarf_seterror.c:1.4 --- src/external/bsd/elftoolchain/dist/libdwarf/dwarf_seterror.c:1.3 Sat Feb 20 02:43:41 2016 +++ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_seterror.c Sun May 1 17:20:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dwarf_seterror.c,v 1.3 2016/02/20 02:43:41 christos Exp $ */ +/* $NetBSD: dwarf_seterror.c,v 1.4 2022/05/01 17:20:47 jkoshy Exp $ */ /*- * Copyright (c) 2010 Joseph Koshy @@ -28,8 +28,8 @@ #include "_libdwarf.h" -__RCSID("$NetBSD: dwarf_seterror.c,v 1.3 2016/02/20 02:43:41 christos Exp $");
CVS commit: src/external/bsd/elftoolchain/dist/libdwarf
Module Name:src Committed By: jkoshy Date: Sun May 1 17:20:47 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/libdwarf: dwarf_abbrev.c dwarf_arange.c dwarf_attr.c dwarf_attrval.c dwarf_cu.c dwarf_dealloc.c dwarf_die.c dwarf_dump.c dwarf_errmsg.c dwarf_finish.c dwarf_form.c dwarf_frame.c dwarf_funcs.m4 dwarf_init.c dwarf_lineno.c dwarf_loclist.c dwarf_macinfo.c dwarf_pro_arange.c dwarf_pro_attr.c dwarf_pro_die.c dwarf_pro_expr.c dwarf_pro_finish.c dwarf_pro_frame.c dwarf_pro_funcs.m4 dwarf_pro_init.c dwarf_pro_lineno.c dwarf_pro_macinfo.c dwarf_pro_pubnames.m4 dwarf_pro_reloc.c dwarf_pro_sections.c dwarf_pro_types.m4 dwarf_pro_vars.m4 dwarf_pro_weaks.m4 dwarf_pubnames.m4 dwarf_pubtypes.m4 dwarf_ranges.c dwarf_reloc.c dwarf_sections.c dwarf_seterror.c dwarf_str.c dwarf_types.m4 dwarf_vars.m4 dwarf_weaks.m4 libdwarf.c libdwarf_abbrev.c libdwarf_arange.c libdwarf_attr.c libdwarf_die.c libdwarf_elf_access.c libdwarf_elf_init.c libdwarf_error.c libdwarf_frame.c libdwarf_info.c libdwarf_init.c libdwarf_lineno.c libdwarf_loc.c libdwarf_loclist.c libdwarf_macinfo.c libdwarf_nametbl.c libdwarf_ranges.c libdwarf_reloc.c libdwarf_rw.c libdwarf_sections.c libdwarf_str.c Log Message: Remove trailing whitespace from upstream revision strings to reduce diffs against upstream. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_abbrev.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_arange.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_attr.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_cu.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_dealloc.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_die.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_dump.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_errmsg.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_finish.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_form.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_frame.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_funcs.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_init.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_lineno.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_loclist.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_macinfo.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_arange.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_attr.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_die.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_expr.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_finish.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_frame.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_funcs.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_init.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_lineno.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_macinfo.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_pubnames.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_reloc.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_sections.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_types.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_vars.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_weaks.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubnames.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_pubtypes.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_ranges.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_reloc.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_seterror.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_str.c \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_types.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_vars.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_weaks.m4 \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_abbrev.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_arange.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_attr.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_die.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_elf_access.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_error.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_frame.c \ src/external/bsd/elftoolchain/dist/libdwarf/libdwarf_info.c \
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Fri Apr 22 15:47:03 UTC 2022 Removed Files: src/tools/libdwarf: Makefile src/tools/libelf: Makefile libelf.inc Log Message: Remove the 'tools/lib{elf,dwarf}' directories. These have been moved to under 'tools/elftoolchain'. To generate a diff of this commit: cvs rdiff -u -r1.9 -r0 src/tools/libdwarf/Makefile cvs rdiff -u -r1.10 -r0 src/tools/libelf/Makefile cvs rdiff -u -r1.2 -r0 src/tools/libelf/libelf.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Fri Apr 22 15:47:03 UTC 2022 Removed Files: src/tools/libdwarf: Makefile src/tools/libelf: Makefile libelf.inc Log Message: Remove the 'tools/lib{elf,dwarf}' directories. These have been moved to under 'tools/elftoolchain'. To generate a diff of this commit: cvs rdiff -u -r1.9 -r0 src/tools/libdwarf/Makefile cvs rdiff -u -r1.10 -r0 src/tools/libelf/Makefile cvs rdiff -u -r1.2 -r0 src/tools/libelf/libelf.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Mon Apr 18 19:46:35 UTC 2022 Modified Files: src/tools: Makefile Log Message: Disconnect 'tools/lib{elf,dwarf}' from the build. These libraries are now built by 'tools/elftoolchain/lib{elf,dwarf}' respectively. To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/tools/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Mon Apr 18 19:46:35 UTC 2022 Modified Files: src/tools: Makefile Log Message: Disconnect 'tools/lib{elf,dwarf}' from the build. These libraries are now built by 'tools/elftoolchain/lib{elf,dwarf}' respectively. To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/tools/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/Makefile diff -u src/tools/Makefile:1.213 src/tools/Makefile:1.214 --- src/tools/Makefile:1.213 Wed Apr 13 17:52:56 2022 +++ src/tools/Makefile Mon Apr 18 19:46:35 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.213 2022/04/13 17:52:56 jkoshy Exp $ +# $NetBSD: Makefile,v 1.214 2022/04/18 19:46:35 jkoshy Exp $ .include .include @@ -59,8 +59,6 @@ TOOLCHAIN_BITS+= dbsym mdsetimage DTRACE_BITS= .if ${MKDTRACE} != "no" || ${MKCTF} != "no" DTRACE_BITS+= .WAIT elftoolchain -DTRACE_BITS+= .WAIT libelf -DTRACE_BITS+= .WAIT libdwarf DTRACE_BITS+= .WAIT libctf .endif .if ${MKCTF} != "no"
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Mon Apr 18 19:40:07 UTC 2022 Modified Files: src/tools/ctfconvert: Makefile src/tools/ctfmerge: Makefile Log Message: Update 'tools/ctf{merge,convert}' to use the new build locations for 'libelf' and 'libdwarf'. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tools/ctfconvert/Makefile cvs rdiff -u -r1.10 -r1.11 src/tools/ctfmerge/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/ctfconvert/Makefile diff -u src/tools/ctfconvert/Makefile:1.9 src/tools/ctfconvert/Makefile:1.10 --- src/tools/ctfconvert/Makefile:1.9 Tue May 1 19:59:46 2018 +++ src/tools/ctfconvert/Makefile Mon Apr 18 19:40:06 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:46 christos Exp $ +# $NetBSD: Makefile,v 1.10 2022/04/18 19:40:06 jkoshy Exp $ .include @@ -45,8 +45,8 @@ OSNETDIR= ${.CURDIR}/../../external/cddl OPENSOLARIS_DISTDIR= ${OSNETDIR}/dist CTFOBJ!= cd ${.CURDIR}/../libctf && ${PRINTOBJDIR} -DWARFOBJ!= cd ${.CURDIR}/../libdwarf && ${PRINTOBJDIR} -ELFOBJ!= cd ${.CURDIR}/../libelf && ${PRINTOBJDIR} +DWARFOBJ!= cd ${.CURDIR}/../elftoolchain/libdwarf && ${PRINTOBJDIR} +ELFOBJ!= cd ${.CURDIR}/../elftoolchain/libelf && ${PRINTOBJDIR} LDADD+= -L${CTFOBJ} -lctf DPADD+= ${CTFOBJ}/libctf.a LDADD+= -L${DWARFOBJ} -ldwarf Index: src/tools/ctfmerge/Makefile diff -u src/tools/ctfmerge/Makefile:1.10 src/tools/ctfmerge/Makefile:1.11 --- src/tools/ctfmerge/Makefile:1.10 Tue May 1 19:59:46 2018 +++ src/tools/ctfmerge/Makefile Mon Apr 18 19:40:06 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:46 christos Exp $ +# $NetBSD: Makefile,v 1.11 2022/04/18 19:40:06 jkoshy Exp $ .include @@ -25,8 +25,8 @@ OSNETDIR= ${.CURDIR}/../../external/cddl OPENSOLARIS_DISTDIR= ${OSNETDIR}/dist CTFOBJ!= cd ${.CURDIR}/../libctf && ${PRINTOBJDIR} -DWARFOBJ!= cd ${.CURDIR}/../libdwarf && ${PRINTOBJDIR} -ELFOBJ!= cd ${.CURDIR}/../libelf && ${PRINTOBJDIR} +DWARFOBJ!= cd ${.CURDIR}/../elftoolchain/libdwarf && ${PRINTOBJDIR} +ELFOBJ!= cd ${.CURDIR}/../elftoolchain/libelf && ${PRINTOBJDIR} LDADD+= -L${CTFOBJ} -lctf LDADD+= -L${DWARFOBJ} -ldwarf LDADD+= -L${ELFOBJ} -lelf
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Mon Apr 18 19:40:07 UTC 2022 Modified Files: src/tools/ctfconvert: Makefile src/tools/ctfmerge: Makefile Log Message: Update 'tools/ctf{merge,convert}' to use the new build locations for 'libelf' and 'libdwarf'. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tools/ctfconvert/Makefile cvs rdiff -u -r1.10 -r1.11 src/tools/ctfmerge/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/elftoolchain
Module Name:src Committed By: jkoshy Date: Mon Apr 18 14:11:44 UTC 2022 Modified Files: src/tools/elftoolchain: Makefile Added Files: src/tools/elftoolchain/libdwarf: Makefile src/tools/elftoolchain/libelf: Makefile Log Message: Build 'libelf' and 'libdwarf' under 'tools/elftoolchain', after 'tools/elftoolchain/common' has been built. This change aligns the 'tools' build with the regular build. Subsequent commits will change 'tools/libctf' and 'tools/cft{merge,convert}' to use the new build paths. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/elftoolchain/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/libdwarf/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/libelf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/elftoolchain/Makefile diff -u src/tools/elftoolchain/Makefile:1.1 src/tools/elftoolchain/Makefile:1.2 --- src/tools/elftoolchain/Makefile:1.1 Wed Apr 13 17:52:56 2022 +++ src/tools/elftoolchain/Makefile Mon Apr 18 14:11:43 2022 @@ -1,5 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2022/04/13 17:52:56 jkoshy Exp $ +# $NetBSD: Makefile,v 1.2 2022/04/18 14:11:43 jkoshy Exp $ SUBDIR= common +SUBDIR+= .WAIT libelf +SUBDIR+= .WAIT libdwarf .include Added files: Index: src/tools/elftoolchain/libdwarf/Makefile diff -u /dev/null src/tools/elftoolchain/libdwarf/Makefile:1.1 --- /dev/null Mon Apr 18 14:11:44 2022 +++ src/tools/elftoolchain/libdwarf/Makefile Mon Apr 18 14:11:43 2022 @@ -0,0 +1,96 @@ +# $NetBSD: Makefile,v 1.1 2022/04/18 14:11:43 jkoshy Exp $ + +HOSTLIB=dwarf + +.include + +SRCS= \ + dwarf_abbrev.c \ + dwarf_arange.c \ + dwarf_attr.c \ + dwarf_attrval.c \ + dwarf_cu.c \ + dwarf_dealloc.c \ + dwarf_die.c \ + dwarf_dump.c \ + dwarf_errmsg.c \ + dwarf_finish.c \ + dwarf_form.c \ + dwarf_frame.c \ + dwarf_init.c \ + dwarf_lineno.c \ + dwarf_loclist.c \ + dwarf_macinfo.c \ + dwarf_pro_arange.c \ + dwarf_pro_attr.c \ + dwarf_pro_die.c \ + dwarf_pro_expr.c \ + dwarf_pro_finish.c \ + dwarf_pro_frame.c \ + dwarf_pro_init.c \ + dwarf_pro_lineno.c \ + dwarf_pro_macinfo.c \ + dwarf_pro_reloc.c \ + dwarf_pro_sections.c \ + dwarf_ranges.c \ + dwarf_reloc.c \ + dwarf_seterror.c \ + dwarf_str.c \ + libdwarf.c \ + libdwarf_abbrev.c \ + libdwarf_arange.c \ + libdwarf_attr.c \ + libdwarf_die.c \ + libdwarf_elf_access.c \ + libdwarf_elf_init.c \ + libdwarf_error.c \ + libdwarf_frame.c \ + libdwarf_info.c \ + libdwarf_init.c \ + libdwarf_lineno.c \ + libdwarf_loc.c \ + libdwarf_loclist.c \ + libdwarf_macinfo.c \ + libdwarf_nametbl.c \ + libdwarf_ranges.c \ + libdwarf_reloc.c \ + libdwarf_rw.c \ + libdwarf_sections.c \ + libdwarf_str.c + +ELFTOOLCHAIN_DIR=${.CURDIR}/../../../external/bsd/elftoolchain/dist +LIBDWARF_DIR= ${ELFTOOLCHAIN_DIR}/libdwarf +LIBELF_DIR= ${ELFTOOLCHAIN_DIR}/libelf +COMMON_DIR= ${ELFTOOLCHAIN_DIR}/common + +INCS= dwarf.h libdwarf.h +INCSDIR= /usr/include + +.ifndef NOCOMPATLIB +COMPATLIB_NO_LIB= yes # only the include files, not the library +.-include "${TOOLDIR}/share/compat/defs.mk" +.endif + +CPPFLAGS+= -I${.CURDIR}/../../compat +CPPFLAGS+= -I${.CURDIR}/../../common +CPPFLAGS+= -I${LIBDWARF_DIR} -I${LIBELF_DIR} -I${COMMON_DIR} +CPPFLAGS+= -I${TOOLDIR}/include -I${TOOLDIR}/include/nbinclude + +BUILD_OSTYPE!= uname -s + +# Disable use of pre-compiled headers on Darwin. +.if ${BUILD_OSTYPE} == "Darwin" +CPPFLAGS+= -no-cpp-precomp +.endif + +# -D_FILE_OFFSET_BITS=64 produces a much more amenable `struct stat', and +# other file ops, on many systems, without changing function names. + +CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 + +.PATH: ${LIBDWARF_DIR} + +HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS} +CPPFLAGS:= # empty + +.include Index: src/tools/elftoolchain/libelf/Makefile diff -u /dev/null src/tools/elftoolchain/libelf/Makefile:1.1 --- /dev/null Mon Apr 18 14:11:44 2022 +++ src/tools/elftoolchain/libelf/Makefile Mon Apr 18 14:11:44 2022 @@ -0,0 +1,91 @@ +# $NetBSD: Makefile,v 1.1 2022/04/18 14:11:44 jkoshy Exp $ + +HOSTLIB= elf + +.include + +SRCS= elf_begin.c \ + elf_cntl.c \ + elf_end.c elf_errmsg.c elf_errno.c \ + elf_data.c \ + elf_fill.c elf_flag.c \ + elf_getarhdr.c elf_getarsym.c elf_getbase.c \ + elf_getident.c \ + elf_hash.c \ + elf_kind.c \ + elf_memory.c \ + elf_next.c \ + elf_rand.c elf_rawfile.c\ + elf_phnum.c \ + elf_shnum.c elf_shstrndx.c elf_scn.c elf_strptr.c \ + elf_update.c \ + elf_version.c \ + gelf_cap.c \ + gelf_checksum.c \ + gelf_dyn.c \ + gelf_ehdr.c \ + gelf_getclass.c \ + gelf_fsize.c \ + gelf_move.c \ + gelf_phdr.c \ + gelf_rel.c gelf_rela.c \ + gelf_shdr.c gelf_sym.c gelf_syminfo.c gelf_symshndx.c \ + gelf_xlate.c \ + elf.c \ + libelf_align.c libelf_allocate.c libelf_ar.c \ + libelf_ar_util.c \ +
CVS commit: src/tools/elftoolchain
Module Name:src Committed By: jkoshy Date: Mon Apr 18 14:11:44 UTC 2022 Modified Files: src/tools/elftoolchain: Makefile Added Files: src/tools/elftoolchain/libdwarf: Makefile src/tools/elftoolchain/libelf: Makefile Log Message: Build 'libelf' and 'libdwarf' under 'tools/elftoolchain', after 'tools/elftoolchain/common' has been built. This change aligns the 'tools' build with the regular build. Subsequent commits will change 'tools/libctf' and 'tools/cft{merge,convert}' to use the new build paths. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/elftoolchain/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/libdwarf/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/libelf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/elftoolchain/common
Module Name:src Committed By: jkoshy Date: Wed Apr 13 17:54:05 UTC 2022 Added Files: src/tools/elftoolchain/common: Makefile Log Message: Add a Makefile missed out in a previous commit. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/tools/elftoolchain/common/Makefile diff -u /dev/null src/tools/elftoolchain/common/Makefile:1.1 --- /dev/null Wed Apr 13 17:54:05 2022 +++ src/tools/elftoolchain/common/Makefile Wed Apr 13 17:54:05 2022 @@ -0,0 +1,33 @@ +# $NetBSD: Makefile,v 1.1 2022/04/13 17:54:05 jkoshy Exp $ + +.include + +SRCDIR= ${.CURDIR}/../../../external/bsd/elftoolchain/dist/common + +.PATH: ${SRCDIR} + +SUBDIR= sys + +INCS= elfdefinitions.h +HOST_INCSDIR= ${TOOLDIR}/include + +HOST_INCINSTFILES= +.for _f in ${INCS} +HOST_INCINSTFILES+= ${HOST_INCSDIR}/${_f} +${HOST_INCSDIR}/${_f}: ${_f} + ${_MKTARGET_INSTALL} + ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} +.endfor + +.PHONY: all clean depend obj + +install: .PHONY includes + +includes: .PHONY ${HOST_INCSDIR} .WAIT ${INCS} + +all depend clean clobber: + +cleandepend: + rm -f ${.OBJDIR}/.depend + +.include
CVS commit: src/tools/elftoolchain/common
Module Name:src Committed By: jkoshy Date: Wed Apr 13 17:54:05 UTC 2022 Added Files: src/tools/elftoolchain/common: Makefile Log Message: Add a Makefile missed out in a previous commit. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Wed Apr 13 17:52:56 UTC 2022 Modified Files: src/tools: Makefile Added Files: src/tools/elftoolchain: Makefile src/tools/elftoolchain/common/sys: Makefile Log Message: When building tools use a dedicated subdirectory for compiling Elftoolchain code. Build and install in ${TOOLDIR}/include. This change prepares the ground for upgrading libelf and libdwarf to their current Elftoolchain versions. To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/tools/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/common/sys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/Makefile diff -u src/tools/Makefile:1.212 src/tools/Makefile:1.213 --- src/tools/Makefile:1.212 Sun Nov 14 15:48:02 2021 +++ src/tools/Makefile Wed Apr 13 17:52:56 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.212 2021/11/14 15:48:02 skrll Exp $ +# $NetBSD: Makefile,v 1.213 2022/04/13 17:52:56 jkoshy Exp $ .include .include @@ -58,6 +58,7 @@ TOOLCHAIN_BITS+= dbsym mdsetimage DTRACE_BITS= .if ${MKDTRACE} != "no" || ${MKCTF} != "no" +DTRACE_BITS+= .WAIT elftoolchain DTRACE_BITS+= .WAIT libelf DTRACE_BITS+= .WAIT libdwarf DTRACE_BITS+= .WAIT libctf Added files: Index: src/tools/elftoolchain/Makefile diff -u /dev/null src/tools/elftoolchain/Makefile:1.1 --- /dev/null Wed Apr 13 17:52:56 2022 +++ src/tools/elftoolchain/Makefile Wed Apr 13 17:52:56 2022 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2022/04/13 17:52:56 jkoshy Exp $ + +SUBDIR= common + +.include Index: src/tools/elftoolchain/common/sys/Makefile diff -u /dev/null src/tools/elftoolchain/common/sys/Makefile:1.1 --- /dev/null Wed Apr 13 17:52:56 2022 +++ src/tools/elftoolchain/common/sys/Makefile Wed Apr 13 17:52:56 2022 @@ -0,0 +1,41 @@ +# $NetBSD: Makefile,v 1.1 2022/04/13 17:52:56 jkoshy Exp $ + +.include + +SRCDIR= ${.CURDIR}/../../../../external/bsd/elftoolchain/dist/common/sys + +.PATH: ${SRCDIR} + +INCS= elfdefinitions.h +HOST_INCSDIR= ${TOOLDIR}/include/sys + +elfdefinitions.h: elfdefinitions.m4 elfconstants.m4 + ${TOOL_M4} -I${SRCDIR} -D SRCDIR=${SRCDIR} ${M4FLAGS} \ + elfdefinitions.m4 > ${.TARGET} + +.PHONY: all clean clobber depend + +install: .PHONY ${HOST_INCSDIR} .WAIT includes + +${HOST_INCSDIR}: + ${_MKTARGET_INSTALL} + ${HOST_INSTALL_DIR} ${HOST_INCSDIR} + +.for _f in ${INCS} +HOST_INCINSTFILES+= ${HOST_INCSDIR}/${_f} +${HOST_INCSDIR}/${_f}: ${_f} + ${_MKTARGET_INSTALL} + ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} +.endfor + +includes: .PHONY ${HOST_INCSDIR} .WAIT ${HOST_INCINSTFILES} + +all dependall depend: ${INCS} + +clean clobber: + rm -f ${INCS} + +cleandepend: + rm -f ${.OBJDIR}/.depend + +.include
CVS commit: src/tools
Module Name:src Committed By: jkoshy Date: Wed Apr 13 17:52:56 UTC 2022 Modified Files: src/tools: Makefile Added Files: src/tools/elftoolchain: Makefile src/tools/elftoolchain/common/sys: Makefile Log Message: When building tools use a dedicated subdirectory for compiling Elftoolchain code. Build and install in ${TOOLDIR}/include. This change prepares the ground for upgrading libelf and libdwarf to their current Elftoolchain versions. To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/tools/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/Makefile cvs rdiff -u -r0 -r1.1 src/tools/elftoolchain/common/sys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/elftoolchain/dist/libdwarf
Module Name:src Committed By: jkoshy Date: Mon Mar 14 20:50:48 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/libdwarf: dwarf.3 dwarf_add_AT_comp_dir.3 dwarf_add_AT_const_value_string.3 dwarf_add_AT_dataref.3 dwarf_add_AT_flag.3 dwarf_add_AT_location_expr.3 dwarf_add_AT_name.3 dwarf_add_AT_producer.3 dwarf_add_AT_ref_address.3 dwarf_add_AT_reference.3 dwarf_add_AT_signed_const.3 dwarf_add_AT_string.3 dwarf_add_AT_targ_address.3 dwarf_add_arange.3 dwarf_add_die_to_debug.3 dwarf_add_directory_decl.3 dwarf_add_expr_addr.3 dwarf_add_expr_gen.3 dwarf_add_fde_inst.3 dwarf_add_file_decl.3 dwarf_add_frame_cie.3 dwarf_add_frame_fde.3 dwarf_add_funcname.3 dwarf_add_line_entry.3 dwarf_add_pubname.3 dwarf_add_typename.3 dwarf_add_varname.3 dwarf_add_weakname.3 dwarf_attr.3 dwarf_attrlist.3 dwarf_attroffset.3 dwarf_attrval_signed.3 dwarf_child.3 dwarf_dealloc.3 dwarf_def_macro.3 dwarf_die_abbrev_code.3 dwarf_die_link.3 dwarf_diename.3 dwarf_dieoffset.3 dwarf_end_macro_file.3 dwarf_errmsg.3 dwarf_errno.3 dwarf_expand_frame_instructions.3 dwarf_expr_current_offset.3 dwarf_expr_into_block.3 dwarf_fde_cfa_offset.3 dwarf_find_macro_value_start.3 dwarf_finish.3 dwarf_formaddr.3 dwarf_formblock.3 dwarf_formexprloc.3 dwarf_formflag.3 dwarf_formref.3 dwarf_formsig8.3 dwarf_formstring.3 dwarf_formudata.3 dwarf_get_AT_name.3 dwarf_get_abbrev.3 dwarf_get_abbrev_children_flag.3 dwarf_get_abbrev_code.3 dwarf_get_abbrev_entry.3 dwarf_get_abbrev_tag.3 dwarf_get_address_size.3 dwarf_get_arange.3 dwarf_get_arange_info.3 dwarf_get_aranges.3 dwarf_get_cie_index.3 dwarf_get_cie_info.3 dwarf_get_cie_of_fde.3 dwarf_get_cu_die_offset.3 dwarf_get_die_infotypes_flag.3 dwarf_get_elf.3 dwarf_get_fde_at_pc.3 dwarf_get_fde_info_for_all_regs.3 dwarf_get_fde_info_for_all_regs3.3 dwarf_get_fde_info_for_cfa_reg3.3 dwarf_get_fde_info_for_reg.3 dwarf_get_fde_info_for_reg3.3 dwarf_get_fde_instr_bytes.3 dwarf_get_fde_list.3 dwarf_get_fde_n.3 dwarf_get_fde_range.3 dwarf_get_form_class.3 dwarf_get_funcs.3 dwarf_get_globals.3 dwarf_get_loclist_entry.3 dwarf_get_macro_details.3 dwarf_get_pubtypes.3 dwarf_get_ranges.3 dwarf_get_relocation_info.3 dwarf_get_relocation_info_count.3 dwarf_get_section_bytes.3 dwarf_get_section_max_offsets.3 dwarf_get_str.3 dwarf_get_types.3 dwarf_get_vars.3 dwarf_get_weaks.3 dwarf_hasattr.3 dwarf_hasform.3 dwarf_highpc.3 dwarf_init.3 dwarf_lineno.3 dwarf_lne_end_sequence.3 dwarf_lne_set_address.3 dwarf_loclist.3 dwarf_loclist_from_expr.3 dwarf_new_die.3 dwarf_new_expr.3 dwarf_new_fde.3 dwarf_next_cu_header.3 dwarf_next_types_section.3 dwarf_object_init.3 dwarf_producer_init.3 dwarf_producer_set_isa.3 dwarf_reset_section_bytes.3 dwarf_set_frame_cfa_value.3 dwarf_set_reloc_application.3 dwarf_seterrarg.3 dwarf_srcfiles.3 dwarf_srclines.3 dwarf_start_macro_file.3 dwarf_tag.3 dwarf_transform_to_disk_form.3 dwarf_undef_macro.3 dwarf_vendor_ext.3 dwarf_whatattr.3 Log Message: Sync libdwarf's manual pages with upstream [r3964]. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/elftoolchain/dist/libdwarf/dwarf.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_comp_dir.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_const_value_string.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_dataref.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_flag.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_location_expr.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_name.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_producer.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_ref_address.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_reference.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_signed_const.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_string.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_targ_address.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_arange.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_die_to_debug.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_directory_decl.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_expr_addr.3 \ src/external/bsd/elftoolchain/dist/libdwarf/dwarf_add_expr_gen.3 \
CVS commit: src/external/bsd/elftoolchain/dist/libelf
Module Name:src Committed By: jkoshy Date: Sat Mar 12 21:37:55 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/libelf: elf_begin.3 elf_cntl.3 elf_end.3 elf_errmsg.3 elf_flagdata.3 elf_getarhdr.3 elf_getarsym.3 elf_getbase.3 elf_getdata.3 elf_getident.3 elf_getphdrnum.3 elf_getphnum.3 elf_getscn.3 elf_getshdrnum.3 elf_getshdrstrndx.3 elf_getshnum.3 elf_getshstrndx.3 elf_hash.3 elf_kind.3 elf_memory.3 elf_next.3 elf_open.3 elf_rand.3 elf_rawfile.3 elf_strptr.3 elf_update.3 elf_version.3 gelf_checksum.3 gelf_fsize.3 gelf_getcap.3 gelf_getclass.3 gelf_getdyn.3 gelf_getehdr.3 gelf_getmove.3 gelf_getphdr.3 gelf_getrel.3 gelf_getrela.3 gelf_getshdr.3 gelf_getsym.3 gelf_getsyminfo.3 gelf_getsymshndx.3 gelf_newehdr.3 gelf_newphdr.3 gelf_update_ehdr.3 gelf_xlatetof.3 Log Message: Sync libelf's manual pages with upstream [r3963]. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/libelf/elf_begin.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_cntl.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_end.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_flagdata.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getarhdr.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getarsym.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getbase.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getdata.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getident.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getphdrnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getphnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getscn.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshdrnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshdrstrndx.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshstrndx.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_hash.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_kind.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_memory.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_next.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_open.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_rand.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_rawfile.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_strptr.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_update.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_version.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_checksum.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_fsize.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getcap.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getclass.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getdyn.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getehdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getmove.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getphdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getrel.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getrela.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getshdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getsym.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getsyminfo.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getsymshndx.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_newehdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_newphdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_update_ehdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_xlatetof.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/libelf/elf_begin.3 diff -u src/external/bsd/elftoolchain/dist/libelf/elf_begin.3:1.4 src/external/bsd/elftoolchain/dist/libelf/elf_begin.3:1.5 --- src/external/bsd/elftoolchain/dist/libelf/elf_begin.3:1.4 Mon Mar 8 20:55:06 2021 +++ src/external/bsd/elftoolchain/dist/libelf/elf_begin.3 Sat Mar 12 21:37:55 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: elf_begin.3,v 1.4 2021/03/08 20:55:06 jkoshy Exp $ +.\" $NetBSD: elf_begin.3,v 1.5 2022/03/12 21:37:55 jkoshy Exp $ .\" .\" Copyright (c) 2006,2008-2011 Joseph Koshy. All rights reserved. .\" @@ -23,7 +23,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" Id: elf_begin.3 3928 2021-03-07 19:47:55Z jkoshy +.\" Id: elf_begin.3 3952 2022-03-12 09:09:50Z jkoshy .\" .Dd December 11, 2011 .Dt ELF_BEGIN 3 @@ -54,22 +54,22 @@ and APIs. .Pp Argument -.Ar fd +.Fa fd is an open file descriptor returned fro
CVS commit: src/external/bsd/elftoolchain/dist/libelf
Module Name:src Committed By: jkoshy Date: Sat Mar 12 21:37:55 UTC 2022 Modified Files: src/external/bsd/elftoolchain/dist/libelf: elf_begin.3 elf_cntl.3 elf_end.3 elf_errmsg.3 elf_flagdata.3 elf_getarhdr.3 elf_getarsym.3 elf_getbase.3 elf_getdata.3 elf_getident.3 elf_getphdrnum.3 elf_getphnum.3 elf_getscn.3 elf_getshdrnum.3 elf_getshdrstrndx.3 elf_getshnum.3 elf_getshstrndx.3 elf_hash.3 elf_kind.3 elf_memory.3 elf_next.3 elf_open.3 elf_rand.3 elf_rawfile.3 elf_strptr.3 elf_update.3 elf_version.3 gelf_checksum.3 gelf_fsize.3 gelf_getcap.3 gelf_getclass.3 gelf_getdyn.3 gelf_getehdr.3 gelf_getmove.3 gelf_getphdr.3 gelf_getrel.3 gelf_getrela.3 gelf_getshdr.3 gelf_getsym.3 gelf_getsyminfo.3 gelf_getsymshndx.3 gelf_newehdr.3 gelf_newphdr.3 gelf_update_ehdr.3 gelf_xlatetof.3 Log Message: Sync libelf's manual pages with upstream [r3963]. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/elftoolchain/dist/libelf/elf_begin.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_cntl.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_end.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_errmsg.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_flagdata.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getarhdr.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getarsym.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getbase.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getdata.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getident.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getphdrnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getphnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getscn.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshdrnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshdrstrndx.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshnum.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_getshstrndx.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_hash.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_kind.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_memory.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_next.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_open.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_rand.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_rawfile.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_strptr.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_update.3 \ src/external/bsd/elftoolchain/dist/libelf/elf_version.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_checksum.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_fsize.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getcap.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getclass.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getdyn.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getehdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getmove.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getphdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getrel.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getrela.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getshdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getsym.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getsyminfo.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_getsymshndx.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_newehdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_newphdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_update_ehdr.3 \ src/external/bsd/elftoolchain/dist/libelf/gelf_xlatetof.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib
joerg> Just the libs should be enough and ideally, jk> It appears that we would need to add the 'elftoolchain' subdirectory to jk> "src/external/bsd/Makefile" for the global includes run to work. This should be fixed now. Regards, Joseph Koshy
Re: CVS commit: src/lib
On Thu, Apr 08, 2021 at 01:51:30PM +0200, Joerg Sonnenberger wrote: jk> Redo r1.288: traverse the complete imported Elftoolchain tree during jk> a build. js> Just the libs should be enough and ideally, libelf and libdwarf js> are folded into the main .WAIT groups. There is a global includes js> run first. It appears that we would need to add the 'elftoolchain' subdirectory to "src/external/bsd/Makefile" for the global includes run to work. Let me try that out - once I get it to work I will revert 'src/lib/Makefile' to traverse just the imported libraries. Regards, Joseph Koshy