Add support for x32 (from the Yocto project)

Origin: vendor
Forwarded: no
Bug-Debian: 702183
Last-Update: 2013-05-06

Gbp-Pq: Name 00_arches_x32.patch

diff --git a/harness/main.c b/harness/main.c
index 99232ef14ca3569452ad289233fe2a2588917850..ce760cd43269cf7c7cd479a822190cfa612a95fe 100644 (file)
--- a/harness/main.c
+++ b/harness/main.c
@@ -14,7 +14,7 @@
 #if __LP64__ == 0
 #if defined(__i386__) || defined(__powerpc__) || defined(__mips__)
 #define KERNEL_RW_POINTER      ((void *)0xc0010000)
-#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__)
+#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__) || defined(__x86_64__)
 #define KERNEL_RW_POINTER      ((void *)0x00010000)
 #elif defined(__hppa__)
 #define KERNEL_RW_POINTER      ((void *)0x10100000)

diff --git a/src/syscall-x86_64.h b/src/syscall-x86_64.h
index 0eccef342e2a47b2a0849079a86ed521681db3de..fd71da9a0d4f36e2c3e56c37eb5d2703fc1f1c50 100644 (file)
--- a/src/syscall-x86_64.h
+++ b/src/syscall-x86_64.h
@@ -1,6 +1,16 @@
+#ifndef __NR_io_setup
 #define __NR_io_setup          206
+#endif
+#ifndef __NR_io_destroy
 #define __NR_io_destroy                207
+#endif
+#ifndef __NR_io_getevents
 #define __NR_io_getevents      208
+#endif
+#ifndef __NR_io_submit
 #define __NR_io_submit         209
+#endif
+#ifndef __NR_io_cancel
 #define __NR_io_cancel         210
+#endif
 #define __NR_io_pgetevents     333