Do not specify linux architecture specific defines, most of these are defaults

now, and some cause issues on i386 for example.

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index e81d124337e882a22201b159ecb23bc59287bc74..c7975365c912a368fe25a869c24ed861844776bc 100644 (file)
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -153,6 +153,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 
 #define LinuxMachineDefines
 
+#if 0
 #ifdef i386Architecture
 #define OptimizedCDebugFlags   DefaultGcc2i386Opt
 #define LinuxMachineDefines    -D__i386__
@@ -178,6 +179,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define ServerOSDefines         XFree86ServerOSDefines -DDDXTIME -DPART_NET
 #define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
 #endif /* Mc68020Architecture */
+#endif /* 0 */
 
 #define StandardDefines                -Dlinux LinuxMachineDefines LinuxSourceDefines