From nobody Sun Apr 03 00:40:49 2022 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 6A3C11A52C89; Sun, 3 Apr 2022 00:40:56 +0000 (UTC) (envelope-from peterj@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KWFSm2Z2Fz4Zj8; Sun, 3 Apr 2022 00:40:56 +0000 (UTC) (envelope-from peterj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648946456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MJHl5BLYHHbxKjrja6iV6XoksJHngUMKunUX90lqS90=; b=uZsPbLhNUylOxXB0zDe9EQlNrrpaoODChPQ3cWdB0zfxZeAfN9EpVFyWALu89nhai2xYdv PQpKcOFV9efGzHPgw5GjEP821AlQmWoiX+JGb0Ro5u0gZxCn15gun2gNgXvEn8hDs6BdFL UAtcrqA3lS775xbmobQp++eK8woKieCv2mv933O4vtnoE1qpy2kYBREdjG3idzMnuTSgaK Jf/AisAUXbRmjm5/nZ+gTFzIrP/ID909Ox8/PHTgSWtJW/6VQ9pEukDFBxYmZgUFw3rezB u3zMNWfI6Hge0BhBUpQCycFH8R1+O9Ix3/zxa/oSeM/YGX/H2msqySSbtQLFpg== Received: from server.rulingia.com (ppp239-208.static.internode.on.net [59.167.239.208]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: peterj) by smtp.freebsd.org (Postfix) with ESMTPSA id D7C4F23507; Sun, 3 Apr 2022 00:40:54 +0000 (UTC) (envelope-from peterj@freebsd.org) Date: Sun, 3 Apr 2022 10:40:49 +1000 From: Peter Jeremy To: Xin LI Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cd8822075a38 - main - MFV c144cc54795d: zlib 1.2.12. Message-ID: References: <202203311426.22VEQajW058773@gitrepo.freebsd.org> 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 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uIQnBsqJcHo8aFTY" Content-Disposition: inline In-Reply-To: <202203311426.22VEQajW058773@gitrepo.freebsd.org> X-PGP-Key: http://www.rulingia.com/keys/peter.pgp ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648946456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MJHl5BLYHHbxKjrja6iV6XoksJHngUMKunUX90lqS90=; b=XnbAbT4zSTR9bwS9BVFNQMnEzwKUpiiX12TceYU1r8KUK3CY9IWrDBJtBQnJEQ5/cUCTvo Jn0YbpMLf3vk56hmLxlitneByGmEKyQImjQA+4g6eDG3HcKhxITBpEhttAXy0HBaOfe8td qMZuiKORjU32nRPjAIhr/YkeGBTyi+ryiKUl5GBgPyVA0jOPu+ZX3XVC8p3CwVW7pI4vS9 y4Q2XpAKg5HBzpxuSPCaAcdqRRChvzAtYvNqbyiaaPhxq/9NW8SISzecAGG6lo31Iuhjfy AAjdUnDPqN6ARaEqCetYiNstVd8Sb896LXhtV7fF4VWsjsLYgMu5UFwljf0ePg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648946456; a=rsa-sha256; cv=none; b=y33cUnL3l1UKNhisO9M2THGUnzxHmJmWyrjgeu1eE+Skmk07a9PLQUi0g0FXQkO3Eyti+z 82oJJLCvWKWzt5XKvSFiM/5HPJyEN7yaHdHhcPQKBz+ypvEka1j4Bd1j+Dwr0CroM0VXpT 8yUcU4X98YtIFXuCESstwq16itAy3zURjeQ//r5FxB70UjxTSJM7eCczdAWVu/ofqkDKur by9ecSr5zop7MtOyUkcdgJwEjxZlcDaCujlsUif/KsWK5Zc6u1FPLMaHc06hQuICIvwcTw zb2sFCzH5Fq3fB7YQjPrMnIscho+4K0revzCftyX3dLLQvVo7Z+GwJIYDaU0BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --uIQnBsqJcHo8aFTY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2022-Mar-31 14:26:36 +0000, Xin LI wrote: >The branch main has been updated by delphij: > >URL: https://cgit.FreeBSD.org/src/commit/?id=3Dcd8822075a38d0734e74b1735e4= b5dbef9789170 > >commit cd8822075a38d0734e74b1735e4b5dbef9789170 >Merge: e57f6630d9d4 c144cc54795d >Author: Xin LI >AuthorDate: 2022-03-31 14:25:53 +0000 >Commit: Xin LI >CommitDate: 2022-03-31 14:25:53 +0000 > > MFV c144cc54795d: zlib 1.2.12. This breaks the build on my arm64 box: --- crc32.o --- /usr/src/sys/contrib/zlib/crc32.c:106:61: error: 'W' is not defined, evalua= tes to 0 [-Werror,-Wundef] #if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W =3D=3D 8 The code in sys/contrib/zlib/crc32.c:74-99 is rather convoluted but doing a test compile with '-E -dD', I get: # 57 "/usr/src/sys/contrib/zlib/crc32.c" #define N 5 # 83 "/usr/src/sys/contrib/zlib/crc32.c" #define W 8 # 97 "/usr/src/sys/contrib/zlib/crc32.c" #undef W Working through the various tests: - Z_TESTW is undefined - MAKECRCH is undefined - __aarch64__ is defined - Z_U8 is undefined - Z_U4 is undefined Z_U8 sounds like it should be defined on a 64-bit arch and there's logic in sys/contrib/zlib/zutil.h:45-54 to do so but: - Z_U8 is not predefined - Z_SOLO is defined at sys/contrib/zlib/zconf.h:13 because it's in the kern= el. The backup Z_U4 definition at sys/contrib/zlib/zconf.h:423:432 is likewise bypassed because Z_SOLO is defined. I believe that the correct fix for arm64 is along the lines of: #define Z_U8 unsigned long but I'm not sure how to weave that into the fairly complex mess of conditionals. Could you please look into the logic for arm64. And, whilst I haven't yet checked, I suspect that the lack of Z_U4 and Z_U8 definitions within the kernel is at least a misconfiguration on all architecture, even if it only actively breaks the build on arm64. --=20 Peter Jeremy --uIQnBsqJcHo8aFTY Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEE7rKYbDBnHnTmXCJ+FqWXoOSiCzQFAmJI7QdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEVF QjI5ODZDMzA2NzFFNzRFNjVDMjI3RTE2QTU5N0EwRTRBMjBCMzQACgkQFqWXoOSi CzTVVQ/7BhdnA0CpP1SmN799Tt/1eRze2w45jK92Y2ys90rOAb5rVZCM0csftioP EMgkUISly8l31psLRcYEGaJXXkkNX0zCsOkkzlG7CcMUSOqHuZZQsRsN/TOeQGN3 H9207Kxq6RwHiwZaYyqG3YWElcugWKbygVpK3Q8UWz/7FXhm5zl7XqK1MwAubJl7 V+HDfQqNfyLZVXWZGjLi0lIg24JhALD3o/BYasS2hnmTyiCiIBkCAgS1JeLWt2ZS DKmhKXEvLtBf94ci34ggFyHyAXu8O3CPH8hN64IQQ3HWFIK5OJyKne+voxpUnKQ+ cuegIWqKhcjOINBQVvC0B4QWo8chLk/ZnyUWfoHyysvqzQ5kBkGFRUZik8kHXClb Pn5ivsUGv4hwbaxLSSYUInGKlxhRl9p4naJfy6iPHuK+Bj4xQGOT/8wq1RqmMDbO FuyyYxmRJl4uKyUBxbjChgStDaMD62ejaNGoF4gtzKBKYIp+WRvb72nmmK7gqkic oY2I5q4SMrL5Hw4AGZfb/BpfB7Nox9Sc3pX0HUbmPlNTMIfzFNA6Vvz174X1Ojvg fRq2Nxl9Cu+osLnbguq9SgizEu1OCcF+a4c0xET/sLlH16g8FgbefL6yOxX8hmGG qZVDeVA0LDxmukbcbWIF3UKBa308birKbrbvOPTU2nWhJFU2Bbw= =yXeJ -----END PGP SIGNATURE----- --uIQnBsqJcHo8aFTY--