Apply some touchups

libc/runtime/directmap.c

@@ -31,7 +31,7 @@
 noasan struct DirectMap __mmap(void *addr, size_t size, int prot, int flags,
                                int fd, int64_t off) {
   if (!IsWindows()) {
-    return (struct DirectMap){sys_mmap(addr, size, prot, flags, fd, off),
+    return (struct DirectMap){sys_mmap(addr, size, prot, flags, fd, off, off),
                               kNtInvalidHandleValue};
   } else {
     return sys_mmap_nt(addr, size, prot, flags,

libc/runtime/fork.c

@@ -28,14 +28,22 @@
  * @asyncsignalsafe
  */
 int fork(void) {
-  int rc;
+  axdx_t ad;
+  int ax, dx;
   if (!IsWindows()) {
-    rc = sys_fork();
+    ad = sys_fork();
+    ax = ad.ax;
+    dx = ad.dx;
+    if (IsXnu() && ax != -1) {
+      /* eax always returned with childs pid */
+      /* edx is 0 for parent and 1 for child */
+      ax &= dx - 1;
+    }
   } else {
-    rc = sys_fork_nt();
+    ax = sys_fork_nt();
   }
-  if (rc == 0) {
+  if (!ax) {
     __onfork();
   }
-  return rc;
+  return ax;
 }

libc/runtime/runtime.mk

@@ -76,6 +76,10 @@ o/$(MODE)/libc/runtime/winmain.greg.o:			\
 		OVERRIDE_CFLAGS +=			\
 			$(NO_MAGIC)
 
+o/$(MODE)/libc/runtime/ftrace.greg.o:			\
+		OVERRIDE_CFLAGS +=			\
+			-mgeneral-regs-only
+
 LIBC_RUNTIME_LIBS = $(foreach x,$(LIBC_RUNTIME_ARTIFACTS),$($(x)))
 LIBC_RUNTIME_SRCS = $(foreach x,$(LIBC_RUNTIME_ARTIFACTS),$($(x)_SRCS))
 LIBC_RUNTIME_HDRS = $(foreach x,$(LIBC_RUNTIME_ARTIFACTS),$($(x)_HDRS))

libc/runtime/unsetenv.c

@@ -1,42 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
-#include "libc/runtime/runtime.h"
-#include "libc/str/str.h"
-#include "libc/sysv/errfuns.h"
-
-/**
- * Removes environment variable.
- */
-int unsetenv(const char *name) {
-  if (isempty(name) || strchr(name, '=')) return einval();
-  if (environ) {
-    char **ep = environ;
-    size_t removed = 0;
-    size_t namelen = strlen(name);
-    do {
-      if (*ep && strncmp(*ep, name, namelen) == 0 && (*ep)[namelen] == '=') {
-        --removed;
-      } else if (removed) {
-        ep[removed] = *ep;
-      }
-    } while (*ep++);
-  }
-  return 0;
-}