Remove some linux-specific musl headers (#17704)

We don't implement any of the functions declared in these headers, so there is not real use them, and I think it can be misleading to allow them to be included at compile time. See #17638
emscripten-core · Aug 24, 2022 · 655ad88 · 655ad88
1 parent d4cf40c
commit 655ad88
Show file tree

Hide file tree

Showing 33 changed files with 34 additions and 1,074 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -25,6 +25,9 @@ See docs/process.md for more on how version tagging works.
   wasm/JS interface.  These function are no longer exported in all cases.  If
   your code directly calls these functions from JS, you can add them to
   `-sEXPORTED_RUNTIME_METHODS`.
+- Several linux-specific headers were removed from the emscripten sysroot. None
+  of the functionality in these headers was ever supported by emscripten. For
+  example `sys/soundcard.h` and `sys/ptrace.h`. (#17704)
 
 3.1.19 - 08/17/2022
 -------------------

diff --git a/system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -59,7 +59,7 @@
 #include <signal.h>
 #include <sys/mman.h>
 #include <sys/param.h>
-#if !SANITIZER_SOLARIS
+#if !SANITIZER_SOLARIS && !SANITIZER_EMSCRIPTEN
 #include <sys/ptrace.h>
 #endif
 #include <sys/resource.h>

diff --git a/system/lib/libc/musl/arch/emscripten/bits/reg.h b/system/lib/libc/musl/arch/emscripten/bits/reg.h
@@ -1,19 +1,6 @@
 #undef __WORDSIZE
+#ifdef __wasm64__
+#define __WORDSIZE 64
+#else
 #define __WORDSIZE 32
-#define EBX 0
-#define ECX 1
-#define EDX 2
-#define ESI 3
-#define EDI 4
-#define EBP 5
-#define EAX 6
-#define DS 7
-#define ES 8
-#define FS 9
-#define GS 10
-#define ORIG_EAX 11
-#define EIP 12
-#define CS 13
-#define EFL 14
-#define UESP 15
-#define SS 16
+#endif
diff --git a/system/lib/libc/musl/arch/generic/bits/io.h b/system/lib/libc/musl/arch/generic/bits/io.h
diff --git a/system/lib/libc/musl/arch/generic/bits/kd.h b/system/lib/libc/musl/arch/generic/bits/kd.h
diff --git a/system/lib/libc/musl/arch/generic/bits/ptrace.h b/system/lib/libc/musl/arch/generic/bits/ptrace.h
diff --git a/system/lib/libc/musl/arch/generic/bits/soundcard.h b/system/lib/libc/musl/arch/generic/bits/soundcard.h
diff --git a/system/lib/libc/musl/arch/generic/bits/vt.h b/system/lib/libc/musl/arch/generic/bits/vt.h
diff --git a/system/lib/libc/musl/include/sys/auxv.h b/system/lib/libc/musl/include/sys/auxv.h
diff --git a/system/lib/libc/musl/include/sys/cachectl.h b/system/lib/libc/musl/include/sys/cachectl.h
diff --git a/system/lib/libc/musl/include/sys/epoll.h b/system/lib/libc/musl/include/sys/epoll.h
diff --git a/system/lib/libc/musl/include/sys/eventfd.h b/system/lib/libc/musl/include/sys/eventfd.h
diff --git a/system/lib/libc/musl/include/sys/fanotify.h b/system/lib/libc/musl/include/sys/fanotify.h
diff --git a/system/lib/libc/musl/include/sys/fsuid.h b/system/lib/libc/musl/include/sys/fsuid.h
diff --git a/system/lib/libc/musl/include/sys/inotify.h b/system/lib/libc/musl/include/sys/inotify.h
diff --git a/system/lib/libc/musl/include/sys/io.h b/system/lib/libc/musl/include/sys/io.h
diff --git a/system/lib/libc/musl/include/sys/kd.h b/system/lib/libc/musl/include/sys/kd.h