--- ./wrlib/x86_specific.c.00	2004-10-31 02:44:01.000000000 +0100
+++ ./wrlib/x86_specific.c	2007-07-10 19:28:51.000000000 +0200
@@ -98,16 +98,25 @@
                            int height,
                            int line_offset)
 {
-    long long rrggbbaa;
-    long long pixel;
-    short *tmp_err;
-    short *tmp_nerr;
-    int x;
-
-    asm volatile
-        (
-         "pushal                        \n\t"
-
+    union {
+      long long rrggbbaa;
+      struct {short int rr, gg, bb, aa;} words;
+    } rrggbbaa;
+    
+    union {
+      long long pixel;
+      struct {short int rr, gg, bb, aa;} words;
+    } pixel;
+
+     short *tmp_err;
+     short *tmp_nerr;
+     int x;
+ 
+     asm volatile
+         (
+    
+         "pushl %%ebx                        \n\t"
+ 
          // pack dr, dg and db into mm6
          "movl  %7, %%eax               \n\t"
          "movl  %8, %%ebx               \n\t"
@@ -290,7 +299,7 @@
 
 ".Enda:                                 \n\t" // THE END
          "emms                          \n\t"
-         "popal                         \n\t"
+         "popl %%ebx                         \n\t"
          :
          :
          "m" (image),                      // %0
@@ -309,17 +318,18 @@
          "m" (width),                      // %13
          "m" (height),                     // %14
          "m" (line_offset),                // %15
-         "m" (rrggbbaa),                   // %16 (access to rr)
-         "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-         "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-         "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-         "m" (pixel),                      // %20 (access to pixel.r)
-         "m" ((*((short*)(&pixel)+1))),    // %21 (access to pixel.g)
-         "m" ((*((short*)(&pixel)+2))),    // %22 (access to pixel.b)
-         "m" ((*((short*)(&pixel)+3))),    // %23 (access to pixel.a)
-         "m" (tmp_err),                    // %24
-         "m" (tmp_nerr),                   // %25
-         "m" (x)                           // %26
+	 "m" (rrggbbaa.rrggbbaa),          // %16 (access to rr)
+         "m" (rrggbbaa.words.gg),          // %17 (access to gg)
+         "m" (rrggbbaa.words.bb),          // %18 (access to bb)
+         "m" (rrggbbaa.words.aa),          // %19 (access to aa)
+         "m" (pixel.pixel),                // %20 (access to pixel.r)
+         "m" (pixel.words.gg),             // %21 (access to pixel.g)
+         "m" (pixel.words.bb),             // %22 (access to pixel.b)
+         "m" (pixel.words.aa),             // %23 (access to pixel.a)
+          "m" (tmp_err),                    // %24
+          "m" (tmp_nerr),                   // %25
+          "m" (x)                           // %26
+       : "eax", "ecx", "edx", "esi", "edi"                     // %26
         );
 }
 
@@ -342,11 +352,19 @@
                            int height,
                            int line_offset)
 {
-    long long rrggbbaa;
-    long long pixel;
+    union {
+      long long rrggbbaa;
+      struct {short int rr, gg, bb, aa;} words;
+    } rrggbbaa;
+    
+    union {
+      long long pixel;
+      struct {short int rr, gg, bb, aa;} words;
+    } pixel;
+ 
+     short *tmp_err;
+     short *tmp_nerr;
 
-    short *tmp_err;
-    short *tmp_nerr;
 
     int x;
     int w1;
@@ -354,7 +372,7 @@
 
     asm volatile
         (
-         "pushal                        \n\t"
+         "pushl %%ebx                        \n\t"
 
          "movl %13, %%eax               \n\t" // eax = width
          "movl %%eax, %%ebx             \n\t"
@@ -424,7 +442,7 @@
 
 ".Endc:                                 \n\t" // THE END
          "emms                          \n\t"
-         "popal                         \n\t"
+         "popl %%ebx                         \n\t"
          :
          :
          "m" (image),                      // %0
@@ -443,19 +461,20 @@
          "m" (width),                      // %13
          "m" (height),                     // %14
          "m" (line_offset),                // %15
-         "m" (rrggbbaa),                   // %16 (access to rr)
-         "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-         "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-         "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-         "m" (pixel),                      // %20 (access to pixel.r)
-         "m" ((*((short*)(&pixel)+1))),    // %21 (access to pixel.g)
-         "m" ((*((short*)(&pixel)+2))),    // %22 (access to pixel.b)
-         "m" ((*((short*)(&pixel)+3))),    // %23 (access to pixel.a)
-         "m" (tmp_err),                    // %24
-         "m" (tmp_nerr),                   // %25
-         "m" (x),                          // %26
-         "m" (w1),                         // %27
-         "m" (w2)                          // %28
+         "m" (rrggbbaa.rrggbbaa),          // %16 (access to rr)
+         "m" (rrggbbaa.words.gg),          // %17 (access to gg)
+         "m" (rrggbbaa.words.bb),          // %18 (access to bb)
+         "m" (rrggbbaa.words.aa),          // %19 (access to aa)
+         "m" (pixel.pixel),                // %20 (access to pixel.r)
+         "m" (pixel.words.gg),             // %21 (access to pixel.g)
+         "m" (pixel.words.bb),             // %22 (access to pixel.b)
+         "m" (pixel.words.aa),             // %23 (access to pixel.a)
+          "m" (tmp_err),                    // %24
+          "m" (tmp_nerr),                   // %25
+          "m" (x),                          // %26
+          "m" (w1),                         // %27
+	  "m" (w2)                          // %28
+       : "eax", "ecx", "edx", "esi", "edi"
         );
 }
 
--- ./configure.ac.00	2005-01-06 16:31:40.000000000 +0100
+++ ./configure.ac	2007-07-10 19:12:58.000000000 +0200
@@ -197,10 +197,10 @@
 
     AC_CACHE_CHECK(whether gcc supports x86 inline asm,
                    ac_cv_c_inline_asm,
-                   [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n"::
-                          "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
-                          "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
-                   ac_cv_c_inline_asm=yes,
+                   [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
+                           "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
+                           "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
+		   ac_cv_c_inline_asm=yes,
                    ac_cv_c_inline_asm=no)])
 
     if test "x$ac_cv_c_inline_asm" = xyes; then