From owner-svn-src-head@freebsd.org Sat Sep 26 04:12:22 2020 Return-Path: Delivered-To: svn-src-head@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 7F99A3F33CF for ; Sat, 26 Sep 2020 04:12:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 4BywNP3L71z43hh for ; Sat, 26 Sep 2020 04:12:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72f.google.com with SMTP id s131so660262qke.0 for ; Fri, 25 Sep 2020 21:12:21 -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=Gmifkqft2+knsQ87NgCSjYBXZilALfXR3KUrMI+/07k=; b=FhTg1rG3MCghHHkOHt8sGYsxMmaIhno3T2LVCNlJ5jMXDyndGf9Qjc/ByqM3qTOMBF F7vRD+0gMHQ5rsoDs132HhmFmHg4g1LMkvyxPehrIRcHNc4ylNhunpBNNlql97uYUqzI V9VOUTFu38vF3yXIT21AN6PH2FqB7uR+ra9NrKEqNjCUXoYamSL4QpVTudmgYFStloLM yZbERq3hoEdMFyzwylcMgUhu60jEvqyzcWkZzg3i6NHBt27nlLt3rmuD7isHpooOs65P iPz+DkXc1FYQQGVfVrRbosXYTjyJnE+wKxB51B9uRm/nath7rK3hTAuFXbYzKZZ3v4Ru yTpw== 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=Gmifkqft2+knsQ87NgCSjYBXZilALfXR3KUrMI+/07k=; b=Pn/3phjR5g6CHm7S4dly72Z7zs4kSGpfFsUbmsoud8M+a6Z7jXM4l4J7lfH2ETDTF1 tIQnX9l1n9TTpaUjwPjT2LzCI0Qbz4UqOZHL7WT6ONe/BK5bnyqQLh6zEmHzB3v2IfKU m/X5i7AgTYyKYnVpTlEziBxpyXLR4+fzi52Ooj4KasIFIWd4VtWHUwAlEu2Kc90mkbsK gLCQvw3A4N5YshCZkITVr6XMby4iMisHCOeN5XLCPNAJ7BwSVsyEm1bLybRCFYd+JOM4 NgcYVGVhiJbEG/4NjiX56KEGErJocxEr/m5zZeYsSbU3boGs9dAYRLdMCuFhu7mgbFv5 2c7w== X-Gm-Message-State: AOAM532y8XGtwxEb8icOPM7iehHQRX9qm4xqJ5b7/PomyYf83whEPb3a McaxmTQbrVVqDJu6hACN3IYHO49KDzRQCEXCx6JvVA== X-Google-Smtp-Source: ABdhPJwDBxPfqEheSd9LtG/nIQrDTX0RKRlRctf98h8N0Gb80/Db/SydjCWeP91TK7MhZCmy8LPNJDWIN13zBgMRl5M= X-Received: by 2002:a37:638d:: with SMTP id x135mr3223797qkb.60.1601093540372; Fri, 25 Sep 2020 21:12:20 -0700 (PDT) MIME-Version: 1.0 References: <202009251904.08PJ431b029218@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 25 Sep 2020 22:12:09 -0600 Message-ID: Subject: Re: svn commit: r366169 - head/sys/mips/include To: Jessica Clarke Cc: Alexander Richardson , Justin Hibbits , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4BywNP3L71z43hh X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=FhTg1rG3; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72f) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.79 / 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.96)[-0.958]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.08)[0.079]; NEURAL_HAM_LONG(-0.91)[-0.910]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72f: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-head]; 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-head@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 26 Sep 2020 04:12:22 -0000 On Fri, Sep 25, 2020 at 5:05 PM Jessica Clarke wrote: > On 26 Sep 2020, at 00:01, Alexander Richardson > wrote: > > > > > > On Fri, 25 Sep 2020, 20:04 Justin Hibbits, wrote: > > Author: jhibbits > > Date: Fri Sep 25 19:04:03 2020 > > New Revision: 366169 > > URL: https://svnweb.freebsd.org/changeset/base/366169 > > > > Log: > > mips: Fix compat32 library builds from r366162 > > > > Re-add the a_ptr and a_fcn fields to Elf32_Auxinfo. > > > > MFC after: 1 week > > Sponsored by: Juniper Networks, Inc. > > > > Modified: > > head/sys/mips/include/elf.h > > > > Modified: head/sys/mips/include/elf.h > > > ============================================================================== > > --- head/sys/mips/include/elf.h Fri Sep 25 19:02:49 2020 (r366168) > > +++ head/sys/mips/include/elf.h Fri Sep 25 19:04:03 2020 (r366169) > > @@ -105,6 +105,10 @@ typedef struct { /* Auxiliary vector entry on > initial > > int a_type; /* Entry type. */ > > union { > > int a_val; /* Integer value. */ > > +#ifndef __mips_n64 > > + void *a_ptr; /* Address. */ > > + void (*a_fcn)(void); /* Function pointer (not used). > */ > > +#endif > > } a_un; > > } Elf32_Auxinfo; > > > > Not sure what the current minimal compiler versions are, but maybe this > should be #if __SIZEOF_POINTER__ == 4 instead of checking the ABI? This > would break CHERI-MIPS kernels since we don't define __mips_n64 for the > pure-capability ABI (128-bit pointers). However, we don't really do compat > 32 right now so it probably doesn't matter much. > > Or why not just #if defined(__mips_o32) || defined(__mips_n32)? I think we use that in other places for just this issue.... Warner