Re: compile librump/compat.o failed on amd64

[Nicolas Joly <njoly%pasteur.fr@localhost>]

On Sat, Jul 24, 2010 at 03:37:10PM +0200, Jean-Yves Migeon wrote:
> On 24.07.2010 09:00, KS wrote:
> >
> > Hi,
> >
> > after cvs updateing -current some minutes ago, build.sh ... distribution
> > for amd64 fails:
> >[snip]
> > and so on and so on...
> 
> Clean build.sh rumptest for i386 and amd64 did not raise that issue on
> my side.
> 
> Currently investigating.

This breaks while compiling compat stuff ... 32bit rump libraries.
Well amd64 should be pulling i386 pte.h for 32bit compilation.

The following patch should make the build goes further.

-- 
Nicolas Joly

Biological Software and Databanks.
Institut Pasteur, Paris.

Index: sys/arch/amd64/include/pte.h
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/include/pte.h,v
retrieving revision 1.7
diff -u -p -r1.7 pte.h
--- sys/arch/amd64/include/pte.h        6 Jul 2010 20:50:34 -0000       1.7
+++ sys/arch/amd64/include/pte.h        24 Jul 2010 15:10:53 -0000
@@ -38,6 +38,8 @@
 #ifndef _AMD64_PTE_H_
 #define _AMD64_PTE_H_
 
+#ifdef __x86_64__
+
 /*
  * amd64 MMU hardware structure:
  *
@@ -132,4 +134,10 @@ typedef uint64_t pt_entry_t;               /* PTE */
 
 #include <x86/pte.h>
 
+#else   /*      __x86_64__      */
+
+#include <i386/pte.h>
+
+#endif  /*      __x86_64__      */
+
 #endif /* _AMD64_PTE_H_ */