From c13ac0be4e632012a2344baecc513dfb99811ccd Mon Sep 17 00:00:00 2001 From: Apple Date: Thu, 15 Dec 2016 17:56:57 +0000 Subject: [PATCH] Libc-1158.30.7.tar.gz --- .upstream_base_commits | 1 + gen/FreeBSD/raise.3 | 13 +++++++------ gen/FreeBSD/wordexp.c | 4 ---- include/limits.h | 2 ++ stdlib/FreeBSD/system.c | 4 ++++ 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.upstream_base_commits b/.upstream_base_commits index 88ac714..e512103 100644 --- a/.upstream_base_commits +++ b/.upstream_base_commits @@ -5,6 +5,7 @@ gen/FreeBSD/basename.3 freebsd lib/libc/gen/basename.3 26f49abeef12bd43e9671edee gen/FreeBSD/clock.3 freebsd lib/libc/gen/clock.3 5b882020081a138285227631c46a406c08e17bc8 gen/FreeBSD/ctermid.3 freebsd lib/libc/gen/ctermid.3 5b882020081a138285227631c46a406c08e17bc8 gen/FreeBSD/getbsize.c freebsd lib/libc/gen/getbsize.c 5b882020081a138285227631c46a406c08e17bc8 +gen/FreeBSD/raise3 freebsd lib/libc/gen/raise.3 6b42c90c1ff5f7c35431eced41b6213401521d3d gen/FreeBSD/readpassphrase.c freebsd lib/libc/gen/readpassphrase.c 1f19a8fc755a14865a5a5b67d5fa895c4b7cf622 gen/FreeBSD/readpassphrase.3 freebsd lib/libc/gen/readpassphrase.3 e0a2d4f15ed9e93fcb62544ed65f7a98e2339c3b gen/FreeBSD/times.3 freebsd lib/libc/gen/times.3 5b882020081a138285227631c46a406c08e17bc8 diff --git a/gen/FreeBSD/raise.3 b/gen/FreeBSD/raise.3 index dbdff26..59649b2 100644 --- a/gen/FreeBSD/raise.3 +++ b/gen/FreeBSD/raise.3 @@ -30,14 +30,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)raise.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/raise.3,v 1.8 2007/01/09 00:27:55 imp Exp $ +.\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd September 21, 2016 .Dt RAISE 3 .Os .Sh NAME .Nm raise -.Nd send a signal to the current process +.Nd send a signal to the current thread .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -49,7 +49,7 @@ The .Fn raise function sends the signal .Fa sig -to the current process. +to the current thread. .Sh RETURN VALUES .Rv -std raise .Sh ERRORS @@ -62,9 +62,10 @@ for any of the errors specified for the library functions .Xr getpid 2 and -.Xr kill 2 . +.Xr pthread_kill 2 . .Sh SEE ALSO -.Xr kill 2 +.Xr kill 2 , +.Xr pthread_kill 2 .Sh STANDARDS The .Fn raise diff --git a/gen/FreeBSD/wordexp.c b/gen/FreeBSD/wordexp.c index 1bcf659..4a6316b 100644 --- a/gen/FreeBSD/wordexp.c +++ b/gen/FreeBSD/wordexp.c @@ -29,7 +29,6 @@ #if TARGET_OS_IPHONE /* */ -#if defined(__OPEN_SOURCE__) || !__LP64__ #include int wordexp(const char *restrict words __unused, wordexp_t *restrict pwordexp __unused, int flags __unused) { return WRDE_NOSPACE; @@ -37,9 +36,6 @@ int wordexp(const char *restrict words __unused, wordexp_t *restrict pwordexp __ void wordfree(wordexp_t *pwordexp __unused) { } -#else -struct __not_an_empty_c_file; -#endif #else diff --git a/include/limits.h b/include/limits.h index 6f46690..b7d202d 100644 --- a/include/limits.h +++ b/include/limits.h @@ -100,6 +100,8 @@ #define _POSIX_SEM_VALUE_MAX 32767 #define _POSIX_SIGQUEUE_MAX 32 #define _POSIX_TIMER_MAX 32 + +#define _POSIX_CLOCKRES_MIN 20000000 #endif /* __DARWIN_C_LEVEL >= 199309L */ #if __DARWIN_C_LEVEL >= 199506L diff --git a/stdlib/FreeBSD/system.c b/stdlib/FreeBSD/system.c index 84b2224..61ef03c 100644 --- a/stdlib/FreeBSD/system.c +++ b/stdlib/FreeBSD/system.c @@ -83,10 +83,14 @@ __system(command) #endif /* __DARWIN_UNIX03 */ if (!command) { /* just checking... */ +#if TARGET_OS_IPHONE + return(0); +#else if (access(_PATH_BSHELL, F_OK) == -1) /* if no sh or no access */ return(0); else return(1); +#endif } if ((err = posix_spawnattr_init(&attr)) != 0) { -- 2.47.2