From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 16 May 2023 06:20:59 +0000 (+0200)
Subject: Linux regtest: fixes for building on musl x86
X-Git-Tag: VALGRIND_3_22_0~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5810a06d54c46ffe87052cc1c1c29252e1e6f29d;p=thirdparty%2Fvalgrind.git

Linux regtest: fixes for building on musl x86
---

diff --git a/memcheck/tests/x86-linux/scalar.c b/memcheck/tests/x86-linux/scalar.c
index 54d0e0443a..83ed38c4d9 100644
--- a/memcheck/tests/x86-linux/scalar.c
+++ b/memcheck/tests/x86-linux/scalar.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <signal.h>
-#include <linux/mman.h> // MREMAP_FIXED
+#include <sys/mman.h> // MREMAP_FIXED
 #include <sys/prctl.h>
 
 // Here we are trying to trigger every syscall error (scalar errors and
@@ -269,7 +269,7 @@ int main(void)
    SY(__NR_lock); FAIL;
 
    // __NR_ioctl 54
-   #include <asm/ioctls.h>
+   #include <sys/ioctl.h>
    GO(__NR_ioctl, "3s 1m");
    SY(__NR_ioctl, x0, x0+TCSETS, x0); FAIL;
 
diff --git a/none/tests/x86-linux/sigcontext.c b/none/tests/x86-linux/sigcontext.c
index dec1c8f60e..9dd8d34023 100644
--- a/none/tests/x86-linux/sigcontext.c
+++ b/none/tests/x86-linux/sigcontext.c
@@ -4,7 +4,7 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sys/ucontext.h>
-#include <asm/unistd.h>
+#include <syscall.h>
 
 #define VAL1 0x11223344
 #define VAL2 0x44332211