Unbloat the build

This change resurrects ae5d06dc53

libc/intrin/asan.c

@@ -39,6 +39,7 @@
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/hook/hook.internal.h"
+#include "libc/mem/mem.h"
 #include "libc/nexgen32e/gc.internal.h"
 #include "libc/nexgen32e/stackframe.h"
 #include "libc/nt/enum/version.h"
@@ -195,8 +196,7 @@ static uint64_t __asan_roundup2pow(uint64_t x) {
 static char *__asan_utf8cpy(char *p, unsigned c) {
   uint64_t z;
   z = tpenc(c);
-  do
-    *p++ = z;
+  do *p++ = z;
   while ((z >>= 8));
   return p;
 }
@@ -947,8 +947,7 @@ static void __asan_trace(struct AsanTrace *bt, const struct StackFrame *bp) {
     if (!__asan_checka(SHADOW(bp), sizeof(*bp) >> 3).kind) {
       addr = bp->addr;
       if (addr == weakaddr("__gc") && weakaddr("__gc")) {
-        do
-          --gi;
+        do --gi;
         while ((addr = garbage->p[gi].ret) == weakaddr("__gc"));
       }
       bt->p[i] = addr;

libc/intrin/pthread.h

@@ -1,7 +1,5 @@
 #ifndef COSMOPOLITAN_LIBC_RUNTIME_PTHREAD_H_
 #define COSMOPOLITAN_LIBC_RUNTIME_PTHREAD_H_
-#include "libc/calls/struct/timespec.h"
-#include "libc/dce.h"
 
 #define PTHREAD_KEYS_MAX 64
 
@@ -84,7 +82,6 @@ int pthread_mutex_init(pthread_mutex_t *, const pthread_mutexattr_t *);
 int pthread_mutex_lock(pthread_mutex_t *);
 int pthread_mutex_unlock(pthread_mutex_t *);
 int pthread_mutex_trylock(pthread_mutex_t *);
-int pthread_mutex_timedlock(pthread_mutex_t *, const struct timespec *);
 int pthread_mutex_destroy(pthread_mutex_t *);
 int pthread_mutex_consistent(pthread_mutex_t *);
 int pthread_mutexattr_init(pthread_mutexattr_t *);
@@ -94,8 +91,6 @@ int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 int pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
 int pthread_cond_destroy(pthread_cond_t *);
 int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
-int pthread_cond_timedwait(pthread_cond_t *, pthread_mutex_t *,
-                           const struct timespec *);
 int pthread_cond_broadcast(pthread_cond_t *);
 int pthread_cancel(pthread_t);
 int pthread_cond_signal(pthread_cond_t *);
@@ -103,10 +98,8 @@ int pthread_rwlock_init(pthread_rwlock_t *, const pthread_rwlockattr_t *);
 int pthread_rwlock_destroy(pthread_rwlock_t *);
 int pthread_rwlock_rdlock(pthread_rwlock_t *);
 int pthread_rwlock_tryrdlock(pthread_rwlock_t *);
-int pthread_rwlock_timedrdlock(pthread_rwlock_t *, const struct timespec *);
 int pthread_rwlock_wrlock(pthread_rwlock_t *);
 int pthread_rwlock_trywrlock(pthread_rwlock_t *);
-int pthread_rwlock_timedwrlock(pthread_rwlock_t *, const struct timespec *);
 int pthread_rwlock_unlock(pthread_rwlock_t *);
 int pthread_key_create(pthread_key_t *, pthread_key_dtor);
 int pthread_key_delete(pthread_key_t);
@@ -139,8 +132,7 @@ void *pthread_getspecific(pthread_key_t);
 #define pthread_mutex_unlock(mutex)                              \
   ((mutex)->attr == PTHREAD_MUTEX_NORMAL                         \
        ? (__atomic_store_n(&(mutex)->lock, 0, __ATOMIC_RELAXED), \
-          ((IsLinux() || IsOpenbsd()) &&                         \
-           __atomic_load_n(&(mutex)->waits, __ATOMIC_RELAXED) && \
+          (__atomic_load_n(&(mutex)->waits, __ATOMIC_RELAXED) && \
            _pthread_mutex_wake(mutex)),                          \
           0)                                                     \
        : pthread_mutex_unlock(mutex))

libc/intrin/pthread_mutex_unlock.c

@@ -19,6 +19,7 @@
 #include "libc/assert.h"
 #include "libc/bits/atomic.h"
 #include "libc/calls/calls.h"
+#include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/pthread.h"
@@ -44,8 +45,7 @@ int(pthread_mutex_unlock)(pthread_mutex_t *mutex) {
       // fallthrough
     case PTHREAD_MUTEX_NORMAL:
       atomic_store_explicit(&mutex->lock, 0, memory_order_relaxed);
-      if ((IsLinux() || IsOpenbsd()) &&
-          atomic_load_explicit(&mutex->waits, memory_order_relaxed) > 0) {
+      if (atomic_load_explicit(&mutex->waits, memory_order_relaxed) > 0) {
         _pthread_mutex_wake(mutex);
       }
       return 0;

libc/intrin/pthread_mutex_wake.c

@@ -17,9 +17,15 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/atomic.h"
+#include "libc/dce.h"
 #include "libc/intrin/futex.internal.h"
 #include "libc/intrin/pthread.h"
 
 int _pthread_mutex_wake(pthread_mutex_t *mutex) {
-  return _futex_wake(&mutex->lock, 1);
+  if ((IsLinux() || IsOpenbsd()) &&
+      atomic_load_explicit(&mutex->waits, memory_order_relaxed)) {
+    return _futex_wake(&mutex->lock, 1);
+  } else {
+    return 0;
+  }
 }

libc/intrin/strerror_wr.greg.c

@@ -24,6 +24,7 @@
 #include "libc/nt/enum/formatmessageflags.h"
 #include "libc/nt/enum/lang.h"
 #include "libc/nt/process.h"
+#include "libc/str/str.h"
 
 /**
  * Converts errno value to string with explicit windows errno too.