Date: Sat, 26 Sep 2020 00:05:33 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Alexander Richardson <arichardson@freebsd.org> Cc: Justin Hibbits <jhibbits@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head@freebsd.org Subject: Re: svn commit: r366169 - head/sys/mips/include Message-ID: <F8C2D040-4F4A-4AC6-A593-F47C96846C67@freebsd.org> In-Reply-To: <CA%2BZ_v8r-7mV%2BP=3v_Vp-B_pzs2%2BAG6pSw5MJyK68MBpDuApdKQ@mail.gmail.com> References: <202009251904.08PJ431b029218@repo.freebsd.org> <CA%2BZ_v8r-7mV%2BP=3v_Vp-B_pzs2%2BAG6pSw5MJyK68MBpDuApdKQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 26 Sep 2020, at 00:01, Alexander Richardson <arichardson@freebsd.org> = wrote: >=20 >=20 > On Fri, 25 Sep 2020, 20:04 Justin Hibbits, <jhibbits@freebsd.org> = 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F8C2D040-4F4A-4AC6-A593-F47C96846C67>