From owner-svn-src-all@freebsd.org Wed Aug 26 04:29:17 2020 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 D01713C8872 for ; Wed, 26 Aug 2020 04:29:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BbtDF1jMQz4dr1 for ; Wed, 26 Aug 2020 04:29:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x744.google.com with SMTP id n129so819908qkd.6 for ; Tue, 25 Aug 2020 21:29:17 -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=Gj157nNKMmeLBMhI3AEB/Kw2EnCdzo8k6+So0EVQ7rE=; b=wyNl/n5yYCERGkaU2Mim71564Ec0e+bPmYDY6fStUNVc2ACjR7asmGJHpcr9sOIdTa QkE1pX6iz0pNMN4hdc3o5ffE3jnOnSYs2rs2sBSdLaaqib4XNNZJxPU0KTvtTAmB5vOj LeMR57QYb45tdbwLn3Z1otd0BgJiZx7ijRs0xOeLk4whIfAhmpuyoU8uy3Mzs7Ou1vKo Upae8dcmAspgIt3dQJanyhQaw24EDH95D4AgWLcvBg74DWxNlXEkz0cAd9rQuwqAfSMf c3zOlcwRh79DkvXyDmOzRhhmS9ndIWf7qJ4n76/KocMZpBXL+5nLbHbHsPP5hpY9cYw4 H4EQ== 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=Gj157nNKMmeLBMhI3AEB/Kw2EnCdzo8k6+So0EVQ7rE=; b=XYAletOz5PjawV/MpWNTh581kjAlvNQfz54cLqmPGEFQZUUspDd3fJn1ev//o50N0g Iw3fKR7Z21iyHlaGOZq/fnNuzBgWTg5KsCqyhpPk3ga5VYQK2L2FjEB/VTF4pwqfoA2d vEn0Qp6fJEYKi1cmZpT7FAGAjgjyBVFDqOwOIPl4219WNpWH/4a1v/EAFZgSi0N8Kygp rl4nN+rKn1CfrslUh7FS+uEf2TzPq1JVDG5DABDEv37DPkHpE1WfApL60a76VqV9i3a6 XjCbPqsjqMn5M1HGFpxMVEsLaSMxvr89oSKk8NT5/SDegZaU6ic6c56Ei4C82KEIi/a/ 5YWw== X-Gm-Message-State: AOAM533KwMUbFHOXMyoCjBLDHW7ncYu3bovA/BsJtiax+ljvOwhj8LRV R8dF5Nu1UzffK5tKAp+3S2cji7o9p7MkGXmTCOS3ug== X-Google-Smtp-Source: ABdhPJw3WpYM1P9MOZDzOvIa/m01rovvbwGIx+Ff/NWt07vkxOqJtoEVbyI37Nlbl/HnHzKOP+czgx9SLeRC/amt2CU= X-Received: by 2002:a37:b801:: with SMTP id i1mr11624345qkf.240.1598416155953; Tue, 25 Aug 2020 21:29:15 -0700 (PDT) MIME-Version: 1.0 References: <202008251904.07PJ4srL068863@repo.freebsd.org> <20200825201736.GC43898@spindle.one-eyed-alien.net> In-Reply-To: <20200825201736.GC43898@spindle.one-eyed-alien.net> From: Warner Losh Date: Tue, 25 Aug 2020 22:29:03 -0600 Message-ID: Subject: Re: svn commit: r364781 - in head/sys: conf modules/zfs To: Brooks Davis Cc: Brandon Bergren , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4BbtDF1jMQz4dr1 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=wyNl/n5y; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::744) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-0.62 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.23)[-0.226]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.10)[0.102]; NEURAL_HAM_LONG(-0.50)[-0.495]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::744:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-all]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Wed, 26 Aug 2020 04:29:17 -0000 Got diffs? Warner On Tue, Aug 25, 2020, 2:17 PM Brooks Davis wrote: > On Tue, Aug 25, 2020 at 07:04:54PM +0000, Brandon Bergren wrote: > > Author: bdragon > > Date: Tue Aug 25 19:04:54 2020 > > New Revision: 364781 > > URL: https://svnweb.freebsd.org/changeset/base/364781 > > > > Log: > > [PowerPC] More preemptive powerpcspe ZFS build fixes > > > > I went through the merge and found the rest of the instances where > > ${MACHINE_ARCH} == "powerpc" was being used to detect 32-bit and > adjusted > > the rest of the instances to also check for powerpcspe. > > > > mips32* will probably want to do the same. > > > > Sponsored by: Tag1 Consulting, Inc. > > > > Modified: > > head/sys/conf/kern.pre.mk > > head/sys/modules/zfs/Makefile > > > > Modified: head/sys/conf/kern.pre.mk > > > ============================================================================== > > --- head/sys/conf/kern.pre.mk Tue Aug 25 18:54:10 2020 (r364780) > > +++ head/sys/conf/kern.pre.mk Tue Aug 25 19:04:54 2020 (r364781) > > @@ -257,7 +257,7 @@ ZFS_CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 > -DHAVE_ > > .endif > > > > .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ > > - ${MACHINE_ARCH} == "arm" > > + ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" > > ZFS_CFLAGS+= -DBITS_PER_LONG=32 > > .else > > ZFS_CFLAGS+= -DBITS_PER_LONG=64 > > In CheriBSD we've added a MACHINE_ABI variable that could be used to > simplify this mess of checks. > > > https://github.com/CTSRD-CHERI/cheribsd/blob/5ee735e5f8ef7268731359a2d8a9a8218df2d23f/share/mk/bsd.cpu.mk#L478 > > As currently implemented you'd use: > > .if ${MACHINE_ABI:Mptr64} > > There's be a argument for adding long32 and long64 for to avoid > conflating long and pointer size. > > -- Brooks >