- use proper ifdefs for sparc64 instead of __sparc_v9__ defined for -mcpu=v9 32-bit...

Changed files:
    X11-sparc64-asmfix.patch -> 1.2
    X11-sparc64-v9fix.patch -> 1.2

diff --git a/X11-sparc64-asmfix.patch b/X11-sparc64-asmfix.patch
index 040460d406fa1b44782ef3548f0bd877bfb93cdf..c134e896809b3e6aee90dbdbdcf80c3c786b11bd 100644 (file)
--- a/X11-sparc64-asmfix.patch
+++ b/X11-sparc64-asmfix.patch
@@ -6,7 +6,7 @@ diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/clip.S X11-modified/xc/extras/M
  #define VEC_SIZE_4    15
  
 -#ifdef SVR4
-+#if defined(SVR4) || defined(__sparc_v9__)
++#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__)
          /* Solaris requires this for 64-bit. */
          .register %g2, #scratch
          .register %g3, #scratch
@@ -17,7 +17,7 @@ diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/glapi_sparc.S X11-modified/xc/e
  .data
  .align 64
  
-+#if defined(SVR4) || defined(__sparc_v9__)
++#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__))
 +        /* Solaris requires this for 64-bit. */
 +         .register %g2, #scratch
 +         .register %g3, #scratch
@@ -34,7 +34,7 @@ diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/norm.S X11-modified/xc/extras/M
  #include "sparc_matrix.h"
  
 -#ifdef SVR4
-+#if defined(SVR4) || defined(__sparc_v9__)
++#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__))
        /* Solaris requires this for 64-bit. */
        .register %g2, #scratch
        .register %g3, #scratch
@@ -46,7 +46,7 @@ diff -ur X11-6.8.1/xc/extras/Mesa/src/mesa/sparc/xform.S X11-modified/xc/extras/
  #include "sparc_matrix.h"
  
 -#ifdef SVR4
-+#if defined(SVR4) || defined(__sparc_v9__)
++#if defined(SVR4) || (defined(__sparc__) && defined(__arch64__))
        /* Solaris requires this for 64-bit. */
          .register %g2, #scratch
          .register %g3, #scratch

diff --git a/X11-sparc64-v9fix.patch b/X11-sparc64-v9fix.patch
index a68b17115d21791a5ac2cb229b5ace2c974c0419..52eeaee7f8f3eef8f260275defafccb10c818e1c 100644 (file)
--- a/X11-sparc64-v9fix.patch
+++ b/X11-sparc64-v9fix.patch
@@ -6,7 +6,7 @@ diff -ur X11-6.8.1/xc/include/Xmd.h X11-modified/xc/include/Xmd.h
  #define WORD64                                /* 64-bit architecture */
  #endif
 +
-+#if defined(__sparc_v9__)
++#if defined(__sparc__) && defined(__arch64__)
 +#define __sparc64__
 +#endif
 +