From owner-svn-src-head@freebsd.org Wed Oct 24 14:44:35 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99E98FED008; Wed, 24 Oct 2018 14:44:35 +0000 (UTC) (envelope-from tsoome@me.com) Received: from pv33p00im-asmtp001.me.com (pv33p00im-asmtp001.me.com [17.142.194.250]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3989C95C5F; Wed, 24 Oct 2018 14:44:35 +0000 (UTC) (envelope-from tsoome@me.com) Received: from process-dkim-sign-daemon.pv33p00im-asmtp001.me.com by pv33p00im-asmtp001.me.com (Oracle Communications Messaging Server 8.0.2.2.20180531 64bit (built May 31 2018)) id <0PH300O0079SFE00@pv33p00im-asmtp001.me.com>; Wed, 24 Oct 2018 05:33:31 +0000 (GMT) Received: from icloud.com ([127.0.0.1]) by pv33p00im-asmtp001.me.com (Oracle Communications Messaging Server 8.0.2.2.20180531 64bit (built May 31 2018)) with ESMTPSA id <0PH3004IW8RK7L00@pv33p00im-asmtp001.me.com>; Wed, 24 Oct 2018 05:33:23 +0000 (GMT) X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810240050 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-10-24_03:,, signatures=0 Content-type: text/plain; charset=us-ascii MIME-version: 1.0 (Mac OS X Mail 12.0 \(3445.100.39\)) Subject: Re: svn commit: r339673 - head/stand/libsa From: Toomas Soome In-reply-to: <201810232311.w9NNBc4n031783@repo.freebsd.org> Date: Wed, 24 Oct 2018 08:33:19 +0300 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-transfer-encoding: quoted-printable Message-id: <4893BA79-ED08-401E-9AFD-4A9BD71A076C@me.com> References: <201810232311.w9NNBc4n031783@repo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3445.100.39) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2018 14:44:35 -0000 > On 24 Oct 2018, at 02:11, Konstantin Belousov wrote: >=20 > Author: kib > Date: Tue Oct 23 23:11:38 2018 > New Revision: 339673 > URL: https://svnweb.freebsd.org/changeset/base/339673 >=20 > Log: > Fix stand/ build after r339671. >=20 > ffs_subr.c requires calculate_crc32c() from libkern. Unfortunately = we > cannot just add libkern/crc32.c to libstand because crc32.o is = already > compiled from contrib/zlib/crc32.c. Use the include trick to rename > the source. >=20 > Note that libstand also provides crc32.c which seems to be unused. It is used by part.c, by the GPT functions. However, if we have = non-optional compile case for crc32, it is not hard to update part.c and = drop the unused instance. rgds, toomas >=20 > Reviewed by: imp > Sponsored by: The FreeBSD Foundation > Differential revision: https://reviews.freebsd.org/D17677 >=20 > Added: > head/stand/libsa/crc32_libkern.c (contents, props changed) > Modified: > head/stand/libsa/Makefile >=20 > Modified: head/stand/libsa/Makefile > = =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/stand/libsa/Makefile Tue Oct 23 21:43:41 2018 = (r339672) > +++ head/stand/libsa/Makefile Tue Oct 23 23:11:38 2018 = (r339673) > @@ -155,9 +155,9 @@ SRCS+=3Dffs_subr.c ffs_tables.c >=20 > CFLAGS.bzipfs.c+=3D -I${SRCTOP}/contrib/bzip2 >=20 > -# explicit_bzero > +# explicit_bzero and calculate_crc32c > .PATH: ${SYSDIR}/libkern > -SRCS+=3D explicit_bzero.c > +SRCS+=3D explicit_bzero.c crc32_libkern.c >=20 > # Maybe GELI > .if ${MK_LOADER_GELI} =3D=3D "yes" >=20 > Added: head/stand/libsa/crc32_libkern.c > = =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 > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/stand/libsa/crc32_libkern.c Tue Oct 23 23:11:38 2018 = (r339673) > @@ -0,0 +1,3 @@ > +/* $FreeBSD$ */ > + > +#include "../../sys/libkern/crc32.c" >=20