Allow bsd.compat.mk to be reliably included outside Makefile.inc1.

[brooks]

Summary

Replace explicit TARGET_* variables with COMPAT_* versions defined based on where the file is being included.

Also, require that bsd.compat.mk be included directly. It's not going to be widely used so always loading it in bsd.prog.mk doesn't make sense. Instead users can include it directly.

[bdrewery]

Oops sorry for missing this before. TARGET_ are only useful in Makefile.inc1.

[imp]

The question is, do we need them to be TARGET_* in this makefile.inc1 usage?
I kinda think it does. Checking into *that* detail...

[brooks]

In D22059#482035, @imp wrote:

The question is, do we need them to be TARGET_* in this makefile.inc1 usage?
I kinda think it does. Checking into *that* detail...

I'm testing a refactor where we use TARGET_* with included from Makefile.inc1 (by checking that _LIBCOMPAT is defined) or MACHINE_ARCH/CPUTYPE elsewhere.

[brooks]

• Get ARCH and CPUTYPE from contextually appropriate sources.

[brooks]

share/mk/bsd.prog.mk

5

We could chose to not include bsd.compat.mk here and require users to include it (after defining NEED_COMPAT/WANT_COMPAT). We'll probably need include it directly anyway to support more complicated programs like rtld.

[bdrewery]

In D22059#482035, @imp wrote:

The question is, do we need them to be TARGET_* in this makefile.inc1 usage?
I kinda think it does. Checking into *that* detail...

I had that thought but I don't think so. bsd.compat.mk is included from Makefiles at the point in the build where MACHINE=$TARGET and MACHINE_ARCH=$TARGET_ARCH from CROSSENV. buildlibcompat is a WMAKE_TGT so it should have these MACHINE= and MACHINE_ARCH= values set.

[imp]

In D22059#482133, @bdrewery wrote:

In D22059#482035, @imp wrote:

The question is, do we need them to be TARGET_* in this makefile.inc1 usage?
I kinda think it does. Checking into *that* detail...

I had that thought but I don't think so. bsd.compat.mk is included from Makefiles at the point in the build where MACHINE=$TARGET and MACHINE_ARCH=$TARGET_ARCH from CROSSENV. buildlibcompat is a WMAKE_TGT so it should have these MACHINE= and MACHINE_ARCH= values set.

Makefile.inc1 include Makefile.libcompat which includes bsd.compat.mk them without MACHINE=$TARGET. MACHINE/MACHINE_ARCH are still the host's at that point. It sets up the targets that are later used with MACHINE=TARGET etc. It's how it builds buildlibompat that's dependent on the target. We won't have a buildlibcompat since it's really:
build${libcompat}: .PHONY
and libcompat is set based on the target...

It's certianly at best confusing...

[brooks]

Any further comments on this version?

[imp]

I don't see anything wrong. the discussion that bdrewery and I were having was that there may be a more optimal way.

share/mk/bsd.prog.mk

5

My lean is this way, since the need/want things are fairly specialized and of interest to only a few files.

[brooks]

• libstats: Fix ABI assertion.
• Require that bsd.compat.mk be explicitly included and update docs.

[brooks]

• Apply patch that arc applied, but didn't submit?!?!

[imp]

sys/kern/subr_stats.c

128 ↗

(On Diff #63816)

unrelated noise?

[brooks]

sys/kern/subr_stats.c

128 ↗

(On Diff #63816)

Bah, it turns out that if you update the wrong tree arc will happily mess everything up. Update coming shortly

[brooks]

• Allow bsd.compat.mk to be reliably included outside Makefile.inc1.
• Get ARCH and CPUTYPE from contextually appropriate sources.
• Require that bsd.compat.mk be explicitly included and update docs.