diff --git a/ChangeLog.md b/ChangeLog.md index edb119da2f2e7..0d670766c1364 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -23,6 +23,8 @@ See docs/process.md for more on how version tagging works. - Exporting `print`/`printErr` via `-sEXPORTED_RUNTIME_METHODS` is deprecated in favor of `out`/`err`. The former symbols are supposed to be used with `-sINCOMING_MODULE_JS_API` instead. (#17955) +- aio.h was removed from the sysroot. Emscripten doesn't support any of the + functions in this header. 3.1.24 - 10/11/22 ----------------- diff --git a/system/lib/libc/musl/include/aio.h b/system/lib/libc/musl/include/aio.h deleted file mode 100644 index 453c41b7489f3..0000000000000 --- a/system/lib/libc/musl/include/aio.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef _AIO_H -#define _AIO_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include - -#define __NEED_ssize_t -#define __NEED_off_t - -#include - -struct aiocb { - int aio_fildes, aio_lio_opcode, aio_reqprio; - volatile void *aio_buf; - size_t aio_nbytes; - struct sigevent aio_sigevent; - void *__td; - int __lock[2]; - volatile int __err; - ssize_t __ret; - off_t aio_offset; - void *__next, *__prev; - char __dummy4[32-2*sizeof(void *)]; -}; - -#define AIO_CANCELED 0 -#define AIO_NOTCANCELED 1 -#define AIO_ALLDONE 2 - -#define LIO_READ 0 -#define LIO_WRITE 1 -#define LIO_NOP 2 - -#define LIO_WAIT 0 -#define LIO_NOWAIT 1 - -int aio_read(struct aiocb *); -int aio_write(struct aiocb *); -int aio_error(const struct aiocb *); -ssize_t aio_return(struct aiocb *); -int aio_cancel(int, struct aiocb *); -int aio_suspend(const struct aiocb *const [], int, const struct timespec *); -int aio_fsync(int, struct aiocb *); - -int lio_listio(int, struct aiocb *__restrict const *__restrict, int, struct sigevent *__restrict); - -#if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE) -#define aiocb64 aiocb -#define aio_read64 aio_read -#define aio_write64 aio_write -#define aio_error64 aio_error -#define aio_return64 aio_return -#define aio_cancel64 aio_cancel -#define aio_suspend64 aio_suspend -#define aio_fsync64 aio_fsync -#define lio_listio64 lio_listio -#define off64_t off_t -#endif - -#if _REDIR_TIME64 -__REDIR(aio_suspend, __aio_suspend_time64); -#endif - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/system/lib/update_musl.py b/system/lib/update_musl.py index bd4bdc3cc1b1a..e2b826c2f94f2 100755 --- a/system/lib/update_musl.py +++ b/system/lib/update_musl.py @@ -35,6 +35,7 @@ 's390x', 'mips', 'mips64', 'mipsn32', 'powerpc', 'powerpc64', 'm68k', 'microblaze', 'or1k') exclude_files = ( + 'aio.h', 'sendfile.h', 'auxv.h', 'personality.h',