make sparc64 assembler happier

Changed files:
    X11-sparc64-asmfix.patch -> 1.1
    X11.spec -> 1.114

diff --git a/X11-sparc64-asmfix.patch b/X11-sparc64-asmfix.patch
new file mode 100644 (file)
index 0000000..040460d
--- /dev/null
+++ b/X11-sparc64-asmfix.patch
@@ -0,0 +1,52 @@
+diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/clip.S X11-modified/xc/extras/Mesa/src/mesa/sparc/clip.S
+--- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/clip.S     2005-02-04 01:21:38 +0000
++++ X11-modified/xc/extras/Mesa/src/mesa/sparc/clip.S  2005-02-02 22:29:00 +0000
+@@ -25,7 +25,7 @@
+ #define VEC_SIZE_3    7
+ #define VEC_SIZE_4    15
+ 
+-#ifdef SVR4
++#if defined(SVR4) || defined(__sparc_v9__)
+         /* Solaris requires this for 64-bit. */
+         .register %g2, #scratch
+         .register %g3, #scratch
+diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S X11-modified/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S
+--- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S      2005-02-04 01:21:39 +0000
++++ X11-modified/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S   2005-02-02 22:25:31 +0000
+@@ -17,6 +17,12 @@
+ .data
+ .align 64
+ 
++#if defined(SVR4) || defined(__sparc_v9__)
++        /* Solaris requires this for 64-bit. */
++         .register %g2, #scratch
++         .register %g3, #scratch
++#endif
++
+ .globl _mesa_sparc_glapi_begin
+ .type _mesa_sparc_glapi_begin,#function
+ _mesa_sparc_glapi_begin:
+diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/norm.S X11-modified/xc/extras/Mesa/src/mesa/sparc/norm.S
+--- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/norm.S     2005-02-04 01:21:39 +0000
++++ X11-modified/xc/extras/Mesa/src/mesa/sparc/norm.S  2005-02-02 22:29:24 +0000
+@@ -2,7 +2,7 @@
+ 
+ #include "sparc_matrix.h"
+ 
+-#ifdef SVR4
++#if defined(SVR4) || defined(__sparc_v9__)
+       /* Solaris requires this for 64-bit. */
+       .register %g2, #scratch
+       .register %g3, #scratch
+diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/xform.S X11-modified/xc/extras/Mesa/src/mesa/sparc/xform.S
+--- X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/xform.S    2004-06-16 09:19:25 +0000
++++ X11-modified/xc/extras/Mesa/src/mesa/sparc/xform.S 2005-02-02 22:27:14 +0000
+@@ -18,7 +18,7 @@
+ 
+ #include "sparc_matrix.h"
+ 
+-#ifdef SVR4
++#if defined(SVR4) || defined(__sparc_v9__)
+       /* Solaris requires this for 64-bit. */
+         .register %g2, #scratch
+         .register %g3, #scratch

diff --git a/X11.spec b/X11.spec
index ce67dd065e28d3b3a0a1985eafb0d7143171a907..177d70bee5f3d051b51744d4af426b763e883221 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -112,6 +112,7 @@ Patch31:    %{name}-i810fb.patch
 Patch33:       p_i810dri-memfix.diff
 Patch50:       %{name}-glibc-locale_sync.patch
 Patch60:       %{name}-oldkeyb.patch
+Patch61:       %{name}-sparc64-asmfix.patch
 # XFree86-tdfx-fix-vtswitch-font-corruption.patch - issue still not fixed,
 # but patch doesn't help either; however, it occurs in text mode only, not
 # with tdfxfb, which is worth using anyway
@@ -1966,6 +1967,7 @@ cd -
 %patch50 -p1
 %ifarch sparc sparc64
 %patch60 -p0
+%patch61 -p1
 %endif
 %{?with_dualhead:%patch100 -p1}