> 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

	#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.