From nobody Sun Sep 24 00:37:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtRsp5MN4z4vVMt for ; Sun, 24 Sep 2023 00:37:18 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-21.consmr.mail.gq1.yahoo.com (sonic317-21.consmr.mail.gq1.yahoo.com [98.137.66.147]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtRsn5X8Yz4LTX for ; Sun, 24 Sep 2023 00:37:17 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=A90nByDv; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.66.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695515836; bh=ZkNAA239wCUHUEz6PXLsm4tCSb7RlgtnUqcRd7Z5kTM=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=A90nByDvUSiIiaDGd+WIEfWLvlDwobUZGPlFzqZgnBuROiRTJLry0bkhXSEMlPHpyaGD7oWdFpbgJpLx9wF+4VOKPY4G+4qbPSuEVVEQc2CyavFntQqF0l5JlXOXv/c6hgFf5FbwxuiI29/WewkZypvRA+KWFCzfTNPkqijEKqpaNyEFhx7fn7aDdNHRgj8UEwn9JsX5FZz+Vk/Guga+OVDe1m24Bb0p0HBMs6WDTXlLFse27fgWkzQ5pm7HgGdr3/Q23AUM9LWEDxt5ag+k5uYzDV10hYWbCwx6D8MMXpAdkx6Pyygm+i6xY6mK2Lx8tT5Y+jeIVE1FjUBruU4eHQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695515836; bh=3p6W1SNFkNhf7ke9CIg9XJxBr3nMkTtC/KMol4azGeM=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=CqsI5S5FZlDvcnZOdwcfubKI42arfmyraPuy1HZGgRMJbNHS3l1HFjWnJ/9LzdPYunfG0ih+AkcrmipWiZHOoTsiLK3AK/tlcQjnwvp59Tvxet0we4TztdidaeiV/lSwQhvj0v6tVujhYk+JTJtwRBivB1/NzhcEMv3+uDhjVKdxcIBnlCH9jHGPTIYHj7nfThvhnVPi6xQONU/oSWwIOgGT0kjYIHYwk0exeIrbvB8ObboXPXsmzDfvkvTXO88QLAfojsB+vLb+SxhqVQk9oKzDgs3OVcoLmH5F91TJGCD6xbI/u848b7XSAGDFOrw8uU19PYYRFEZCFnxfVlFsoQ== X-YMail-OSG: OGOveaYVM1nM52FXaexKPnMA51L8eCmm.rZ6JkiljO6A_xave9tM6ClyAr.Oz0q gUuH3uF8kXQm4qWTIWCGX2uxIeV5rIVzJ14sy3UXXzP8SrVAWcxtLla00krRQL8iUgYNX3g35AcP vsIfKvwDn9NTGLx9U9Zm.sG31m1q3UsErqt0wr49cVh1X8QiAEImffz0gDOGbarGlCihEaehslIR y7dtun.VbOcHAwLFPA35Abc4DvXiAWvLvATyDyBGs5TdCOXoPplhlNk_UWkR.ECiMXdSPnB6R6hx sItLA0NHqRi7cSTPPVeLWw7_tCZs3ARSwYYQP3jTE91zHs.Ptug97Yjos4kewwTsXxtKxRJ6LN6u NfzHE4EmMW0bOxbStwi9e_wBFuc9rnNWsf0DDzDlrPbRWu0XZJWPwifeWrwdX2WfDsApyY2cnY2o sGmlbeSF5EW_6jJOVvoIdMFXuQFzy7PHQGBrCJKlbT7ng0w3Yx1r.PuljsKpSmycWrWFxrD1xTP. mPtVtB.jxYe8S7TGOH4dge0.5RNRWX2CvacONqHVCAZuhWRNyztwYsv1mzuw0rC8SmelHzii6.zn eodQRKZcVgG.GP9ox0TfA1UqohgPsuhGXq1AKOkrCg1jDWgR9lW.d2AfXVARECvLC5Un7pzeXVT2 0KUcV1HmbtKwfbQssdUYV0sLuu.8ZtA0BB3tLOM0MeoIAPFekQZeeplxFzq3A2FGx1Nr6Epqv2FW P6LOG8d3CMY5apJk7Rp45mLL7P8hN0ak79NYrxcSqtSZOxQV6dLYqEN5Z8B5mz3PRudnpP.KyMdy hEuEcrt06yJOOI35yUDbvN2y8AHy7NARyfsfVIn_VJgkINPT4xxkdCOP6gaYBlEu1E6.tj2UAf3p .n1J4zsRwWUPb5sTHj9RH8sU.g.euZRnMIARYialSIfbktf8Q3Iw1Szl1Ov1w3bjKK65KORSwHP0 2NqwUxO4NMT0TpHZrfQAvmT3gOwpFw_sI1GYPvS.HTo_YIc4EYLoPCX4P4AsLpf0YA.sQCL0BlDV vMvsyI.6sQRGRi01xEy.FYJJw0kC9Sxy5xx8tHE9waYX_XAka0pB3hEL_OAOORw8I2vTfYMXfR3l mzMHF2OD9r6BS_R99r_tiV6066wkyLq5H7DvzPw3vkhpL1MXiTsHvFyvwldiOysBaCOCL7.19NGo nm3Np2tgthNRk2IAm.JNe2SSWqdZBjYzLSpBTAnF1S_ETkqVibdSqXa2tcdQ0tcov_7xV5Ak0QRX JjVgz5bOfhaRjdZ0I.ozUDKxm89VYOiiHj71tSV_.z_riD8C_w9.m5n_85vcWyhy.id.nHHkmv0f 6VlkvabWFSxaXpKonOww8gkmt06Da89_r96qLV5r2ud0ry8rTyYKbTyQ1YmU2QDWIKMx5OvQscph GUgnvKf1MHhHVLuEJU_S58AE8H1Kk1JZpy8y.RqAq9mkIQuM.Z9UhRBd.Vqr45EbwY8peX1JfBux QfD.p1YKTY4HMBx56V4A3FiNXRan4qyfo8Nhc99HXKa6w2PAcZhCkRENj42t5VGEmd8yhu8BvHf9 oOoveLp6coNrqSufTU9D2SU7KlE7ouX8KMnHrquVf5uKxGEhi7HJ5el11r47jCcnSuXvM1juLfif tS5L4efl7_Tcg2ISwebUB.vltI_m7k1hT.FCI3bIJ2i8DLaK.29ym1TRZKXTTSRlihoh2_ANttJV .LgCQe0k78SbVGZfhcVZmdo0zMLP5f4ELatmOvlTc7KJz7y43lTt7qHiZ9FR5JZ2E2VOgsK9LfBu GPqyUEuxkgqEGOVu9sWx8sD4jxdEPkE6FmvwTc9DiWeC58Ya4kj.Qgj3k0Cq7olV5xVqWE0dsIFu DsRvRZRUH9B7usOL7eP0vuST98x1j6xznXIp5IUgIHsPwnrlC9ROmKlHZgz1In6NGGLB7zCSFSp1 Z4Is.vSpxWGxp2b.cbaZ2sPan0gCLlN9QSCeOuw7QJ9kPDVP.x24EypfZfMPwNe8GPyCOc1ZE4ZF X3S2kKbimRQd86qa8td8QF6z3DJmCNIvVmXyeuwfnhVI8bNWz7KdsGHKqUlzUHp9BtQY2N3TSyDE 27xTEjr9vDCY5ScAIiadxDLD2I79XV26XesYMPHTQX3M_bBsVGdreS9egp16DXnYwfYf9Eobuzro qwoOfWMMeYa5v3UZMabz__Sd0vIeBKAjHqFTlArSyta70JFluL6fQaXD07Nlzx2e3phVOQKLW_vt UInhELx6UDMCgIvgT_4xopzfyc2vriFw6_icSw.abmgTT_AvGA_vR07sLqArdNJ5eH9EX2TSP1Nk dBOQL5w-- X-Sonic-MF: X-Sonic-ID: 30361d10-fb55-447c-ba98-b6bbe772c4d4 Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Sun, 24 Sep 2023 00:37:16 +0000 Received: by hermes--production-gq1-77657878bb-67x6k (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 714178ee5a8c027717f977132852f3b4; Sun, 24 Sep 2023 00:37:11 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: f9df60975087 - main - Add support for host32 for DIRDEPS_BUILD From: Mark Millard In-Reply-To: Date: Sat, 23 Sep 2023 17:37:00 -0700 Cc: Mike Karels , stevek@juniper.net, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <053CA2AC-B5D6-4F2C-B89E-53BE8D4FA67B@yahoo.com> References: <79F167D9-DF7A-4714-92EE-3B9FBB7BF912.ref@yahoo.com> <79F167D9-DF7A-4714-92EE-3B9FBB7BF912@yahoo.com> <2401.1695508551@kaos.jnpr.net> <8033.1695509469@kaos.jnpr.net> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3731.700.6) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.147:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.147:from]; DKIM_TRACE(0.00)[yahoo.com:+]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4RtRsn5X8Yz4LTX On Sep 23, 2023, at 17:28, Mark Millard wrote: > On Sep 23, 2023, at 15:51, Simon J. Gerraty wrote: >=20 >> Simon J. Gerraty wrote: >>>> Looks like this broke lib32 builds via it ending up using >>>> the default: >>>>=20 >>>> -target armv7-unknown-freebsd >>>>=20 >>>> instead of the correct: >>>>=20 >>>> -target armv7-unknown-freebsd15.0-gnueabihf In case it was not clear: in the Jenkins build logs,=20 there were commands of the structure: cc -march=3Darmv7 -m32 -target armv7-unknown-freebsd15.0-gnueabihf . . . = -target armv7-unknown-freebsd . . . (So: both styles of target listed in the same command, the incorrect one listed later.) >>> Sorry. >>>=20 >>> That would be easier to fix/control if a separate variable >>> is used to hold just the -target flag=20 >>>=20 >>> That way bsd.compat.mk could reset that varaible if needed with no = harm >>> done. >>>=20 >>=20 >> Does the following look like it would DTRT for you? >> Not sure about COMPILER_TYPE vs COMPAT_COMPILER_TYPE >=20 > I reported strictly based on noticing the official FreeBSD > Jenkins activity having build failures. My environment is > currently based on a commit that is a day or two before > your change, so I'd need to progress in order to be able > to test anything that fixed the operation. >=20 > I expect that Mike Karels would be a better one to comment > on any alternate structuring for having the build environment > always be explicit for its aarch64 -m32 use, at least based > on preexisting familiarity with where and how things are used. >=20 > Last I tried, gcc12 based builds did not work/finish for > aarch64, even though amd64 was working at the time. It seemed > that the status was not a surprise to folks. Correctly > covering gcc12 use for this issue may well still end up with > a broken/incomplete aarch64+LIB32 build via gcc12 --for other > reasons. >=20 > (E-mail has a tendency to not preserve leading whitespace.) >=20 >> diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk >> index = 0c387bcb020c67ea6eda8fc1f4956eebf098e2a2..1e82df42391c4cec341ad368cb477fe4= a14c84b8 100644 >> --- a/share/mk/bsd.compat.mk >> +++ b/share/mk/bsd.compat.mk >> @@ -26,16 +26,18 @@ COMPAT_COMPILER_TYPE=3D${COMPILER_TYPE} >>=20 >> # ------------------------------------------------------------------- >> # 32 bit world >> +LIB32CPUFLAGS=3D ${LIB32CPUFLAGS.${COMPAT_COMPILER_TYPE}:U} >> +LIB32CPUFLAGS.clang=3D -target ${CROSS_TARGET.clang} >> .if ${COMPAT_ARCH} =3D=3D "amd64" >> HAS_COMPAT+=3D 32 >> .if empty(LIB32CPUTYPE) >> -LIB32CPUFLAGS=3D -march=3Di686 -mmmx -msse -msse2 >> +LIB32CPUFLAGS+=3D -march=3Di686 -mmmx -msse -msse2 >> .else >> -LIB32CPUFLAGS=3D -march=3D${LIB32CPUTYPE} >> +LIB32CPUFLAGS+=3D -march=3D${LIB32CPUTYPE} >> .endif >> .if ${COMPAT_COMPILER_TYPE} =3D=3D gcc >> .else >> -LIB32CPUFLAGS+=3D -target x86_64-unknown-freebsd${OS_REVISION} >> +CROSS_TARGET.clang=3D x86_64-unknown-freebsd${OS_REVISION} >> .endif >> LIB32CPUFLAGS+=3D -m32 >> LIB32_MACHINE=3D i386 >> @@ -47,15 +49,15 @@ LIB32WMAKEFLAGS=3D \ >> .elif ${COMPAT_ARCH} =3D=3D "powerpc64" >> HAS_COMPAT+=3D 32 >> .if empty(LIB32CPUTYPE) >> -LIB32CPUFLAGS=3D -mcpu=3Dpowerpc >> +LIB32CPUFLAGS+=3D -mcpu=3Dpowerpc >> .else >> -LIB32CPUFLAGS=3D -mcpu=3D${LIB32CPUTYPE} >> +LIB32CPUFLAGS+=3D -mcpu=3D${LIB32CPUTYPE} >> .endif >>=20 >> .if ${COMPAT_COMPILER_TYPE} =3D=3D "gcc" >> LIB32CPUFLAGS+=3D -m32 >> .else >> -LIB32CPUFLAGS+=3D -target powerpc-unknown-freebsd${OS_REVISION} >> +CROSS_TARGET.clang=3D powerpc-unknown-freebsd${OS_REVISION} >> .endif >>=20 >> LIB32_MACHINE=3D powerpc >> @@ -66,15 +68,15 @@ LIB32WMAKEFLAGS=3D \ >> .elif ${COMPAT_ARCH} =3D=3D "aarch64" >> HAS_COMPAT+=3D 32 >> .if empty(LIB32CPUTYPE) >> -LIB32CPUFLAGS=3D -march=3Darmv7 >> +LIB32CPUFLAGS+=3D -march=3Darmv7 >> .else >> -LIB32CPUFLAGS=3D -mcpu=3D${LIB32CPUTYPE} >> +LIB32CPUFLAGS+=3D -mcpu=3D${LIB32CPUTYPE} >> .endif >>=20 >> LIB32CPUFLAGS+=3D -m32 >> .if ${COMPAT_COMPILER_TYPE} =3D=3D "gcc" >> .else >> -LIB32CPUFLAGS+=3D -target = armv7-unknown-freebsd${OS_REVISION}-gnueabihf >> +CROSS_TARGET.clang=3D armv7-unknown-freebsd${OS_REVISION}-gnueabihf >> .endif >>=20 >> LIB32_MACHINE=3D arm >> diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk >> index = eb21380f051c4ec8434301ed16c881d07a83dddf..dae540261f7961937db9101da32acc8d= fca20e8f 100644 >> --- a/share/mk/local.sys.mk >> +++ b/share/mk/local.sys.mk >> @@ -97,7 +97,9 @@ META_DEPS+=3D ${META_NOPHONY} >>=20 >> .if ${MACHINE:Nhost*:Ncommon} !=3D "" && ${MACHINE} !=3D = ${HOST_MACHINE} >> # cross-building >> -CROSS_TARGET_FLAGS?=3D -target = ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} >> +CROSS_TARGET.clang?=3D = ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} >> +CROSS_TARGET_FLAGS.clang?=3D -target ${CROSS_TARGET.clang} >> +CROSS_TARGET_FLAGS?=3D ${CROSS_TARGET_FLAGS.${COMPILER_TYPE}} >> CFLAGS+=3D ${CROSS_TARGET_FLAGS} >> ACFLAGS+=3D ${CROSS_TARGET_FLAGS} >> .endif >=20 > I see that you have since disabled the new share/mk/local.sys.mk > code unless ${MK_DIRDEPS_BUILD} =3D=3D "yes" --thus giving time > for considering alternatives. >=20 =3D=3D=3D Mark Millard marklmi at yahoo.com