From 5810a06d54c46ffe87052cc1c1c29252e1e6f29d Mon Sep 17 00:00:00 2001
From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 16 May 2023 08:20:59 +0200
Subject: [PATCH] Linux regtest: fixes for building on musl x86

---
 memcheck/tests/x86-linux/scalar.c | 4 ++--
 none/tests/x86-linux/sigcontext.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/memcheck/tests/x86-linux/scalar.c b/memcheck/tests/x86-linux/scalar.c
index 54d0e0443..83ed38c4d 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 dec1c8f60..9dd8d3402 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
-- 
2.11.4.GIT