r5053 - in trunk: BOOK/introduction/welcome BOOK/x/installing patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Sep 10 17:23:56 PDT 2005


Author: randy
Date: 2005-09-10 18:23:55 -0600 (Sat, 10 Sep 2005)
New Revision: 5053

Added:
   trunk/patches/X11R6.8.2-src-gcc4-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/xorg.xml
Log:
Added a GCC-4 patch to the Xorg instructions

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 22:52:52 UTC (rev 5052)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-11 00:23:55 UTC (rev 5053)
@@ -45,6 +45,9 @@
       <para>September 10th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a GCC-4 patch to the Xorg instructions.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to DocBook XSL Stylesheets-1.69.1.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2005-09-10 22:52:52 UTC (rev 5052)
+++ trunk/BOOK/x/installing/xorg.xml	2005-09-11 00:23:55 UTC (rev 5053)
@@ -86,6 +86,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/X11R&xorg-version;-src-gcc4-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Xorg Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -184,6 +192,17 @@
     <title>Installation of Xorg</title>
 
     <sect3>
+      <title>Patching to be Compatible with GCC-4.x</title>
+
+      <para>The <application>Xorg</application> sources must be patched in
+      order to be compiled using <application>GCC</application>-4.x. Install
+      the following patch:</para>
+
+<screen><userinput>patch -Np1 -i ../X11R&xorg-version;-src-gcc4-1.patch</userinput></screen>
+
+    </sect3>
+
+    <sect3>
       <title>Suppressing Xprint-related Modification to '/etc'</title>
 
       <para><application>Xorg</application> insists on putting

