From owner-svn-src-head@freebsd.org Fri Sep 25 23:02:02 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 649AA3E7719; Fri, 25 Sep 2020 23:02:02 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 4BynVL0hrPz3Sgm; Fri, 25 Sep 2020 23:02:01 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id ay8so4132784edb.8; Fri, 25 Sep 2020 16:02:01 -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:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8N7fhfSTq0xtvSzupEEY3wcPdUUDTfuEr+UtJt+al4w=; b=ZjYAT2Mr/jcQst+yaRNH2HX58VZzXAmBi6qSySALuapwhQBYigzjOvr5b/PWAFsSUA H3lQhiqgCk7FQsiwr6Fb5K6jdSgYJtbmqD6bRdGMH4uurzIUaBKQbmc7U5BSaIitQAfI 472uSa7mxW5dMHeKQixispflsafwKg9BjcKoxiLEw25K2s2GemFmSwRgrznhkrOJyI/R AaqQ8IibCuDpeSDF2m5k1fsXpS8DeuxecOWMSKE8g2WiNVjpiLsrJ9rTPr2EoR3fGVua liRJ1JqGcxP4lrF5hwitPnf83SKl+EcyTD+anv9rMbjieUTJlLGVdBUpx9PqFSz7R6mK 6FwA== X-Gm-Message-State: AOAM531ct1yvOGZSAuPYvyBByj+xHyr+j9Aegjg/t+kNjm7Ksp9Cyjoh 5OMLZgpKkv3k2rfoAGsGqqI2KPjndHV1eg== X-Google-Smtp-Source: ABdhPJwzb2VocfYWSlQUIJyJCOjLNnuq6h+k/lqwk1Yy0mrW69pzvi4wgYO+xGxzOk5wB3c2zoxpOA== X-Received: by 2002:a50:fc91:: with SMTP id f17mr3995631edq.319.1601074920555; Fri, 25 Sep 2020 16:02:00 -0700 (PDT) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com. [209.85.221.42]) by smtp.gmail.com with ESMTPSA id b5sm2834000edq.69.2020.09.25.16.02.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Sep 2020 16:02:00 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id e16so5680723wrm.2; Fri, 25 Sep 2020 16:02:00 -0700 (PDT) X-Received: by 2002:a5d:6886:: with SMTP id h6mr6983279wru.374.1601074919985; Fri, 25 Sep 2020 16:01:59 -0700 (PDT) MIME-Version: 1.0 References: <202009251904.08PJ431b029218@repo.freebsd.org> In-Reply-To: <202009251904.08PJ431b029218@repo.freebsd.org> From: Alexander Richardson Date: Sat, 26 Sep 2020 00:01:48 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r366169 - head/sys/mips/include To: Justin Hibbits Cc: src-committers , svn-src-all , svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4BynVL0hrPz3Sgm X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; REPLY(-4.00)[] 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: Fri, 25 Sep 2020 23:02:02 -0000 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. Alex