From owner-svn-src-all@freebsd.org Fri Sep 25 23:05:39 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 343143E7E60 for ; Fri, 25 Sep 2020 23:05:39 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) (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 4BynZV2lwtz3TLY for ; Fri, 25 Sep 2020 23:05:38 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f68.google.com with SMTP id c18so5627385wrm.9 for ; Fri, 25 Sep 2020 16:05:38 -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:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=qCDekzWHAYPKQIhj99K3J/gSHc/DgquZNKuYOleYhHM=; b=f1CiinbGzLfB4EPKAAzBhU+ub7IVzHOVx4RdbHxzddAPEx4pS32SgXgwa0+0t3XBGM 5GY4tTyVaf0YAQ6exi0cVa2mD/+/p+JgAnnjPMlgGUWLjitKCH1A14T90ni03ePexzjA QafZ8LJAhvyouKvdtr+lQpnCYtRXSTd1hnzNaHz1QW9TuRUIRCp78vbZwCtdMMACYZVq eTML8iukiKlRjJP/RuGMqYjIuDKMq/iaTZcnjWZ1r4TixW3rdrIAHIQYqY/UCtZ+Mbeo /Zwk5WvlTxhGTSWRDk0MzJImo3RntaeWAP9jKyHVx1crFKdd/ggmCfT3Vp8asHbzUc9m c5aA== X-Gm-Message-State: AOAM530NMEzQelFefMay9Wkrt1wEEEPgTcKPV3EUICFN9PTE6Nsp0CfX JZwQXuoxhYGtAwsmdL9+SvtQsg== X-Google-Smtp-Source: ABdhPJzITN3oM/HwWqPtnzr4j5kOsM0nd7I3WT0a1MK+9zOPtUCfgugfd2J1BIWHJKvDafYm3EAgZA== X-Received: by 2002:a5d:4247:: with SMTP id s7mr6628492wrr.167.1601075137013; Fri, 25 Sep 2020 16:05:37 -0700 (PDT) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id q4sm4321678wru.65.2020.09.25.16.05.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 16:05:35 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r366169 - head/sys/mips/include From: Jessica Clarke In-Reply-To: Date: Sat, 26 Sep 2020 00:05:33 +0100 Cc: Justin Hibbits , src-committers , svn-src-all , svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202009251904.08PJ431b029218@repo.freebsd.org> To: Alexander Richardson X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Rspamd-Queue-Id: 4BynZV2lwtz3TLY X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.11 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MV_CASE(0.50)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.66)[-0.657]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.97)[-0.973]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.984]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.68:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.68:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all] 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: Fri, 25 Sep 2020 23:05:39 -0000 On 26 Sep 2020, at 00:01, Alexander Richardson = wrote: >=20 >=20 > 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 >=20 > Log: > mips: Fix compat32 library builds from r366162 >=20 > Re-add the a_ptr and a_fcn fields to Elf32_Auxinfo. >=20 > MFC after: 1 week > Sponsored by: Juniper Networks, Inc. >=20 > Modified: > head/sys/mips/include/elf.h >=20 > Modified: head/sys/mips/include/elf.h > = =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/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=20 > 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; >=20 > Not sure what the current minimal compiler versions are, but maybe = this should be #if __SIZEOF_POINTER__ =3D=3D 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)? Jess