From owner-svn-src-head@freebsd.org Wed Oct 24 14:52:19 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 71A1EFED539 for ; Wed, 24 Oct 2018 14:52:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe33.google.com (mail-vs1-xe33.google.com [IPv6:2607:f8b0:4864:20::e33]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0DC8F962FF for ; Wed, 24 Oct 2018 14:52:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe33.google.com with SMTP id e126so3335572vsc.9 for ; Wed, 24 Oct 2018 07:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=U9bwDUvVVHpqMxCMFLDrNRlABwzDmpwTiFvO8fWTAZE=; b=ooU8SiD8oQgDzdt3bDqr3IPNsl9ON4fdEbv4RahU5aQQkFu5w0TqXeR43U4taS5s6u RnrZJkAjX3TrEneEyta/S+IzprvlPOaMxbu09RH7FPMhe6wMwDcKgM76Ghgyi1nzeWEq 63bmr6C1l2HRm6NePLL1Kof7ZkqdjHgzqJm6hjzK4QejZNlt19TLWRxfQecbb/EtOxA7 Z2XUV2fVhuuItpoO1AOCeCaByFr03OA7Yqac6EJF+u1V2Ju9DhplIbo8wQ8S/myPOP/1 ILMb5OoHN3hfkN8AypRYh4q79SqKTMqZWbfrsZgng07X11jlJLQuKSCHJG4SoJ7uOYs6 ID0g== 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:from:date :message-id:subject:to:cc; bh=U9bwDUvVVHpqMxCMFLDrNRlABwzDmpwTiFvO8fWTAZE=; b=jwKv3dWaDjJoz4qBRztJMGXgG6p8kE8mrXC0oyzQjgalBJrf9uMsFezOhowYQQtzUg w6N5g50J7WaZUgmtYdR+/USes4Pdgv9+MODlPqhQPmzgafsj1Rq80TsaAtEXZTTeKZea PeHrXMKY1rXI0o3NWS6LXp+r0PYNi6IPHTMZBUETJYOlikVGxQp3X8Vdf2xfvmLX4Jwf bF5ecFog8dkZaglANuC7UnwdOnpacP21JheSxeWL2N5UtHFUA1BCXEU0Y+NvnpSPSyt5 KYkwBOrmU8CR1Wr6oLzXoTsP7cCIIfTGNeFZQSjkiflH/PT/dQwtpe8aSwakm2RWPK/C bLbQ== X-Gm-Message-State: AGRZ1gKPwbAom8O62NSDtEfNeNIAnfUnFCT6R0dB2zasHXtaUzulvTlB aRG9VvygVhz700oRW/YDhWlclMb8u/mnMO/7zcSKpTJh X-Google-Smtp-Source: AJdET5fedc1PJbkJEUOI+5roevN5DMGMN9bL1gmpUmnvaeO6cy0x6zwF7ZSaCT33MZjHOdUQ3X+djkMjPYeWqhOxVig= X-Received: by 2002:a67:2704:: with SMTP id n4mr1301220vsn.209.1540392738203; Wed, 24 Oct 2018 07:52:18 -0700 (PDT) MIME-Version: 1.0 References: <201810232311.w9NNBc4n031783@repo.freebsd.org> <4893BA79-ED08-401E-9AFD-4A9BD71A076C@me.com> In-Reply-To: <4893BA79-ED08-401E-9AFD-4A9BD71A076C@me.com> From: Warner Losh Date: Wed, 24 Oct 2018 08:52:06 -0600 Message-ID: Subject: Re: svn commit: r339673 - head/stand/libsa To: Toomas Soome Cc: Konstantin Belousov , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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:52:19 -0000 On Wed, Oct 24, 2018 at 8:44 AM Toomas Soome wrote: > > > > On 24 Oct 2018, at 02:11, Konstantin Belousov wrote: > > > > Author: kib > > Date: Tue Oct 23 23:11:38 2018 > > New Revision: 339673 > > URL: https://svnweb.freebsd.org/changeset/base/339673 > > > > Log: > > Fix stand/ build after r339671. > > > > 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. > > > > 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. > I need to go through all users to make sure that we can collapse down some of this insanity... Warner > rgds, > toomas > > > > > Reviewed by: imp > > Sponsored by: The FreeBSD Foundation > > Differential revision: https://reviews.freebsd.org/D17677 > > > > Added: > > head/stand/libsa/crc32_libkern.c (contents, props changed) > > Modified: > > head/stand/libsa/Makefile > > > > Modified: head/stand/libsa/Makefile > > > ============================================================================== > > --- 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+=ffs_subr.c ffs_tables.c > > > > CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 > > > > -# explicit_bzero > > +# explicit_bzero and calculate_crc32c > > .PATH: ${SYSDIR}/libkern > > -SRCS+= explicit_bzero.c > > +SRCS+= explicit_bzero.c crc32_libkern.c > > > > # Maybe GELI > > .if ${MK_LOADER_GELI} == "yes" > > > > Added: head/stand/libsa/crc32_libkern.c > > > ============================================================================== > > --- /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" > > > > >