bi-arch on an amd64

[Alex Woods]

I suppose I should have actually attached the patch too..

-- 
Alex
-------------- next part --------------
diff -urN wine-20050111.orig/configure.ac wine-20050111/configure.ac
--- wine-20050111.orig/configure.ac	2005-01-10 13:26:33.000000000 +0000
+++ wine-20050111/configure.ac	2005-02-07 11:37:34.247339872 +0000
@@ -978,7 +978,7 @@
         fi
 
         case $host_cpu in
-          *i[[3456789]]86*)
+          *[[3456789x]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x77f00000], ac_cv_ld_reloc_exec,
               [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x77f00400],
                                ac_cv_ld_reloc_exec="yes", ac_cv_ld_reloc_exec="no")])
@@ -1073,7 +1073,7 @@
 case $host_os in
   linux*)
     case $host_cpu in
-      *i[[3456789]]86*) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread wine-preloader") ;;
+      *[[3456789x]]86*) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread wine-preloader") ;;
       *) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread") ;;
     esac
     AC_SUBST(MAIN_BINARY,"wine-glibc")
@@ -1454,7 +1454,7 @@
 dnl *** check for the need to define platform-specific symbols
 
 case $host_cpu in
-  *i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;;
+  *[[3456789x]]86*) WINE_CHECK_DEFINE([__i386__]) ;;
   *alpha*)          WINE_CHECK_DEFINE([__ALPHA__]) ;;
   *sparc*)          WINE_CHECK_DEFINE([__sparc__]) ;;
   *powerpc*)        WINE_CHECK_DEFINE([__powerpc__]) ;;
diff -urN wine-20050111.orig/dlls/ntdll/signal_i386.c wine-20050111/dlls/ntdll/signal_i386.c
--- wine-20050111.orig/dlls/ntdll/signal_i386.c	2004-12-02 18:19:25.000000000 +0000
+++ wine-20050111/dlls/ntdll/signal_i386.c	2005-02-07 11:38:06.779394248 +0000
@@ -111,7 +111,7 @@
                           "int $0x80\n\t"
                           "popl %%ebx"
                           : "=a" (sig)
-                          : "0" (SYS_sigaction), "S" (sig), "c" (new), "d" (old) );
+                          : "0" (SYS_rt_sigaction), "S" (sig), "c" (new), "d" (old) );
     if (sig>=0) return 0;
     errno = -sig;
     return -1;