Skip to content

Commit 655ad88

Browse files
authored
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
1 parent d4cf40c commit 655ad88

33 files changed

+34
-1074
lines changed

ChangeLog.md

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ See docs/process.md for more on how version tagging works.
2525
wasm/JS interface. These function are no longer exported in all cases. If
2626
your code directly calls these functions from JS, you can add them to
2727
`-sEXPORTED_RUNTIME_METHODS`.
28+
- Several linux-specific headers were removed from the emscripten sysroot. None
29+
of the functionality in these headers was ever supported by emscripten. For
30+
example `sys/soundcard.h` and `sys/ptrace.h`. (#17704)
2831

2932
3.1.19 - 08/17/2022
3033
-------------------

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#include <signal.h>
6060
#include <sys/mman.h>
6161
#include <sys/param.h>
62-
#if !SANITIZER_SOLARIS
62+
#if !SANITIZER_SOLARIS && !SANITIZER_EMSCRIPTEN
6363
#include <sys/ptrace.h>
6464
#endif
6565
#include <sys/resource.h>
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
#undef __WORDSIZE
2+
#ifdef __wasm64__
3+
#define __WORDSIZE 64
4+
#else
25
#define __WORDSIZE 32
3-
#define EBX 0
4-
#define ECX 1
5-
#define EDX 2
6-
#define ESI 3
7-
#define EDI 4
8-
#define EBP 5
9-
#define EAX 6
10-
#define DS 7
11-
#define ES 8
12-
#define FS 9
13-
#define GS 10
14-
#define ORIG_EAX 11
15-
#define EIP 12
16-
#define CS 13
17-
#define EFL 14
18-
#define UESP 15
19-
#define SS 16
6+
#endif

system/lib/libc/musl/arch/generic/bits/io.h

Whitespace-only changes.

system/lib/libc/musl/arch/generic/bits/kd.h

-1
This file was deleted.

system/lib/libc/musl/arch/generic/bits/ptrace.h

Whitespace-only changes.

system/lib/libc/musl/arch/generic/bits/soundcard.h

-1
This file was deleted.

system/lib/libc/musl/arch/generic/bits/vt.h

-1
This file was deleted.

system/lib/libc/musl/include/sys/auxv.h

-17
This file was deleted.

system/lib/libc/musl/include/sys/cachectl.h

-22
This file was deleted.

system/lib/libc/musl/include/sys/epoll.h

-69
This file was deleted.

system/lib/libc/musl/include/sys/eventfd.h

-26
This file was deleted.

system/lib/libc/musl/include/sys/fanotify.h

-111
This file was deleted.

system/lib/libc/musl/include/sys/fsuid.h

-20
This file was deleted.

system/lib/libc/musl/include/sys/inotify.h

-58
This file was deleted.

system/lib/libc/musl/include/sys/io.h

-17
This file was deleted.

system/lib/libc/musl/include/sys/kd.h

-1
This file was deleted.

0 commit comments

Comments
 (0)