Merge pull request #964 from no92/igt-gpu-tools

managarm · Jan 24, 2024 · 8ce375f · 8ce375f
2 parents a167601 + ce4ce72
commit 8ce375f
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 4 deletions.
diff --git a/abis/linux/signal.h b/abis/linux/signal.h
@@ -162,6 +162,7 @@ typedef struct __stack {
 #define SIGEV_SIGNAL 0
 #define SIGEV_NONE 1
 #define SIGEV_THREAD 2
+#define SIGEV_THREAD_ID 4
 
 #define SEGV_MAPERR 1
 #define SEGV_ACCERR 2
@@ -242,12 +243,15 @@ typedef struct __stack {
 #define NGREG 23
 #endif
 
+#include <bits/threads.h>
+
 struct sigevent {
 	union sigval sigev_value;
 	int sigev_notify;
 	int sigev_signo;
 	void (*sigev_notify_function)(union sigval);
-	// MISSING: sigev_notify_attributes
+	struct __mlibc_threadattr *sigev_notify_attributes;
+	pid_t sigev_notify_thread_id;
 };
 
 struct sigaction {

diff --git a/abis/linux/vm-flags.h b/abis/linux/vm-flags.h
@@ -13,7 +13,16 @@
 #define MAP_FIXED     0x10
 #define MAP_ANON      0x20
 #define MAP_ANONYMOUS 0x20
+#define MAP_GROWSDOWN 0x100
+#define MAP_DENYWRITE 0x800
+#define MAP_EXECUTABLE 0x1000
+#define MAP_LOCKED    0x2000
 #define MAP_NORESERVE 0x4000
+#define MAP_POPULATE  0x8000
+#define MAP_NONBLOCK  0x10000
+#define MAP_STACK     0x20000
+#define MAP_HUGETLB   0x40000
+#define MAP_SYNC      0x80000
 #define MAP_FIXED_NOREPLACE 0x100000
 
 #define MS_ASYNC 0x01
@@ -35,11 +44,27 @@
 #define MADV_WILLNEED 3
 #define MADV_DONTNEED 4
 #define MADV_FREE 8
+#define MADV_REMOVE 9
+#define MADV_DONTFORK 10
+#define MADV_DOFORK 11
+#define MADV_MERGEABLE 12
+#define MADV_UNMERGEABLE 13
+#define MADV_HUGEPAGE 14
+#define MADV_NOHUGEPAGE 15
+#define MADV_DONTDUMP 16
+#define MADV_DODUMP 17
+#define MADV_WIPEONFORK 18
+#define MADV_KEEPONFORK 19
+#define MADV_COLD 20
+#define MADV_PAGEOUT 21
+#define MADV_HWPOISON 100
+#define MADV_SOFT_OFFLINE 101
 
 #define MREMAP_MAYMOVE 1
 #define MREMAP_FIXED 2
 
 #define MFD_CLOEXEC 1U
 #define MFD_ALLOW_SEALING 2U
+#define MFD_HUGETLB 4U
 
 #endif // _ABIBITS_VM_FLAGS_H
diff --git a/options/ansi/generic/ctype-stubs.cpp b/options/ansi/generic/ctype-stubs.cpp
@@ -254,9 +254,34 @@ wctype_t wctype(const char *cs) {
 	return ct_null;
 }
 
-int iswctype(wint_t, wctype_t) {
-	__ensure(!"Not implemented");
-	__builtin_unreachable();
+int iswctype(wint_t wc, wctype_t type) {
+	switch (type) {
+		case ct_alnum:
+			return iswalnum(wc);
+		case ct_alpha:
+			return iswalpha(wc);
+		case ct_blank:
+			return iswblank(wc);
+		case ct_cntrl:
+			return iswcntrl(wc);
+		case ct_digit:
+			return iswdigit(wc);
+		case ct_graph:
+			return iswgraph(wc);
+		case ct_lower:
+			return iswlower(wc);
+		case ct_print:
+			return iswprint(wc);
+		case ct_punct:
+			return iswpunct(wc);
+		case ct_space:
+			return iswspace(wc);
+		case ct_upper:
+			return iswupper(wc);
+		case ct_xdigit:
+			return iswxdigit(wc);
+	}
+	return 0;
 }
 
 // --------------------------------------------------------------------------------------

diff --git a/options/glibc/include/bits/glibc/glibc_signal.h b/options/glibc/include/bits/glibc/glibc_signal.h
@@ -9,6 +9,12 @@ extern "C" {
 
 int tgkill(int, int, int);
 
+#if defined(_GNU_SOURCE)
+
+typedef void (*sighandler_t)(int);
+
+#endif
+
 #endif /* !__MLIBC_ABI_ONLY */
 
 #ifdef __cplusplus

diff --git a/options/posix/generic/sys-msg.cpp b/options/posix/generic/sys-msg.cpp
@@ -11,3 +11,13 @@ int msgctl(int, int, struct msqid_ds *) {
 	__ensure(!"Not implemented");
 	__builtin_unreachable();
 }
+
+ssize_t msgrcv(int, void *, size_t, long, int) {
+	__ensure(!"Not implemented");
+	__builtin_unreachable();
+}
+
+int msgsnd(int, const void *, size_t, int) {
+	__ensure(!"Not implemented");
+	__builtin_unreachable();
+}
diff --git a/options/posix/include/sys/msg.h b/options/posix/include/sys/msg.h
@@ -2,6 +2,8 @@
 #define _SYS_MSG_H
 
 #include <abi-bits/msg.h>
+#include <bits/size_t.h>
+#include <bits/ssize_t.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,6 +15,9 @@ int msgget(key_t, int);
 
 int msgctl(int msqid, int cmd, struct msqid_ds *buf);
 
+ssize_t msgrcv(int, void *, size_t, long, int);
+int msgsnd(int, const void *, size_t, int);
+
 #endif /* !__MLIBC_ABI_ONLY */
 
 #ifdef __cplusplus