Fix 32-bit ISE 10.1 on 64-bit platform.

When trying to access a cable with this combination, ISE displays the
following error: "Cable operation is not supported when running the
32-bit version of the application on a 64-bit platform."

This is fixed by additionally overloading the uname function and replacing
x86_64 by i686 in the returned struct in the 32-bit version of this library.
The 64-bit version will still correctly return x86_64.

diff --git a/usb-driver.c b/usb-driver.c
index 5d1528e148abfad639963685d3b88b699a17d51d..def52dbf587cf7115f6ed679aab59d5a6cb03280 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -39,6 +39,8 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>

+#include <sys/utsname.h>
+#include <bits/wordsize.h>

 #include "usb-driver.h"
 #include "config.h"
 
 #include "usb-driver.h"
 #include "config.h"
 


@@ -937,3 +939,21 @@ int access(const char *pathname, int mode) {
                return (*func)(pathname, mode);
        }
 }
                return (*func)(pathname, mode);
        }
 }

+
+#if __WORDSIZE == 32
+int uname (struct utsname *__name) {
+       static int (*func) (struct utsname*);
+       int ret;
+
+       if (!func)
+               func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname");
+       
+       ret = (*func)(__name);
+
+       if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) {
+               strcpy(__name->machine, "i686");
+       }
+       
+       return ret;
+}
+#endif