From: Jonathan Gray <jsg@jsg.id.au>
Subject: Re: exec_elf.h: remove CONCAT definition
To: Miod Vallat <miod@online.fr>
Cc: Lucas Gabriel Vuotto <lucas@sexy.is>, tech@openbsd.org
Date: Tue, 15 Apr 2025 21:59:05 +1000

On Tue, Apr 15, 2025 at 11:46:51AM +0000, Miod Vallat wrote:
> > After more investigation on how this ends up redefined in net/haproxy,
> > which was what originally prompted me to take a look at this, jca and tb
> > agree with this is kind of a whack-a-mole, and I don't feel too strongly
> > about the rename to ELFCONCAT neither (nor about CONCAT in a public
> > header, but it isn't used frequently enough for it to be a problem).
> > Please, ignore this patch.
> 
> Well, the ELFDEFNNAME macro is no longer used, and the ELFNAME macro is
> only used by bootblocks. Therefore replacing the

ELFNAME is also used by mkuboot

usr.sbin/mkuboot/copy_elf.c:ELFNAME(copy_elf)(int ifd, const char *iname, int ofd, const char *oname,

> 
> 	#if defined(ELFSIZE)
> 
> conditional with
> 
> 	#if defined(ELFSIZE) && defined(_STANDALONE)
> 
> ought to get rid of the macro pollution problem, without having to
> change anything else.
> 
>