From nobody Sun Apr 03 06:05:12 2022 X-Original-To: dev-commits-src-all@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 3A1561A566A8; Sun, 3 Apr 2022 06:05:22 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KWNg46b7Yz3lJ8; Sun, 3 Apr 2022 06:05:20 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from [100.64.10.108] (c-141-193-140-252.rev.sailinternet.net [141.193.140.252]) by anubis.delphij.net (Postfix) with ESMTPSA id 7132C4B1A9; Sat, 2 Apr 2022 23:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=m7e2; t=1648965913; x=1648980313; bh=mZlpFf88nwIDu9L8KiLTB+/yscyRxjvhbyWgNvnE0K0=; h=Date:Reply-To:To:Cc:References:From:Subject:In-Reply-To; b=eFT15UrCEfFAL4gQ8NqrJEvgSUssglJpF1+8bnQb5ZBVKCESPuTHnG+Xb7C7YUG9F vkL5BScHG28Q12J5HW2DdeDTWEpgo49YwisJOBr052lKDIy4OQO15dhq5YTAbweyxc fLcyr/Gi0/hWBfhNkVgotY1nm7S2QHy+PberV8BWdqWgNT0YJ4JX3ie53Zd9uoTrS4 N8HGxWK2n3gU8ewGPFZcHraQUL9OVY7qgKz7/i/Adfc6cVzyYXbnABICFfDJLk20wq k7dDjliS3na0EPGcaRbLENsH6S1nsQb3zkwueGNQ6QMKcj6AkY6zoA0ckLpYNjnJxp Uv7nZ2c6abHSg== Content-Type: multipart/mixed; boundary="------------9gTfJvKUgNwEz70D070Bb609" Message-ID: Date: Sat, 2 Apr 2022 23:05:12 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Reply-To: d@delphij.net Content-Language: en-US To: Peter Jeremy , Xin LI , jfc@mit.edu, Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202203311426.22VEQajW058773@gitrepo.freebsd.org> From: Xin Li Organization: The FreeBSD Project Subject: Re: git: cd8822075a38 - main - MFV c144cc54795d: zlib 1.2.12. In-Reply-To: X-Rspamd-Queue-Id: 4KWNg46b7Yz3lJ8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=delphij.net header.s=m7e2 header.b=eFT15UrC; dmarc=pass (policy=reject) header.from=delphij.net; spf=pass (mx1.freebsd.org: domain of delphij@delphij.net designates 64.62.153.212 as permitted sender) smtp.mailfrom=delphij@delphij.net X-Spamd-Result: default: False [-2.13 / 15.00]; HAS_REPLYTO(0.00)[d@delphij.net]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; HAS_ATTACHMENT(0.00)[]; MIME_BASE64_TEXT_BOGUS(1.00)[]; HAS_ORG_HEADER(0.00)[]; DKIM_TRACE(0.00)[delphij.net:+]; MIME_BASE64_TEXT(0.10)[]; RCPT_COUNT_SEVEN(0.00)[7]; NEURAL_HAM_SHORT(-0.23)[-0.232]; DMARC_POLICY_ALLOW(-0.50)[delphij.net,reject]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[delphij.net:s=m7e2]; FREEFALL_USER(0.00)[delphij]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N This is a multi-part message in MIME format. --------------9gTfJvKUgNwEz70D070Bb609 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/2/22 17:40, Peter Jeremy wrote: > 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=cd8822075a38d0734e74b1735e4b5dbef9789170 >> >> 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, evaluates to 0 [-Werror,-Wundef] > #if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 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 kernel. > > 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. This was reported at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262977 Would you mind sharing additional information about your build? (e.g. are you using some special compiling options, the kernel configuration, etc.) This doesn't appear to be reproducible on ref14-aarch (I've added 'options ZFS' to GENERIC and verified that crc32.c did get compiled during the process), nor does it show up in `make tinderbox` which was part of my testing. In the meantime, could you help to test if the attached patch fixes the issue for you? (Because I can't reproduce the issue, I can only verify that the build would work before and after the patch, but that's not quite useful...) Cheers, --------------9gTfJvKUgNwEz70D070Bb609 Content-Type: text/x-patch; charset=UTF-8; name="zlib.patch" Content-Disposition: attachment; filename="zlib.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3N5cy9jb250cmliL3psaWIvenV0aWwuaCBiL3N5cy9jb250cmliL3ps aWIvenV0aWwuaAppbmRleCA4MzRkMzA2MzRjMTcuLmZmY2QwODgzZjY5YSAxMDA2NDQKLS0t IGEvc3lzL2NvbnRyaWIvemxpYi96dXRpbC5oCisrKyBiL3N5cy9jb250cmliL3psaWIvenV0 aWwuaApAQCAtMjksNiArMjksMTAgQEAKICMgIGluY2x1ZGUgPHN0ZGxpYi5oPgogI2VuZGlm CiAKKyNpZiBkZWZpbmVkKF9fRnJlZUJTRF9fKSAmJiBkZWZpbmVkKFpfU09MTykgJiYgIWRl ZmluZWQoU1REQykKKyMgIGRlZmluZSBaX1U4IF9fdWludDY0X3QKKyNlbmRpZgorCiAjaWZu ZGVmIGxvY2FsCiAjICBkZWZpbmUgbG9jYWwgc3RhdGljCiAjZW5kaWYK --------------9gTfJvKUgNwEz70D070Bb609--