From dd510c2b699dbe5cc3b6440b6e12505fe214e6bc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Sep 2006 12:48:43 +0000
Subject: Proper !i386 cross compilation support

---
 package/xorg/xorg-config.patch | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'package/xorg/xorg-config.patch')

diff --git a/package/xorg/xorg-config.patch b/package/xorg/xorg-config.patch
index 580362cd5..8f6861d8a 100644
--- a/package/xorg/xorg-config.patch
+++ b/package/xorg/xorg-config.patch
@@ -47,7 +47,7 @@
 +#define XInputDrivers		mouse keyboard
 --- xc/config/cf/cross.def~	Thu May 12 15:28:01 MDT 2005
 +++ xc/config/cf/cross.def	Thu May 12 15:28:01 MDT 2005
-@@ -1,45 +1,45 @@
+@@ -1,45 +1,63 @@
 -/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
 +/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */
  /*
@@ -57,10 +57,27 @@
   * given your local configuration.
   */
 -#if 0
--#undef i386Architecture
-+#define i386Architecture
++/* Undefine any architectures detected */
+ #undef i386Architecture
 -#define Arm32Architecture
++#undef AMD64Architecture
++#undef PpcArchitecture
++#undef SparcArchitecture
++#undef AlphaArchitecture
 +#undef Arm32Architecture
++#undef ia64Architecture
++#undef MipsArchitecture
++
++/* Cross compiling for: */
++#define REPLACE_XORG_ARCHArchitecture
++
++/* MTRR detection in linux.cf is exec'ed before cross.def, so redo it here */
++#undef HasMTRRSupport
++#if defined (i386Architecture) || defined (AMD64Architecture)
++# define HasMTRRSupport	YES
++#else
++# define HasMTRRSupport	NO	/* no for non-ix86 */
++#endif
  
  #undef OptimizedCDebugFlags
 -#define OptimizedCDebugFlags 	-O2
-- 
cgit v1.2.3