Revert "syscall"

Revert an incomplete commit that got published accidentally.

diff --git a/memcheck/tests/arm64-linux/scalar.h b/memcheck/tests/arm64-linux/scalar.h
index 3dbfa79673401b761e0285704098ac31f0742704..9008816d6e87eda83332028e016ff630831b2a7b 100644 (file)
--- a/memcheck/tests/arm64-linux/scalar.h
+++ b/memcheck/tests/arm64-linux/scalar.h
@@ -1,3 +1,6 @@
+/* This is the arm64 variant of memcheck/tests/x86-linux/scalar.h */
+#include "../../../include/vki/vki-scnums-arm64-linux.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -8,7 +11,10 @@
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <unistd.h>
+
+// Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
+// declare this ourselves.
+extern long int syscall (long int __sysno, ...) __THROW;
 
 // Thorough syscall scalar arg checking.  Also serves as thorough checking
 // for (very) basic syscall use.  Generally not trying to do anything

diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h
index 3dbfa79673401b761e0285704098ac31f0742704..ef28b035508cf5c3d358b239e3f78b5dee582ea5 100644 (file)
--- a/memcheck/tests/x86-linux/scalar.h
+++ b/memcheck/tests/x86-linux/scalar.h
@@ -1,3 +1,5 @@
+#include "../../../include/vki/vki-scnums-x86-linux.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -8,7 +10,10 @@
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <unistd.h>
+
+// Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
+// declare this ourselves.
+extern long int syscall (long int __sysno, ...) __THROW;
 
 // Thorough syscall scalar arg checking.  Also serves as thorough checking
 // for (very) basic syscall use.  Generally not trying to do anything