From owner-svn-src-all@freebsd.org Fri Oct 11 16:54:47 2019 Return-Path: Delivered-To: svn-src-all@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 79A1D155A8A; Fri, 11 Oct 2019 16:54:47 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46qYw64tQcz3Kwc; Fri, 11 Oct 2019 16:54:46 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 432E93C0199; Fri, 11 Oct 2019 16:54:40 +0000 (UTC) Date: Fri, 11 Oct 2019 16:54:40 +0000 From: Brooks Davis To: Conrad Meyer Cc: Brooks Davis , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r353408 - head Message-ID: <20191011165440.GA53377@spindle.one-eyed-alien.net> References: <201910101629.x9AGTDkJ024957@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 46qYw64tQcz3Kwc X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-6.50 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; IP_SCORE(-3.60)[ip: (-9.39), ipnet: 199.48.128.0/22(-4.68), asn: 36236(-3.85), country: US(-0.05)]; R_SPF_NA(0.00)[]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2019 16:54:47 -0000 --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable It worked for a default non-CROSS_TOOLCHAIN build, but I didn't test for repeatably or in other configurations. Enhancements welcome. -- Brooks On Thu, Oct 10, 2019 at 11:07:52PM -0700, Conrad Meyer wrote: > Fwiw, this doesn???t seem to fix the NO_CLEAN build for amd64-xtoolchain-= gcc. >=20 > On Thu, Oct 10, 2019 at 09:29 Brooks Davis wrote: >=20 > > Author: brooks > > Date: Thu Oct 10 16:29:13 2019 > > New Revision: 353408 > > URL: https://svnweb.freebsd.org/changeset/base/353408 > > > > Log: > > Fix -DNO_CLEAN build across r353340 and r353381 > > > > opensolaris_atomic.S is now only used on i386 with opensolaris_atomic= =2Ec > > used on other platforms. After r353381 it doesn't exist on those > > platforms so the stale dependency would result in a build error. > > > > Modified: > > head/Makefile.inc1 > > > > Modified: head/Makefile.inc1 > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/Makefile.inc1 Thu Oct 10 16:04:43 2019 (r353407) > > +++ head/Makefile.inc1 Thu Oct 10 16:29:13 2019 (r353408) > > @@ -949,7 +949,18 @@ _sanity_check: .PHONY .MAKE > > # replacing generated files. Handle these cases here in an ad-hoc > > fashion. > > _cleanobj_fast_depend_hack: .PHONY > > # Syscall stubs rewritten in C and obsolete MD assembly implementations > > -# Date SVN Rev Syscalls > > +# Date SVN Rev Syscalls/Changes > > +# 20191009 r353340 removal of opensolaris_atomic.S (also r353381) > > +.if ${MACHINE} !=3D i386 > > +.for f in opensolaris_atomic > > + @if [ -e "${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o" ] && \ > > + egrep -qw 'opensolaris_atomic\.S' > > ${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o; then \ > > + echo "Removing stale dependencies for opensolaris_atomi= c"; > > \ > > + rm -f ${OBJTOP}/cddl/lib/libzpool/.depend.${f}.* \ > > + > > ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/cddl/lib/libzpool/.depend.${f}.*}; \ > > + fi > > +.endfor > > +.endif > > # 20190925 r352689 removal of obsolete i386 memchr.S > > .for f in memchr > > @if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \ > > --opJtzjQTFsWo+cga Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJdoLPPAAoJEKzQXbSebgfAzdYH/0dMYbC//UXyYo1ot8ZdkI19 LLZR8koIL+6NtzucaIdUsrcp6LUiXsgAHi2kMqTEtbT31CvRaDKJaxcHfqz7HrxD Bq4OIRVnEzkI9qYyCCHbW8Jl/O/37pDj4J9KN0XyxP9+5nUHga9W7YqEx6expTly z/ltFi4jKDAkYeCyT56+lVTIQtsaA9JuqZ4bUl3srmSQ6Gxj0JpyHsWJJcZ9uf0P 8fCRMxP9CkyfU5jV6fZx3/0psN37dGIKQKJDgusP48RmjE9ZdqPPKrk0I3xO2cuk MmQzq0tjY+Jz9Ou6VkPaxd2NjOgW+BPd3C+nbU7SnNsZ13Ke0zPXR9wRRheHmyw= =49vw -----END PGP SIGNATURE----- --opJtzjQTFsWo+cga--