diff options
Diffstat (limited to 'system/musl/amalgamation.patch')
| -rw-r--r-- | system/musl/amalgamation.patch | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/system/musl/amalgamation.patch b/system/musl/amalgamation.patch index 5e273ce7f..0e46ee131 100644 --- a/system/musl/amalgamation.patch +++ b/system/musl/amalgamation.patch @@ -8,7 +8,7 @@ index e9ca94cb..b39b12ee 100644 #include <time.h> #include <errno.h> diff --git a/include/stdlib.h b/include/stdlib.h -index b507ca33..5e14b07c 100644 +index 475190bf..6ac26741 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -41,14 +41,18 @@ void *malloc (size_t); @@ -91,10 +91,10 @@ index 3d948372..deb4a450 100644 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ || defined(_BSD_SOURCE) diff --git a/include/unistd.h b/include/unistd.h -index ee2dbe8a..ed75e578 100644 +index 5bc7f798..e6bf2ca7 100644 --- a/include/unistd.h +++ b/include/unistd.h -@@ -35,16 +35,23 @@ extern "C" { +@@ -37,16 +37,23 @@ extern "C" { #include <bits/alltypes.h> int pipe(int [2]); @@ -121,7 +121,7 @@ index ee2dbe8a..ed75e578 100644 ssize_t read(int, void *, size_t); ssize_t write(int, const void *, size_t); ssize_t pread(int, void *, size_t, off_t); -@@ -206,8 +213,6 @@ pid_t gettid(void); +@@ -208,8 +215,6 @@ pid_t gettid(void); #define off64_t off_t #endif @@ -130,7 +130,7 @@ index ee2dbe8a..ed75e578 100644 #define _XOPEN_VERSION 700 #define _XOPEN_UNIX 1 #define _XOPEN_ENH_I18N 1 -@@ -280,6 +285,7 @@ pid_t gettid(void); +@@ -282,6 +287,7 @@ pid_t gettid(void); #define _PC_ALLOC_SIZE_MIN 18 #define _PC_SYMLINK_MAX 19 #define _PC_2_SYMLINKS 20 @@ -138,38 +138,27 @@ index ee2dbe8a..ed75e578 100644 #define _SC_ARG_MAX 0 #define _SC_CHILD_MAX 1 -@@ -423,6 +429,7 @@ pid_t gettid(void); - #define _SC_XOPEN_STREAMS 246 - #define _SC_THREAD_ROBUST_PRIO_INHERIT 247 +@@ -427,6 +433,7 @@ pid_t gettid(void); #define _SC_THREAD_ROBUST_PRIO_PROTECT 248 -+#define _SC_XOPEN_UUCP 249 + #define _SC_MINSIGSTKSZ 249 + #define _SC_SIGSTKSZ 250 ++#define _SC_XOPEN_UUCP 251 #define _CS_PATH 0 #define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 1 -@@ -465,6 +472,8 @@ pid_t gettid(void); - #define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147 - #define _CS_V6_ENV 1148 - #define _CS_V7_ENV 1149 -+#define _CS_POSIX_V7_THREADS_CFLAGS 1150 -+#define _CS_POSIX_V7_THREADS_LDFLAGS 1151 - - #ifdef __cplusplus - } diff --git a/src/conf/confstr.c b/src/conf/confstr.c -index 02cb1aa2..8f870a69 100644 +index 3d417284..8f870a69 100644 --- a/src/conf/confstr.c +++ b/src/conf/confstr.c -@@ -6,8 +6,8 @@ size_t confstr(int name, char *buf, size_t len) +@@ -6,7 +6,7 @@ size_t confstr(int name, char *buf, size_t len) { const char *s = ""; if (!name) { - s = "/bin:/usr/bin"; -- } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>33U) { + s = "/usr/5bin:/usr/bin:/bin"; -+ } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>35U) { + } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>35U) { errno = EINVAL; return 0; - } diff --git a/src/conf/fpathconf.c b/src/conf/fpathconf.c index e6aca5cf..83e47e87 100644 --- a/src/conf/fpathconf.c @@ -196,13 +185,16 @@ index e6aca5cf..83e47e87 100644 if (name >= sizeof(values)/sizeof(values[0])) { errno = EINVAL; diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c -index 3baaed32..04369596 100644 +index 60d3e745..20d91de7 100644 --- a/src/conf/sysconf.c +++ b/src/conf/sysconf.c -@@ -165,6 +165,7 @@ long sysconf(int name) +@@ -168,9 +168,9 @@ long sysconf(int name) [_SC_XOPEN_STREAMS] = JT_ZERO, [_SC_THREAD_ROBUST_PRIO_INHERIT] = -1, [_SC_THREAD_ROBUST_PRIO_PROTECT] = -1, +- + [_SC_MINSIGSTKSZ] = JT_MINSIGSTKSZ, + [_SC_SIGSTKSZ] = JT_SIGSTKSZ, + [_SC_XOPEN_UUCP] = -1, }; |