Improve mkdeps

Our makefile generator now accepts badly formatted include lines. It's
now more hermetic with better error checking in the cosmo repo, and it
can be configured to not be hermetic at all.

Author: jart

Makefile

@@ -329,7 +329,7 @@ o/$(MODE)/hdrs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS) $(
 o/$(MODE)/incs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(INCS) $(INCS),$(dir $(x)))) $(INCS) $(INCS)
 	$(file >$@,$(INCS))
 o/$(MODE)/depend: o/$(MODE)/.x o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt o/$(MODE)/incs.txt $(SRCS) $(HDRS) $(INCS)
-	$(COMPILE) -AMKDEPS -L320 $(MKDEPS) -o $@ -r o/$(MODE)/ @o/$(MODE)/srcs.txt @o/$(MODE)/hdrs.txt @o/$(MODE)/incs.txt
+	$(COMPILE) -AMKDEPS -L320 $(MKDEPS) -o $@ -s -r o/$(MODE)/ @o/$(MODE)/srcs.txt @o/$(MODE)/hdrs.txt @o/$(MODE)/incs.txt
 
 o/$(MODE)/srcs-old.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(SRCS),$(dir $(x))))
 	$(file >$@) $(foreach x,$(SRCS),$(file >>$@,$(x)))

bin/fatcosmocc

@@ -240,6 +240,8 @@ NEED_JOIN=
 NEED_EQUAL=
 NEED_OUTPUT=
 APELINKFLAGS=
+FLAGS_X86_64=
+FLAGS_AARCH64=
 INPUT_FILE_COUNT=0
 for x; do
   if [ x"$x" != x"${x#* }" ]; then
@@ -335,6 +337,14 @@ for x; do
     continue
   elif [ x"$x" = x"-march=native" ]; then
     fatal_error "-march=native can't be used when building fat binaries"
