CVS commit: src/external/bsd/elftoolchain/dist/common

2023-12-17 Thread Joseph Koshy 
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

2023-12-17 Thread Joseph Koshy 
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

2023-12-09 Thread Joseph Koshy 
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 defining audit

CVS commit: src/external/bsd/elftoolchain/dist/common/sys

2023-12-09 Thread Joseph Koshy 
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

2023-12-07 Thread Joseph Koshy 
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

2023-12-07 Thread Joseph Koshy 
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()
 ')

CVS commit: src/external/bsd/elftoolchain/dist/common/sys

2022-05-08 Thread Joseph Koshy 
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

2022-05-08 Thread Joseph Koshy 
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/common

2022-05-03 Thread Joseph Koshy 
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

2022-05-03 Thread Joseph Koshy 
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/bsd/elftoolchain/dist/common/sys

2022-05-02 Thread Joseph Koshy 
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

2022-05-02 Thread Joseph Koshy 
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/bsd/elftoolchain/dist/common/sys

2022-05-02 Thread Joseph Koshy 
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

2022-05-02 Thread Joseph Koshy 
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.