Tue Apr 16 14:29:33 2024 UTC (23d)
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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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 *
@@ -41,16 +41,14 @@ @@ -41,16 +41,14 @@
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_ */