- finall fix.

Changed files:
    SDL-gcc-pr21398-workaround.patch -> 1.3
    SDL-gcc4.patch -> 1.2

diff --git a/SDL-gcc-pr21398-workaround.patch b/SDL-gcc-pr21398-workaround.patch
deleted file mode 100644 (file)
index 5a0fc78..0000000
--- a/SDL-gcc-pr21398-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SDL-1.2.8/include/SDL_endian.h.orig        2004-12-13 08:54:30.000000000 +0100
-+++ SDL-1.2.8/include/SDL_endian.h     2005-05-05 16:03:06.823294344 +0200
-@@ -68,8 +68,7 @@
- #elif defined(__GNUC__) && defined(__x86_64__)
- static __inline__ Uint16 SDL_Swap16(Uint16 x)
- {
--      __asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
--      return x;
-+      return ((x >> 8) | (x << 8));   /* gcc4 emits rolw $8,reg16 */
- }
- #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
- static __inline__ Uint16 SDL_Swap16(Uint16 x)

diff --git a/SDL-gcc4.patch b/SDL-gcc4.patch
index 4bddce437cf4c5e03286ae54fb287da4f642a6df..4bd1893cc1fe893d9aace7f33a841250c89029b0 100644 (file)
--- a/SDL-gcc4.patch
+++ b/SDL-gcc4.patch
@@ -104,3 +104,14 @@
  
    #ifdef __cplusplus
    }
+--- SDL-1.2.8/include/SDL_endian.h.orig        2004-12-13 08:54:30.000000000 +0100
++++ SDL-1.2.8/include/SDL_endian.h     2005-05-05 16:41:59.000000000 +0200
+@@ -68,7 +68,7 @@
+ #elif defined(__GNUC__) && defined(__x86_64__)
+ static __inline__ Uint16 SDL_Swap16(Uint16 x)
+ {
+-      __asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
++      __asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
+       return x;
+ }
+ #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))