Index: pthread_int.h
===================================================================
RCS file: /cvsroot/src/lib/libpthread/pthread_int.h,v
retrieving revision 1.100
diff -u -r1.100 pthread_int.h
--- pthread_int.h	28 Jan 2020 13:08:40 -0000	1.100
+++ pthread_int.h	2 Feb 2020 13:18:34 -0000
@@ -36,7 +36,6 @@
 #include <sys/tls.h>
 
 /* #define PTHREAD__DEBUG */
-#define ERRORCHECK
 
 #include "pthread_types.h"
 #include "pthread_queue.h"
Index: pthread_rwlock.c
===================================================================
RCS file: /cvsroot/src/lib/libpthread/pthread_rwlock.c,v
retrieving revision 1.38
diff -u -r1.38 pthread_rwlock.c
--- pthread_rwlock.c	31 Jan 2020 17:52:14 -0000	1.38
+++ pthread_rwlock.c	2 Feb 2020 13:18:34 -0000
@@ -158,10 +158,8 @@
 	pthread_t self;
 	int error;
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid rwlock",
 	    ptr->ptr_magic == _PT_RWLOCK_MAGIC);
-#endif
 
 	for (owner = (uintptr_t)ptr->ptr_owner;; owner = next) {
 		/*
@@ -248,10 +246,8 @@
 	if (__predict_false(__uselibcstub))
 		return __libc_rwlock_tryrdlock_stub(ptr);
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid rwlock",
 	    ptr->ptr_magic == _PT_RWLOCK_MAGIC);
-#endif
 
 	/*
 	 * Don't get a readlock if there is a writer or if there are waiting
@@ -283,10 +279,8 @@
 	self = pthread__self();
 	_DIAGASSERT(((uintptr_t)self & RW_FLAGMASK) == 0);
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid rwlock",
 	    ptr->ptr_magic == _PT_RWLOCK_MAGIC);
-#endif
 
 	for (owner = (uintptr_t)ptr->ptr_owner;; owner = next) {
 		/*
@@ -374,10 +368,8 @@
 	if (__predict_false(__uselibcstub))
 		return __libc_rwlock_trywrlock_stub(ptr);
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid rwlock",
 	    ptr->ptr_magic == _PT_RWLOCK_MAGIC);
-#endif
 
 	self = pthread__self();
 	_DIAGASSERT(((uintptr_t)self & RW_FLAGMASK) == 0);
@@ -453,10 +445,8 @@
 	if (__predict_false(__uselibcstub))
 		return __libc_rwlock_unlock_stub(ptr);
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid rwlock",
 	    ptr->ptr_magic == _PT_RWLOCK_MAGIC);
-#endif
 
 #ifndef PTHREAD__ATOMIC_IS_MEMBAR
 	membar_exit();
Index: pthread_spin.c
===================================================================
RCS file: /cvsroot/src/lib/libpthread/pthread_spin.c,v
retrieving revision 1.7
diff -u -r1.7 pthread_spin.c
--- pthread_spin.c	31 Jan 2020 17:52:14 -0000	1.7
+++ pthread_spin.c	2 Feb 2020 13:18:34 -0000
@@ -53,11 +53,10 @@
 pthread_spin_init(pthread_spinlock_t *lock, int pshared)
 {
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid pshared",
 	    pshared == PTHREAD_PROCESS_PRIVATE ||
 	    pshared == PTHREAD_PROCESS_SHARED);
-#endif
+
 	lock->pts_magic = _PT_SPINLOCK_MAGIC;
 
 	/*
@@ -75,13 +74,11 @@
 pthread_spin_destroy(pthread_spinlock_t *lock)
 {
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid spinlock",
 	    lock->pts_magic == _PT_SPINLOCK_MAGIC);
 
 	if (!__SIMPLELOCK_UNLOCKED_P(&lock->pts_spin))
 		return EBUSY;
-#endif
 
 	lock->pts_magic = _PT_SPINLOCK_DEAD;
 
@@ -93,10 +90,8 @@
 {
 	pthread_t self;
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid spinlock",
 	    lock->pts_magic == _PT_SPINLOCK_MAGIC);
-#endif
 
 	self = pthread__self();
 	while (pthread__spintrylock(self, &lock->pts_spin) == 0) {
@@ -111,10 +106,8 @@
 {
 	pthread_t self;
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid spinlock",
 	    lock->pts_magic == _PT_SPINLOCK_MAGIC);
-#endif
 
 	self = pthread__self();
 	if (pthread__spintrylock(self, &lock->pts_spin) == 0)
@@ -127,10 +120,8 @@
 {
 	pthread_t self;
 
-#ifdef ERRORCHECK
 	pthread__error(EINVAL, "Invalid spinlock",
 	    lock->pts_magic == _PT_SPINLOCK_MAGIC);
-#endif
 
 	self = pthread__self();
 	pthread__spinunlock(self, &lock->pts_spin);