Tue Apr 16 14:29:33 2024 UTC (46d)
opensolaris/sys/sys/elf.h: Omit needless __ELF_WORD_SIZE.


(riastradh)
diff -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/elf.h
cvs diff -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/elf.h (switch to unified diff)

--- src/external/cddl/osnet/sys/sys/elf.h 2024/04/01 18:33:23 1.7
+++ src/external/cddl/osnet/sys/sys/elf.h 2024/04/16 14:29:33 1.8
@@ -1,56 +1,54 @@ @@ -1,56 +1,54 @@
1/* $NetBSD: elf.h,v 1.7 2024/04/01 18:33:23 riastradh Exp $ */ 1/* $NetBSD: elf.h,v 1.8 2024/04/16 14:29:33 riastradh Exp $ */
2 2
3/* 3/*
4 * CDDL HEADER START 4 * CDDL HEADER START
5 * 5 *
6 * The contents of this file are subject to the terms of the 6 * The contents of this file are subject to the terms of the
7 * Common Development and Distribution License (the "License"). 7 * Common Development and Distribution License (the "License").
8 * You may not use this file except in compliance with the License. 8 * You may not use this file except in compliance with the License.
9 * 9 *
10 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE 10 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
11 * or http://www.opensolaris.org/os/licensing. 11 * or http://www.opensolaris.org/os/licensing.
12 * See the License for the specific language governing permissions 12 * See the License for the specific language governing permissions
13 * and limitations under the License. 13 * and limitations under the License.
14 * 14 *
15 * When distributing Covered Code, include this CDDL HEADER in each 15 * When distributing Covered Code, include this CDDL HEADER in each
16 * file and include the License file at usr/src/OPENSOLARIS.LICENSE. 16 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
17 * If applicable, add the following below this CDDL HEADER, with the 17 * If applicable, add the following below this CDDL HEADER, with the
18 * fields enclosed by brackets "[]" replaced with your own identifying 18 * fields enclosed by brackets "[]" replaced with your own identifying
19 * information: Portions Copyright [yyyy] [name of copyright owner] 19 * information: Portions Copyright [yyyy] [name of copyright owner]
20 * 20 *
21 * CDDL HEADER END 21 * CDDL HEADER END
22 * 22 *
23 * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/elf.h 177698 2008-03-28 22:16:18Z jb $ 23 * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/elf.h 177698 2008-03-28 22:16:18Z jb $
24 * 24 *
25 * ELF compatibility definitions for OpenSolaris source. 25 * ELF compatibility definitions for OpenSolaris source.
26 * 26 *
27 */ 27 */
28 28
29#ifndef _SYS__ELF_SOLARIS_H_ 29#ifndef _SYS__ELF_SOLARIS_H_
30#define _SYS__ELF_SOLARIS_H_ 30#define _SYS__ELF_SOLARIS_H_
31 31
32#if HAVE_NBTOOL_CONFIG_H 32#if HAVE_NBTOOL_CONFIG_H
33# include "nbtool_config.h" 33# include "nbtool_config.h"
34#else 34#else
35# include <sys/types.h> 35# include <sys/types.h>
36#endif 36#endif
37 37
38/* 38/*
39 * XXX In the kernel (e.g., zfs module build, or anything else using 39 * XXX In the kernel (e.g., zfs module build, or anything else using
40 * sys/dtrace.h -> sys/ctf_api.h -> sys/elf.h), sys/elfdefinitions.h 40 * sys/dtrace.h -> sys/ctf_api.h -> sys/elf.h), sys/elfdefinitions.h
41 * isn't available -- it's a header file for the userland libelf. We 41 * isn't available -- it's a header file for the userland libelf. We
42 * could maybe make it available, but sys/exec_elf.h -- which would 42 * could maybe make it available, but sys/exec_elf.h -- which would
43 * collide with sys/elfdefinitions.h -- provides all the definitions 43 * collide with sys/elfdefinitions.h -- provides all the definitions
44 * users need, so we'll just use that for now. 44 * users need, so we'll just use that for now.
45 */ 45 */
46#ifdef _KERNEL 46#ifdef _KERNEL
47# include <sys/exec_elf.h> 47# include <sys/exec_elf.h>
48#else 48#else
49# include <sys/elfdefinitions.h> 49# include <sys/elfdefinitions.h>
50#endif 50#endif
51 51
52#define EM_AMD64 EM_X86_64 52#define EM_AMD64 EM_X86_64
53 53
54#define __ELF_WORD_SIZE ELFSIZE 
55 
56#endif /* !_SYS__ELF_SOLARIS_H_ */ 54#endif /* !_SYS__ELF_SOLARIS_H_ */