From 4a1c2f97045a287df11123462ef306fee2698981 Mon Sep 17 00:00:00 2001
From: jkoshy <jkoshy@NetBSD.org>
Date: Mon, 2 May 2022 20:27:43 +0000
Subject: [PATCH] Catch up with Elftoolchain upstream <r3980>.

---
 .../elftoolchain/dist/common/sys/elfconstants.m4 | 16 ++++++++++++++--
 .../dist/common/sys/elfdefinitions.m4            |  8 ++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4 b/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4
index 5fef46857e72..1ecdc42703e3 100644
--- a/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4
+++ b/external/bsd/elftoolchain/dist/common/sys/elfconstants.m4
@@ -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/05/02 09:43:23 jkoshy Exp $
 # - 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.
 #
diff --git a/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 b/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4
index c45ef9d6f869..23bf5f36a889 100644
--- a/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4
+++ b/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4
@@ -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 2022/05/02 09:43:23 jkoshy Exp $
  */
 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.