From owner-svn-src-head@freebsd.org Wed Nov 20 23:32:34 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0CF8F1C572B; Wed, 20 Nov 2019 23:32:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47JJrd6PYcz4WRm; Wed, 20 Nov 2019 23:32:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-5.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 1801A1B49; Wed, 20 Nov 2019 23:32:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r354900 - head/usr.sbin/jail To: Warner Losh Cc: Li-Wen Hsu , src-committers , svn-src-all , svn-src-head References: <201911201654.xAKGsMTv094014@repo.freebsd.org> <59bf120c-2f35-1a22-b6fa-a9c9bb8cfdf4@FreeBSD.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <991bdc33-516d-6e6d-1880-44930441893d@FreeBSD.org> Date: Wed, 20 Nov 2019 15:32:28 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Nov 2019 23:32:34 -0000 On 11/20/19 3:04 PM, Warner Losh wrote: > On Wed, Nov 20, 2019 at 3:09 PM John Baldwin wrote: > >> On 11/20/19 10:01 AM, Warner Losh wrote: >>> On Wed, Nov 20, 2019 at 9:54 AM Li-Wen Hsu wrote: >>> >>>> Author: lwhsu >>>> Date: Wed Nov 20 16:54:21 2019 >>>> New Revision: 354900 >>>> URL: https://svnweb.freebsd.org/changeset/base/354900 >>>> >>>> Log: >>>> Use the correct variable, also limit the scope to bfd >>>> >>>> PR: 242109 >>>> Reported by: jhb >>>> Sponsored by: The FreeBSD Foundation >>>> >>>> Modified: >>>> head/usr.sbin/jail/Makefile >>>> >>>> Modified: head/usr.sbin/jail/Makefile >>>> >>>> >> ============================================================================== >>>> --- head/usr.sbin/jail/Makefile Wed Nov 20 16:35:58 2019 >> (r354899) >>>> +++ head/usr.sbin/jail/Makefile Wed Nov 20 16:54:21 2019 >> (r354900) >>>> @@ -18,7 +18,7 @@ CFLAGS+=-I. -I${.CURDIR} >>>> # workaround for GNU ld (GNU Binutils) 2.33.1: >>>> # relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2' >>>> # https://bugs.freebsd.org/242109 >>>> -.if ${MACHINE_ARCH} == "riscv" >>>> +.if ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv" >>>> >>> >>> MACHINE isn't the right thing to use here. It's never the proper thing in >>> userland makefiles, unless they are interfacing with the kernel. >>> >>> MACHINE_CPUARCH is what you want here. >> >> Eh, that claim doesn't seem quite true. src.opts.mk only uses MACHINE >> and not >> MACHINE_CPUARCH for example (to set _TT that is then used all over the >> place in src.opts.mk). My experience is that uses of *_CPUARCH are in >> fact >> pretty rare. >> > > However, __TT is used bogusly in many places in src.opts.mk. They are all > relatively new related to llvm (and one for google test). MACHINE has > always been for the kernel and MACHINE_ARCH for userland. MACHINE_CPUARCH > was created for those architectures where we have a number of MACHINE_ARCH > to make things easier to cope with. > > I've done several sweeps of the tree over the years to keep this enforced, > so I'm quite sure of the dichotomy... Here are some to fix then: :) sbin/reboot/Makefile:.if exists(${.CURDIR}/boot_${MACHINE}.8) sbin/reboot/Makefile:MAN+= boot_${MACHINE}.8 sbin/reboot/Makefile:MLINKS+= boot_${MACHINE}.8 boot.8 sbin/reboot/Makefile:.if ${MACHINE} == "amd64" usr.sbin/bsdinstall/partedit/Makefile:PARTEDIT_ARCH= ${MACHINE} usr.sbin/bsdinstall/partedit/Makefile:.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" usr.sbin/pkg/Makefile:. if ${MACHINE} != "amd64" && ${MACHINE} != "i386" 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. BTW, MACHINE_ARCH seems to matter just as much for the kernel. 64-bit mips runs a "mips64" kernel, not a "mips" kernel. With PC-98 removed, I don't think we have any cases where MACHINE != MACHINE_CPUARCH now? -- John Baldwin