[PATCH] Headers for the x86 subtree

Tijl Coosemans tijl at coosemans.org
Thu Oct 28 22:00:41 UTC 2010


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 at 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 moving
>>>> 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 then
>>> 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.
>> 
>> 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?
> 
> I'm still doing testing, but this seems to be working so far.  I am
> moving mca.h as my current test.
> 
> Index: include/Makefile
> ===================================================================
> --- include/Makefile	(revision 214386)
> +++ include/Makefile	(working copy)
> @@ -116,8 +116,11 @@
>  .endfor
>  
>  .if ${MACHINE} != ${MACHINE_CPUARCH}
> -_MARCH=${MACHINE_CPUARCH}
> +_MARCHS=	${MACHINE_CPUARCH}
>  .endif
> +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
> +_MARCHS+=	x86
> +.endif

Can't MACHINE_CPUARCH be set to "x86" in the i386, amd64 and pc98
cases? This patch wouldn't be needed then.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 228 bytes
Desc: This is a digitally signed message part.
Url : http://lists.freebsd.org/pipermail/freebsd-arch/attachments/20101028/35e58f39/attachment.pgp


More information about the freebsd-arch mailing list