From nobody Fri Dec 3 18:35:01 2021 X-Original-To: freebsd-current@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 242FA18C1550 for ; Fri, 3 Dec 2021 18:35:23 +0000 (UTC) (envelope-from evgeniy@khramtsov.org) Received: from mxa.khramtsov.org (mxa.khramtsov.org [IPv6:2a0a:e5c0:2:10f::f]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4J5M2L0gvYz3Ngd; Fri, 3 Dec 2021 18:35:19 +0000 (UTC) (envelope-from evgeniy@khramtsov.org) Received: from mxa.khramtsov.org (mxa.khramtsov.org [IPv6:2a0a:e5c0:2:10f::f]) by mxa.khramtsov.org (Postfix) with ESMTP id 852761260CD; Fri, 3 Dec 2021 18:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khramtsov.org; s=rsa; t=1638556416; 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; bh=kZ8yAYI2+oOfhAzabLh9MKvGm2N+3xrgI6Voqpy7Jrw=; b=La8+mCYBfGvuXzNDOJ3BqOzhi/5l4bAwAZjfJ2Ha21pRS3R1MQ7Vo7Vgfo52lJf9F1EnDO yChaYntW1WoVF9W6dP76bypbv2j2GRmaAuwAS241x13w36ghtSkNJYPOSmGToeOfZHFcGH Mw6gJ8KPQeNoM0n0H7j5RWrTIRv/4ZDgldy0GYpAm3LuoMiIlZFODLpWFISEFG2JOirqkC scU9aHwHVGpdI76L2McTaVLaK0DX2kUCoU7Z59nLrwu9dwB6X9QzQyozT5FLRrbdFJB+Kj dJpNyTpJ2V+bEIGJS+rUAiFh5HAYe95xq6oyiODUVGrUy43vLzx1zydrHM9KjQ== Date: Fri, 3 Dec 2021 21:35:01 +0300 To: FreeBSD-CURRENT@FreeBSD.org Cc: Kirk McKusick Subject: lib/libufs: build regressed after b366ee486 Message-ID: <20211203183501.zyroidvh3t4kk2g7@vax.khramtsov.org> List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4J5M2L0gvYz3Ngd X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=khramtsov.org header.s=rsa header.b=La8+mCYB; dmarc=pass (policy=reject) header.from=khramtsov.org; spf=pass (mx1.freebsd.org: domain of evgeniy@khramtsov.org designates 2a0a:e5c0:2:10f::f as permitted sender) smtp.mailfrom=evgeniy@khramtsov.org X-Spamd-Result: default: False [-3.80 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[khramtsov.org:s=rsa]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a0a:e5c0:2:10f::f]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[khramtsov.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[khramtsov.org,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_COUNT_ONE(0.00)[1]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:207996, ipnet:2a0a:e5c0:2::/48, country:CH]; ONCE_RECEIVED(0.10)[] Reply-To: evgeniy@khramtsov.org From: Evgeniy Khramtsov via FreeBSD-CURRENT X-Original-From: Evgeniy Khramtsov X-ThisMailContainsUnwantedMimeParts: N I was updating from commit 20aa359773befc8182f6b5dcb5aad7390cab6c26 Author: Dimitry Andric Date: Sat Nov 13 21:02:29 2021 +0100 Bump __FreeBSD_version for llvm-project 13.0.0 merge PR: 258209 MFC after: 2 weeks to commit b366ee4868bca2b3ebe4bb29c9590a29b6cecc29 (main) Author: Kirk McKusick Date: Sun Nov 14 22:09:06 2021 -0800 Consolodate four copies of the STDSB define into a single place. The STDSB macro is passed to the ffs_sbget() routine to fetch a UFS/FFS superblock "from the stadard place". It was identically defined in lib/libufs/libufs.h, stand/libsa/ufs.c, sys/ufs/ffs/ffs_extern.h, and sys/ufs/ffs/ffs_subr.c. Delete it from these four files and define it instead in sys/ufs/ffs/fs.h. All existing uses of this macro already include sys/ufs/ffs/fs.h so no include changes need to be made. No functional change intended. Sponsored by: Netflix $ cd lib/libufs $ make [...] /usr/local/llvm13/bin/clang -O2 -pipe -fno-common -D_LIBUFS -I/usr/src/lib/libufs -g -gz=zlib -MD -MF.depend.sblock.o -MTsblock.o -std=gnu99 -Wno-format-zero-length -fstack-protector-strong -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=unused-but-set-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunused-arguments -c sblock.c -o sblock.o sblock.c:59:38: error: use of undeclared identifier 'STDSB' if ((errno = sbget(disk->d_fd, &fs, STDSB)) != 0) { ^ 1 error generated. *** Error code 1 Stop. make: stopped in /usr/src/lib/libufs [...] My environment is custom (hard to bisect at the moment), but the most major local modification to base that I have is devel/llvm13 as toolchain. make.conf: LLVM=/usr/local/llvm13/bin ADDR2LINE=${LLVM}/llvm-addr2line AR=${LLVM}/llvm-ar AS=${LLVM}/llvm-as CC=${LLVM}/clang CPP=${LLVM}/clang-cpp CPPFILT=${LLVM}/llvm-cxxfilt CXX=${LLVM}/clang++ DTRACEFLAGS+=-x cpppath=${CPP} -x ldpath=${LD} LD=${LLVM}/ld LLVM_LINK=${LLVM}/llvm-link NM=${LLVM}/llvm-nm OBJC=${LLVM}/clang OBJCOPY=${LLVM}/llvm-objcopy OBJDUMP=${LLVM}/llvm-objdump RANLIB=${LLVM}/llvm-ranlib READELF=${LLVM}/llvm-readelf SIZE=${LLVM}/llvm-size STRINGS=${LLVM}/llvm-strings STRIPBIN=${LLVM}/llvm-strip STRIP_CMD=${STRIPBIN} src.conf: WITHOUT_CLANG=yes WITHOUT_CLANG_BOOTSTRAP=yes # elftoolchain utils manually deleted, todo: have a knob to turn off build WITHOUT_ELFTOOLCHAIN_BOOTSTRAP=yes WITHOUT_LLD=yes WITHOUT_LLDB=yes WITHOUT_LLD_BOOTSTRAP=yes WITHOUT_LLVM_COV=yes