PR/59564 CVS commit: src

["Joseph Koshy" <jkoshy%netbsd.org@localhost>]

The following reply was made to PR lib/59564; it has been noted by GNATS.

From: "Joseph Koshy" <jkoshy%netbsd.org@localhost>
To: gnats-bugs%gnats.NetBSD.org@localhost
Cc: 
Subject: PR/59564 CVS commit: src
Date: Tue, 18 Nov 2025 13:02:13 +0000

 Module Name:	src
 Committed By:	jkoshy
 Date:		Tue Nov 18 13:02:13 UTC 2025
 
 Modified Files:
 	src/external/bsd/elftoolchain/dist/common/sys: elfdefinitions.m4
 	src/external/cddl/osnet/dist/lib/libdtrace/common: drti.c
 	src/sys/sys: exec_elf.h
 	src/tests/lib/libc/sys: t_ptrace_wait.c
 	src/usr.bin/kdump: Makefile.ioctl-c
 
 Log Message:
 Allow code to include either (or both) of <sys/elfdefinitions.h> and
 <sys/exec_elf.h>, in any order.
 
 This is a work-around to address PR lib/59564 (build breakage when
 both of these files are #included).
 
 With this changeset, whichever file gets included first 'wins'.
 Prior changes in NetBSD and upstream at Elftoolchain have aligned the
 'generic' ELF definitions in NetBSD's <sys/exec_elf.h> with those
 in Elftoolchain's <sys/elfdefinitions.h>, so that either file can
 be used interchangeably when building NetBSD.
 
 This changeset also removes prior workarounds in the source tree
 for this issue.
 
 PR lib/59564
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.13 -r1.14 \
     src/external/bsd/elftoolchain/dist/common/sys/elfdefinitions.m4
 cvs rdiff -u -r1.9 -r1.10 \
     src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c
 cvs rdiff -u -r1.182 -r1.183 src/sys/sys/exec_elf.h
 cvs rdiff -u -r1.195 -r1.196 src/tests/lib/libc/sys/t_ptrace_wait.c
 cvs rdiff -u -r1.40 -r1.41 src/usr.bin/kdump/Makefile.ioctl-c
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.