svn commit: r354900 - head/usr.sbin/jail

[John Baldwin]

On 11/20/19 3:42 PM, Bjoern A. Zeeb wrote:
> On 20 Nov 2019, at 23:32, John Baldwin wrote:
> 
> Hijacking a side-thread:
> 
> PreS: I think we have way too many of these options and should just 
> remove 3/4 of them again or someone build a proper matrix documenting 
> them all and in which case to use in the developers handbook ;-)
> 
>> This one also seems dubious, but in a different way:
>>
>> usr.bin/Makefile:
>>
>> # ARM64TODO gprof does not build
>> # RISCVTODO gprof does not build
>> .if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_CPUARCH} != "riscv"
>> SUBDIR.${MK_TOOLCHAIN}+=        gprof
>> .endif
>>
>> Somewhat exacerbated by the whole aarch64 vs arm64 thing and probably
>> confusion on when to use CPUARCH vs ARCH.
> 
> This particular case could actually be removed as I thought I made that 
> at least compile when I was working on s390x:
> https://svnweb.freebsd.org/base?view=revision&revision=351329
> 
> 
> You can however find more of these elsewhere:
> 
> ../lib/libc/tests/sys/Makefile:.if ${MACHINE_CPUARCH} != "aarch64" && 
> ${MACHINE_CPUARCH} != "riscv"
> ../lib/libcompiler_rt/Makefile.inc:.if ${MACHINE_CPUARCH} == "aarch64" 
> || ${MACHINE_CPUARCH} == "riscv"
> ../stand/libsa/Makefile:.if ${MACHINE_CPUARCH} == "aarch64" || 
> ${MACHINE_CPUARCH} == "riscv"
> ../usr.bin/Makefile:.if ${MACHINE_ARCH} != "aarch64" && 
> ${MACHINE_CPUARCH} != "riscv"
> ../usr.bin/gprof/Makefile:.if ${MACHINE_ARCH} != "aarch64" && 
> ${MACHINE_ARCH} != "riscv" && \

The tests comparing MACHINE_CPUARCH against aarch64 are confusing indeed.
My understanding is that MACHINE_CPUARCH is arm64 for aarch64?  It's kind
of hard to guess since arch(7) goes to great length to try to describe
these variables but doesn't give a handy table of what they actually are
for the various architectures.

-- 
John Baldwin