From owner-svn-src-all@freebsd.org Fri Oct 11 06:08:05 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 7E3B713E49E; Fri, 11 Oct 2019 06:08:05 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46qHYx2jbJz42d3; Fri, 11 Oct 2019 06:08:05 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-oi1-f171.google.com with SMTP id i16so7058205oie.4; Thu, 10 Oct 2019 23:08:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=iJ/9Vwm7iQlVqFQXN4dfdAyWQc3W+orWESRAGNV1biU=; b=k3evkgo8pm+SJQ0WlEEj0E8wTv15ddh36+/ObKjVBCUsQABSixAweQbL2eYhI7UW+Q gtok+95xG7Zz30dJGoSvHkAMhKyUqlg6AUj+RC8+nnDdwITRomgGeCvI/rYugVn4TUS4 IeJOHRM0ZBM7IaKmhsO1gg5p+NWbr1FURm622oRfJ2fJs3CXpvP6NN0Ksm5UYJjQ3CWm Q3KhoYGKhGUnXtm5b7lI76uLODU46mc4/zVkb2rT03XovfEyxVBsXuCN59Jima2gAxLQ GPyMRSBkgavRJVst+FjYVILT6Qk3Kev2tAIBN+39wM6sY7UpA5lxaxjWFy5jPhxVLBfJ Jm0A== X-Gm-Message-State: APjAAAXCUMDcNBxGK8rZO4CC+h9iuSouWULIKjTOakdS/8eRfFG69+zU xRfSY61xrMukK2s5yhBlSowlGi1z X-Google-Smtp-Source: APXvYqz77HglZ4AQMFDFqSEtHckFEnxsBcUDBGzCxzorfBfl9bE2Lt8Jwxf5A/glU47MI0r+rdgo4A== X-Received: by 2002:aca:5ed4:: with SMTP id s203mr10494129oib.149.1570774083834; Thu, 10 Oct 2019 23:08:03 -0700 (PDT) Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com. [209.85.210.41]) by smtp.gmail.com with ESMTPSA id 13sm2270761oij.25.2019.10.10.23.08.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Oct 2019 23:08:03 -0700 (PDT) Received: by mail-ot1-f41.google.com with SMTP id 41so6986554oti.12; Thu, 10 Oct 2019 23:08:03 -0700 (PDT) X-Received: by 2002:a9d:708e:: with SMTP id l14mr11155531otj.135.1570774083440; Thu, 10 Oct 2019 23:08:03 -0700 (PDT) MIME-Version: 1.0 References: <201910101629.x9AGTDkJ024957@repo.freebsd.org> In-Reply-To: <201910101629.x9AGTDkJ024957@repo.freebsd.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Thu, 10 Oct 2019 23:07:52 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r353408 - head To: Brooks Davis Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 46qHYx2jbJz42d3 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 06:08:05 -0000 Fwiw, this doesn=E2=80=99t seem to fix the NO_CLEAN build for amd64-xtoolch= ain-gcc. On Thu, Oct 10, 2019 at 09:29 Brooks Davis wrote: > 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.c > 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_atomic"= ; > \ > + 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" ] && \ >