sys/conf/NOTES
339	It would be good to copy the header bit over as well. I think in the MD NOTES files we keep the header blocks and try to keep the options sorted in the same relative order as MI NOTES.
sys/conf/makeLINT.mk
15	I thought we'd just hack this file instead perhaps to add something like: NOTES= .if ${TARGET} == "amd64" \|\| ${TARGET} == "i386" NOTES+= x86/conf/NOTES .endif In particular, you could replace that with something using TARGET_CPUARCH in the future.
sys/x86/conf/NOTES
13	Yeah, that's orthogonal, but probably it should say something like "this is only needed for legacy FreeBSD 1.x i386 a.out binaries"

imp added inline comments.Aug 10 2019, 1:07 AM

sys/conf/NOTES
339	ok
sys/conf/makeLINT.mk
15	Yea, we could in the future, but now we can't. And we'd need to add back the ${.CURDIR}/NOTES too, which makes it too messy, imho, which is why I opted just for the default value.

See follow on review https://reviews.freebsd.org/D21207

sys/conf/makeLINT.mk
15	In addition, I think that the current state of the values of MACHINE_CPUARCH would mean that using it here would be hard. Based on all this, I think my approach is simpler, but we can revisit once we have MACHINE_CPUARCH=x86 for i386/amd64 in place.

And also https://reviews.freebsd.org/D21208

changes per jhb review, except the ifdef x86 in makeLINT.mk

Harbormaster completed remote builds in B25777: Diff 60637.Aug 10 2019, 4:26 PM

jhb added inline comments.Aug 12 2019, 4:54 PM

sys/conf/makeLINT.mk
15	Just to be clear, we wouldn't have to add back .CURDIR/NOTES, you'd keep the existing line and have a += under it: NOTES= ${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES .if ${TARGET} == "amd64" \|\| ${TARGET} == "i386" NOTES+= ${.CURDIR}/../../x86/conf/NOTES .endif Either way is fine I guess, but I feel like this is clearer that we are just adding a new file instead of duplicating the default value of NOTES.

OTOH, I wonder if what we might not want instead is a 'NOTES_EXTRA'. You would modify makeLINT.mk to do something like this:

NOTES=	${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES ${NOTES_EXTRA}

We might find that there are some other large "features" we might want to split out into an MI NOTES but only enable them for certain architectures.

An even simpler way perhaps might be to change makeLINT.mk to just use 'NOTES+=' instead of 'NOTES=', then you could change amd64/Makefile and i386/Makefile
to just have:

NOTES=${.CURDIR}/../../x86/conf/NOTES

And use '+=' in makeLINT.mk. Perhaps that is the simplest of all.

In D21203#461464, @jhb wrote:
OTOH, I wonder if what we might not want instead is a 'NOTES_EXTRA'. You would modify makeLINT.mk to do something like this:
NOTES=	${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES ${NOTES_EXTRA}
We might find that there are some other large "features" we might want to split out into an MI NOTES but only enable them for certain architectures.

An even simpler way perhaps might be to change makeLINT.mk to just use 'NOTES+=' instead of 'NOTES=', then you could change amd64/Makefile and i386/Makefile
to just have:
NOTES=${.CURDIR}/../../x86/conf/NOTES
And use '+=' in makeLINT.mk. Perhaps that is the simplest of all.