Added: trunk/patches/X11R6.8.2-src-gcc4-1.patch
===================================================================
--- trunk/patches/X11R6.8.2-src-gcc4-1.patch	2005-09-10 22:52:52 UTC (rev 5052)
+++ trunk/patches/X11R6.8.2-src-gcc4-1.patch	2005-09-11 00:23:55 UTC (rev 5053)
@@ -0,0 +1,163 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-09
+Initial Package Version: 6.8.2
+Upstream Status:         Not submitted
+Origin:                  Fedora Development CVS
+Description:             Fixes GCC4 compilation issues
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur xc-orig/programs/Xserver/fb/fbmmx.c xc/programs/Xserver/fb/fbmmx.c
+--- xc-orig/programs/Xserver/fb/fbmmx.c	2004-07-22 19:24:50.000000000 +0000
++++ xc/programs/Xserver/fb/fbmmx.c	2005-08-09 04:58:35.000000000 +0000
+@@ -29,6 +29,8 @@
+ 
+ #ifdef RENDER
+ 
++#include <mmintrin.h>
++
+ #include "picturestr.h"
+ #include "mipict.h"
+ #include "fbpict.h"
+@@ -48,6 +50,10 @@
+ #define CHECKPOINT()
+ #endif
+ 
++#define mmx_and(a,b)	((Vector1x64)_mm_and_si64((__m64)(a),(__m64)(b)))
++#define mmx_or(a,b)	((Vector1x64)_mm_or_si64((__m64)(a),(__m64)(b)))
++#define mmx_xor(a,b)	((Vector1x64)_mm_xor_si64((__m64)(a),(__m64)(b)))
++
+ typedef struct
+ {
+     ullong mmx_zero;
+@@ -102,7 +108,7 @@
+ static __inline__ Vector4x16
+ negate (Vector4x16 mask)
+ {
+-    return (Vector4x16)__builtin_ia32_pxor (
++    return (Vector4x16)mmx_xor (
+ 	(Vector1x64)mask,
+ 	(Vector1x64)c.mmx_4x00ff);
+ }
+@@ -163,9 +169,9 @@
+ 
+     t1 = shift ((Vector1x64)pixel, -48);
+     t2 = shift (t1, 16);
+-    t1 = __builtin_ia32_por (t1, t2);
++    t1 = mmx_or (t1, t2);
+     t2 = shift (t1, 32);
+-    t1 = __builtin_ia32_por (t1, t2);
++    t1 = mmx_or (t1, t2);
+ 
+     return (Vector4x16)t1;
+ }
+@@ -178,9 +184,9 @@
+     t1 = shift ((Vector1x64)pixel,  48);
+     t1 = shift (t1, -48);
+     t2 = shift (t1, 16);
+-    t1 = __builtin_ia32_por (t1, t2);
++    t1 = mmx_or (t1, t2);
+     t2 = shift (t1, 32);
+-    t1 = __builtin_ia32_por (t1, t2);
++    t1 = mmx_or (t1, t2);
+ 
+     return (Vector4x16)t1;
+ }
+@@ -192,15 +198,15 @@
+ 
+     x = y = z = (Vector1x64)pixel;
+ 
+-    x = __builtin_ia32_pand (x, (Vector1x64)c.mmx_ffff0000ffff0000);
+-    y = __builtin_ia32_pand (y, (Vector1x64)c.mmx_000000000000ffff);
+-    z = __builtin_ia32_pand (z, (Vector1x64)c.mmx_0000ffff00000000);
++    x = mmx_and (x, (Vector1x64)c.mmx_ffff0000ffff0000);
++    y = mmx_and (y, (Vector1x64)c.mmx_000000000000ffff);
++    z = mmx_and (z, (Vector1x64)c.mmx_0000ffff00000000);
+ 
+     y = shift (y, 32);
+     z = shift (z, -32);
+ 
+-    x = __builtin_ia32_por (x, y);
+-    x = __builtin_ia32_por (x, z);
++    x = mmx_or (x, y);
++    x = mmx_or (x, z);
+ 
+     return (Vector4x16)x;
+ }
+@@ -234,7 +240,7 @@
+ over_rev_non_pre (Vector4x16 src, Vector4x16 dest)
+ {
+     Vector4x16 srca = expand_alpha (src);
+-    Vector4x16 srcfaaa = (Vector4x16)__builtin_ia32_por((Vector1x64)srca, (Vector1x64)c.mmx_full_alpha);
++    Vector4x16 srcfaaa = (Vector4x16)mmx_or((Vector1x64)srca, (Vector1x64)c.mmx_full_alpha);
+ 
+     return over(pix_multiply(invert_colors(src), srcfaaa), srca, dest);
+ }
+@@ -300,9 +306,9 @@
+     Vector1x64 t1 = shift (p, 36 - 11);
+     Vector1x64 t2 = shift (p, 16 - 5);
+     
+-    p = __builtin_ia32_por (t1, p);
+-    p = __builtin_ia32_por (t2, p);
+-    p = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_rgb);
++    p = mmx_or (t1, p);
++    p = mmx_or (t2, p);
++    p = mmx_and (p, (Vector1x64)c.mmx_565_rgb);
+     
+     pixel = __builtin_ia32_pmullw ((Vector4x16)p, (Vector4x16)c.mmx_565_unpack_multiplier);
+     return __builtin_ia32_psrlw (pixel, 8);
+@@ -324,27 +330,27 @@
+     Vector1x64 t = (Vector1x64)target;
+     Vector1x64 r, g, b;
+     
+-    r = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_r);
+-    g = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_g);
+-    b = __builtin_ia32_pand (p, (Vector1x64)c.mmx_565_b);
++    r = mmx_and (p, (Vector1x64)c.mmx_565_r);
++    g = mmx_and (p, (Vector1x64)c.mmx_565_g);
++    b = mmx_and (p, (Vector1x64)c.mmx_565_b);
+     
+     r = shift (r, - (32 - 8) + pos * 16);
+     g = shift (g, - (16 - 3) + pos * 16);
+     b = shift (b, - (0  + 3) + pos * 16);
+ 
+     if (pos == 0)
+-	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_0);
++	t = mmx_and (t, (Vector1x64)c.mmx_mask_0);
+     else if (pos == 1)
+-	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_1);
++	t = mmx_and (t, (Vector1x64)c.mmx_mask_1);
+     else if (pos == 2)
+-	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_2);
++	t = mmx_and (t, (Vector1x64)c.mmx_mask_2);
+     else if (pos == 3)
+-	t = __builtin_ia32_pand (t, (Vector1x64)c.mmx_mask_3);
++	t = mmx_and (t, (Vector1x64)c.mmx_mask_3);
+     
+-    p = __builtin_ia32_por (r, t);
+-    p = __builtin_ia32_por (g, p);
++    p = mmx_or (r, t);
++    p = mmx_or (g, p);
+     
+-    return (Vector4x16)__builtin_ia32_por (b, p);
++    return (Vector4x16)mmx_or (b, p);
+ }
+ 
+ static __inline__ void
+
+
+diff -Naur xc-orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h
+--- xc-orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h	2004-08-03 09:38:03.000000000 +0000
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h	2005-08-09 04:58:35.000000000 +0000
+@@ -146,9 +146,6 @@
+ extern Bool                 RADEONProbe
+ 			    FunctionPrototype((DriverPtr, int));
+ 
+-extern SymTabRec            RADEONChipsets[];
+-extern PciChipsets          RADEONPciChipsets[];
+-
+ /* radeon_driver.c */
+ extern void                 RADEONLoaderRefSymLists
+ 			    FunctionPrototype((void));


Property changes on: trunk/patches/X11R6.8.2-src-gcc4-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list