Sun May 8 17:28:14 2022 UTC ()
Merge from upstream [r3984]: allow the use of the generated
'elfdefinitions.h' file in compilation environments lacking
C99 headers.


(jkoshy)
diff -r1.4 -r1.5 src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4
cvs diff -r1.4 -r1.5 src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 (expand / switch to unified diff)

--- src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 2022/05/02 20:27:43 1.4
+++ src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4 2022/05/08 17:28:14 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1dnl $NetBSD: elfdefinitions.m4,v 1.4 2022/05/02 20:27:43 jkoshy Exp $ 1dnl $NetBSD: elfdefinitions.m4,v 1.5 2022/05/08 17:28:14 jkoshy Exp $
2/*- 2/*-
3 * Copyright (c) 2010,2021 Joseph Koshy 3 * Copyright (c) 2010,2021 Joseph Koshy
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -16,27 +16,27 @@ dnl $NetBSD: elfdefinitions.m4,v 1.4 20 @@ -16,27 +16,27 @@ dnl $NetBSD: elfdefinitions.m4,v 1.4 20
16 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27divert(-1) 27divert(-1)
28define(`VCSID_ELFDEFINITIONS_M4', 28define(`VCSID_ELFDEFINITIONS_M4',
29 `Id: elfdefinitions.m4 3980 2022-05-02 19:50:00Z jkoshy') 29 `Id: elfdefinitions.m4 3984 2022-05-06 11:22:42Z jkoshy')
30include(`elfconstants.m4')dnl 30include(`elfconstants.m4')dnl
31 31
32define(`_',`ifelse(eval(len($1) <= 7),1, 32define(`_',`ifelse(eval(len($1) <= 7),1,
33 `#define $1 $2', 33 `#define $1 $2',
34 `#define $1 $2')') 34 `#define $1 $2')')
35divert(0)dnl 35divert(0)dnl
36 36
37/* 37/*
38 * WARNING: GENERATED FILE. DO NOT MODIFY. 38 * WARNING: GENERATED FILE. DO NOT MODIFY.
39 * 39 *
40 * GENERATED FROM: VCSID_ELFDEFINITIONS_M4 40 * GENERATED FROM: VCSID_ELFDEFINITIONS_M4
41 * GENERATED FROM: VCSID_ELFCONSTANTS_M4 41 * GENERATED FROM: VCSID_ELFCONSTANTS_M4
42 */ 42 */
@@ -45,28 +45,26 @@ divert(0)dnl @@ -45,28 +45,26 @@ divert(0)dnl
45 * These definitions are based on: 45 * These definitions are based on:
46 * - The public specification of the ELF format as defined in the 46 * - The public specification of the ELF format as defined in the
47 * October 2009 draft of System V ABI. 47 * October 2009 draft of System V ABI.
48 * See: http://www.sco.com/developers/gabi/latest/ch4.intro.html 48 * See: http://www.sco.com/developers/gabi/latest/ch4.intro.html
49 * - The May 1998 (version 1.5) draft of "The ELF-64 object format". 49 * - The May 1998 (version 1.5) draft of "The ELF-64 object format".
50 * - Processor-specific ELF ABI definitions for sparc, i386, amd64, mips, 50 * - Processor-specific ELF ABI definitions for sparc, i386, amd64, mips,
51 * ia64, powerpc, and RISC-V processors. 51 * ia64, powerpc, and RISC-V processors.
52 * - The "Linkers and Libraries Guide", from Sun Microsystems. 52 * - The "Linkers and Libraries Guide", from Sun Microsystems.
53 */ 53 */
54 54
55#ifndef _SYS_ELFDEFINITIONS_H_ 55#ifndef _SYS_ELFDEFINITIONS_H_
56#define _SYS_ELFDEFINITIONS_H_ 56#define _SYS_ELFDEFINITIONS_H_
57 57
58#include <stdint.h> 
59 
60/* 58/*
61 * Types of capabilities. 59 * Types of capabilities.
62 */ 60 */
63DEFINE_CAPABILITIES() 61DEFINE_CAPABILITIES()
64 62
65/* 63/*
66 * Flags used with dynamic linking entries. 64 * Flags used with dynamic linking entries.
67 */ 65 */
68DEFINE_DYN_FLAGS() 66DEFINE_DYN_FLAGS()
69 67
70/* 68/*
71 * Dynamic linking entry types. 69 * Dynamic linking entry types.
72 */ 70 */