diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-29 22:00:47 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-29 22:00:47 +0000 |
| commit | 65575c14243781e76649ccc733536a1c27ac150a (patch) | |
| tree | 27b13d22cb49384638d79ceaed61caef7c5d46c1 /lib | |
| parent | 98221d2e7e1f09324f51bebdb8fee38d8fa56337 (diff) | |
| parent | a0f64f38a1829b7c26bf801b96d7cff65d3c4c24 (diff) | |
| download | src-65575c14243781e76649ccc733536a1c27ac150a.tar.gz src-65575c14243781e76649ccc733536a1c27ac150a.zip | |
Merge ^/head r312894 through r312967.
Notes
Notes:
svn path=/projects/clang400-import/; revision=312968
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/libsysdecode/Makefile | 2 | ||||
| -rw-r--r-- | lib/libsysdecode/mkioctls | 10 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_private.h | 12 |
4 files changed, 10 insertions, 16 deletions
diff --git a/lib/Makefile b/lib/Makefile index f2f3b8594c4a..d9965a9e3397 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -106,7 +106,7 @@ SUBDIR_DEPEND_libdevstat= libkvm SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil SUBDIR_DEPEND_libedit= ncurses SUBDIR_DEPEND_libgeom= libexpat libsbuf -SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi +SUBDIR_DEPEND_librpcsec_gss= libgssapi SUBDIR_DEPEND_libmagic= libz SUBDIR_DEPEND_libmemstat= libkvm SUBDIR_DEPEND_libopie= libmd diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index bde9460fee75..7f4b302d5deb 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -120,7 +120,7 @@ tables.h: mktables ioctl.c: .PHONY .endif ioctl.c: mkioctls .META - env MACHINE=${MACHINE} CPP="${CPP}" \ + env CPP="${CPP}" \ /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} beforedepend: ioctl.c tables.h diff --git a/lib/libsysdecode/mkioctls b/lib/libsysdecode/mkioctls index b99ff19f2486..e5bcee2338e8 100644 --- a/lib/libsysdecode/mkioctls +++ b/lib/libsysdecode/mkioctls @@ -24,15 +24,7 @@ ioctl_includes=$( awk '{printf("#include <%s>\\n", $1)}' ) -: ${MACHINE=$(uname -m)} -case "${MACHINE}" in -*pc98*) - ioctl_includes="$ioctl_includes#include <sys/diskpc98.h>\\n" - ;; -*) - ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n" - ;; -esac +ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n" awk -v x="$ioctl_includes" 'BEGIN {print x}' | $CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - | diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index e61ee99dcb77..9bea65f38491 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -53,6 +53,8 @@ #include <sys/thr.h> #include <pthread.h> +__NULLABILITY_PRAGMA_PUSH + #define SYM_FB10(sym) __CONCAT(sym, _fb10) #define SYM_FBP10(sym) __CONCAT(sym, _fbp10) #define WEAK_REF(sym, alias) __weak_reference(sym, alias) @@ -835,11 +837,10 @@ void _pthread_cleanup_pop(int); void _pthread_exit_mask(void *status, sigset_t *mask) __dead2 __hidden; void _pthread_cancel_enter(int maycancel); void _pthread_cancel_leave(int maycancel); -int _pthread_mutex_consistent(pthread_mutex_t *) __nonnull(1); -int _pthread_mutexattr_getrobust(pthread_mutexattr_t *__restrict, - int *__restrict) __nonnull_all; -int _pthread_mutexattr_setrobust(pthread_mutexattr_t *, int) - __nonnull(1); +int _pthread_mutex_consistent(pthread_mutex_t * _Nonnull); +int _pthread_mutexattr_getrobust(pthread_mutexattr_t * _Nonnull __restrict, + int * _Nonnull __restrict); +int _pthread_mutexattr_setrobust(pthread_mutexattr_t * _Nonnull, int); /* #include <fcntl.h> */ #ifdef _SYS_FCNTL_H_ @@ -984,5 +985,6 @@ void __thr_pshared_atfork_pre(void) __hidden; void __thr_pshared_atfork_post(void) __hidden; __END_DECLS +__NULLABILITY_PRAGMA_POP #endif /* !_THR_PRIVATE_H */ |