+  elif [ x"$x" != x"${x#-Xx86_64}" ]; then
+    x=${x#-Xx86_64}  # e.g. -Xx86_64,-msse3,-mavx,-mavx2,-mf16c,-mfma
+    FLAGS_X86_64="$FLAGS_X86_64 ${x//,/ }"
+    continue
+  elif [ x"$x" != x"${x#-Xaarch64}" ]; then
+    x=${x#-Xaarch64}
+    FLAGS_aarch64="$FLAGS_aarch64 ${x//,/ }"
+    continue
   elif [ x"$x" = x"-dumpversion" ]; then
     echo $GCC_VERSION
     Exit 0
@@ -473,6 +483,7 @@ build_object() {
         $CFLAGS_X86_64 \
         $CPPFLAGS_X86_64 \
         "$@" \
+        $FLAGS_X86_64 \
         $PRECIOUS
     log_command "$@"
     "$@" || exit
@@ -492,6 +503,7 @@ build_object() {
         $CFLAGS_AARCH64 \
         $CPPFLAGS_AARCH64 \
         "$@" \
+        $FLAGS_AARCH64 \
         $PRECIOUS &&
     log_command "$@"
     "$@" || exit

build/bootstrap/mkdeps.com

@@ -23,6 +23,7 @@
 #include "libc/intrin/asan.internal.h"
 #include "libc/intrin/describeflags.internal.h"
 #include "libc/intrin/strace.internal.h"
+#include "libc/runtime/runtime.h"
 #include "libc/runtime/stack.h"
 #include "libc/runtime/syslib.internal.h"
 #include "libc/sysv/consts/rlimit.h"

libc/calls/getrlimit.c

@@ -31,10 +31,6 @@ int64_t GetConsoleOutputHandle(void);
 int IsWindowsExecutable(int64_t, const char16_t *);
 void InterceptTerminalCommands(const char *, size_t);
 
-forceinline int64_t __getfdhandleactual(int fd) {
-  return g_fds.p[fd].handle;
-}
-
 forceinline bool __isfdopen(int fd) {
   return 0 <= fd && fd < g_fds.n && g_fds.p[fd].kind != kFdEmpty;
 }

libc/calls/internal.h

@@ -75,7 +75,7 @@ static int ioctl_default(int fd, unsigned long request, void *arg) {
     return sys_ioctl(fd, request, arg);
   } else if (__isfdopen(fd)) {
     if (g_fds.p[fd].kind == kFdSocket) {
-      handle = __getfdhandleactual(fd);
+      handle = g_fds.p[fd].handle;
       if ((rc = _weaken(__sys_ioctlsocket_nt)(handle, request, arg)) != -1) {
         return rc;
       } else {

libc/calls/ioctl.c

@@ -56,6 +56,6 @@ bool32 ischardev(int fd) {
   } else {
     return __isfdkind(fd, kFdConsole) || __isfdkind(fd, kFdDevNull) ||
            (__isfdkind(fd, kFdFile) &&
-            GetFileType(__getfdhandleactual(fd)) == kNtFileTypeChar);
+            GetFileType(g_fds.p[fd].handle) == kNtFileTypeChar);
   }
 }

libc/calls/ischardev.c

@@ -18,7 +18,6 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
-#include "libc/nexgen32e/yield.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/syslib.internal.h"
 #include "libc/thread/thread.h"
@@ -32,7 +31,7 @@ int pthread_yield(void) {
   if (IsXnuSilicon()) {
     __syslib->__pthread_yield_np();
   } else if (IsOpenbsd()) {
-    spin_yield();  // sched_yield() is punishingly slow on OpenBSD
+    pthread_pause_np();  // sched_yield() is punishingly slow on OpenBSD
   } else {
     sched_yield();
   }

libc/calls/pthread_yield.c

@@ -142,7 +142,7 @@ struct Keystrokes {
 
 static struct Keystrokes __keystroke;
 
-textwindows void __keystroke_wipe(void) {
+textwindows void WipeKeystrokes(void) {
   bzero(&__keystroke, sizeof(__keystroke));
 }
 
@@ -754,8 +754,8 @@ static textwindows ssize_t ReadFromConsole(struct Fd *f, void *data,
   return rc;
 }
 
-textwindows ssize_t sys_read_nt_impl(int fd, void *data, size_t size,
-                                     int64_t offset, sigset_t waitmask) {
+textwindows ssize_t ReadBuffer(int fd, void *data, size_t size, int64_t offset,
+                               sigset_t waitmask) {
 
   // switch to terminal polyfill if reading from win32 console
   struct Fd *f = g_fds.p + fd;
@@ -786,18 +786,18 @@ textwindows ssize_t sys_read_nt_impl(int fd, void *data, size_t size,
   }
 }
 
-static textwindows ssize_t sys_read_nt2(int fd, const struct iovec *iov,
-                                        size_t iovlen, int64_t opt_offset,
-                                        sigset_t waitmask) {
+static textwindows ssize_t ReadIovecs(int fd, const struct iovec *iov,
+                                      size_t iovlen, int64_t opt_offset,
+                                      sigset_t waitmask) {
   ssize_t rc;
   size_t i, total;
   if (opt_offset < -1) return einval();
   while (iovlen && !iov[0].iov_len) iov++, iovlen--;
   if (iovlen) {
     for (total = i = 0; i < iovlen; ++i) {
       if (!iov[i].iov_len) continue;
-      rc = sys_read_nt_impl(fd, iov[i].iov_base, iov[i].iov_len, opt_offset,
-                            waitmask);
+      rc =
+          ReadBuffer(fd, iov[i].iov_base, iov[i].iov_len, opt_offset, waitmask);
       if (rc == -1) {
         if (total && errno != ECANCELED) {
           return total;
@@ -811,15 +811,15 @@ static textwindows ssize_t sys_read_nt2(int fd, const struct iovec *iov,
     }
     return total;
   } else {
-    return sys_read_nt_impl(fd, NULL, 0, opt_offset, waitmask);
+    return ReadBuffer(fd, NULL, 0, opt_offset, waitmask);
   }
 }
 
 textwindows ssize_t sys_read_nt(int fd, const struct iovec *iov, size_t iovlen,
                                 int64_t opt_offset) {
   ssize_t rc;
   sigset_t m = __sig_block();
-  rc = sys_read_nt2(fd, iov, iovlen, opt_offset, m);
+  rc = ReadIovecs(fd, iov, iovlen, opt_offset, m);
   __sig_unblock(m);
   return rc;
 }

libc/calls/read-nt.c

@@ -25,6 +25,7 @@
 #include "libc/intrin/describeflags.internal.h"
 #include "libc/intrin/strace.internal.h"
 #include "libc/macros.internal.h"
+#include "libc/runtime/runtime.h"
 #include "libc/runtime/syslib.internal.h"
 #include "libc/sysv/consts/rlimit.h"
 #include "libc/sysv/errfuns.h"