Date: Fri, 29 Oct 2010 17:35:50 +0200 From: Tijl Coosemans <tijl@coosemans.org> To: freebsd-arch@freebsd.org Cc: Attilio Rao <attilio@freebsd.org>, Warner Losh <imp@freebsd.org> Subject: Re: [PATCH] Headers for the x86 subtree Message-ID: <201010291735.59702.tijl@coosemans.org> In-Reply-To: <201010290940.17353.jhb@freebsd.org> References: <AANLkTiktoYyxmE8nyGeoc4_ov35fR7iN83444MfhYg-e@mail.gmail.com> <201010282331.19825.tijl@coosemans.org> <201010290940.17353.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart2362348.uCLvzsYlJ3 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable On Friday 29 October 2010 15:40:17 John Baldwin wrote: > On Thursday, October 28, 2010 5:31:09 pm Tijl Coosemans wrote: >> On Thursday 28 October 2010 16:13:02 John Baldwin wrote: >>> On Thursday, October 28, 2010 3:44:21 am Attilio Rao wrote: >>>> 2010/10/27 John Baldwin <jhb@freebsd.org>: >>>>> On Wednesday, October 27, 2010 10:56:06 am Attilio Rao wrote: >>>>>> This patch should convert a (simple and 100% shared between amd64 and >>>>>> i386 header) under the x86 sub-tree. Please note that in this patch I >>>>>> "svn cp" the file from sys/amd64/include/mptable.h into >>>>>> sys/x86/include/mptable.h: >>>>>> http://www.freebsd.org/~attilio/headers-x86.diff >>>>>> >>>>>> This is someway a POC, that I really want to get in. The idea is >>>>>> simple and someway follows the pc98 case (even if not entirely): the >>>>>> files under machine/include/* became just mere stubs for x86/include= /* >>>>>> contents and redirect there. >>>>>> This won't particulary help reducing the number of available files, >>>>>> but generally removing verbatim and would also be the way to go for >>>>>> handling MFCs. >>>>>> If you find this is the right way I'll commit the fix and start movi= ng >>>>>> other files as time permits. >>>>> >>>>> No, we want to do this differently because we also want this to work = in >>>>> userland. (e.g. I'd like to outright move mca.h to x86/include and t= hen >>>>> use '#include <x86/mca.h>' in both kernel and userland for it). We'd >>>>> need >>>>> some special glue to setup an 'x86' symlink during a kernel build that >>>>> points to @/x86/include as we do now to setup an 'i386' link for pc98 >>>>> kernels. >>>>> >>>>> We'd also need to install the x86 headers into /usr/include during an >>>>> installworld. Warner has some more pointers on this I think. >>>>=20 >>>> I spoke with Warner briefly about it. >>>> One question I'm having now, though, is how getting co-living of pc98 >>>> and x86 now, as we are basically overriding the same infrastructure >>>> (MACHINE_CPUARCH) in the i386/amd64 case? >>>> Do you have ideas about that? >>>=20 >>> I'm still doing testing, but this seems to be working so far. I am >>> moving mca.h as my current test. >>>=20 >>> Index: include/Makefile >>> =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 >>> --- include/Makefile (revision 214386) >>> +++ include/Makefile (working copy) >>> @@ -116,8 +116,11 @@ >>> .endfor >>> =20 >>> .if ${MACHINE} !=3D ${MACHINE_CPUARCH} >>> -_MARCH=3D${MACHINE_CPUARCH} >>> +_MARCHS=3D ${MACHINE_CPUARCH} >>> .endif >>> +.if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUARCH} =3D=3D "amd= 64" >>> +_MARCHS+=3D x86 >>> +.endif >>=20 >> Can't MACHINE_CPUARCH be set to "x86" in the i386, amd64 and pc98 >> cases? This patch wouldn't be needed then. >=20 > As Warner said, we aren't quite ready for that yet. However, even if we > do that, pc98 would need further help as it still needs /usr/include/i386 > installed. So that will require a code along the lines of: >=20 > .if ${MACHINE} !=3D ${MACHINE_CPUARCH} > _MARCHS=3D ${MACHINE_CPUARCH} > .endif > .if ${MACHINE} !=3D ${MACHINE_ARCH} && ${MACHINE_ARCH} !=3D ${MACHINE_CPU= ARCH} > _MARCHS+=3D ${MACHINE_ARCH} > .endif >=20 > With pc98 having MACHINE=3Dpc98, MACHINE_ARCH=3Di386, MACHINE_CPUARCH=3Dx= 86. Ok, thanks. I'm interested in this mainly because to get "cc -m32" working on amd64, i386 headers would have to be installed there as well. I sent a patch similar to yours to this list a few months ago: http://lists.freebsd.org/pipermail/freebsd-arch/2010-August/010559.html http://people.freebsd.org/~tijl/cc-m32-2.diff One of the problems I encountered was that the build of kdump generates a file that includes all headers containing ioctl definitions. Both i386 and amd64 headers got included which caused conflicts. Moving common headers under x86 would solve that. --nextPart2362348.uCLvzsYlJ3 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iF4EABEIAAYFAkzK6d8ACgkQfoCS2CCgtiuYfwEAha9vverIJeemVNMWgoDKA0gJ IAtmCVZBu/Nv08I86LAA/3lA1XQiA+c9JLYjn4FZ7Uw02F8wIN9rrC0Jp6wr4+0s =BPo7 -----END PGP SIGNATURE----- --nextPart2362348.uCLvzsYlJ3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010291735.59702.tijl>