From 5e2f7f7ced0842fb51ca7fb78fe1b906e4d877b6 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jtunney@gmail.com>
Date: Thu, 11 May 2023 19:56:33 -0700
Subject: [PATCH] Get LIBC_TESTLIB building on AARCH64

---
 libc/intrin/asan.c                            |  12 +-
 .../thunks/free.S => intrin/asaninit.S}       |  17 +-
 libc/intrin/asanthunk.c                       | 173 +++++++++++
 libc/intrin/somanyasan.S                      | 269 ------------------
 libc/log/loglevel.S                           |  31 --
 .../initgetopt.S => libc/log/loglevel.c       |  16 +-
 libc/runtime/cosmo2.c                         |   5 +
 libc/runtime/internal.h                       |   1 +
 libc/runtime/runtime.mk                       |   1 +
 libc/str/str.mk                               |   3 +
 libc/testlib/polluteregisters.S               |   4 +
 libc/testlib/showerror.c                      | 143 +++++++++-
 libc/testlib/testlib.mk                       |  34 ++-
 libc/testlib/thrashcodecache.S                |   4 +
 libc/testlib/{thunks/assert_eq.S => thunks.c} |  20 +-
 libc/testlib/thunks/assert_false.S            |  28 --
 libc/testlib/thunks/assert_ne.S               |  28 --
 libc/testlib/thunks/assert_true.S             |  28 --
 libc/testlib/thunks/expect_eq.S               |  28 --
 libc/testlib/thunks/expect_false.S            |  28 --
 libc/testlib/thunks/expect_ne.S               |  28 --
 libc/testlib/thunks/expect_true.S             |  28 --
 libc/testlib/thunks/jump.S                    |  28 --
 libc/tinymath/roundf.c                        |  10 +
 libc/vga/readv-vga.c                          |   4 +
 libc/vga/tty-klog.greg.c                      |   4 +
 libc/vga/vga-init.greg.c                      |   4 +
 libc/vga/writev-vga.c                         |   4 +
 test/libc/tinymath/acosh_test.c               |  48 ++--
 test/libc/tinymath/asinh_test.c               |  38 +--
 test/libc/tinymath/atanh_test.c               |  64 ++---
 test/libc/tinymath/cosh_test.c                |  60 ++--
 test/libc/tinymath/exp10_test.c               |  54 ++--
 test/libc/tinymath/exp2_test.c                |  53 ++--
 test/libc/tinymath/exp_test.c                 |  57 ++--
 test/libc/tinymath/expm1_test.c               |  80 +++---
 test/libc/tinymath/fabs_test.c                |  49 ++--
 test/libc/tinymath/hypot_test.c               | 174 +++++------
 test/libc/tinymath/round_test.c               | 188 ++++++------
 test/libc/tinymath/sin_test.c                 |  79 +++--
 test/libc/tinymath/sinh_test.c                |  60 ++--
 test/libc/tinymath/sqrt_test.c                |  47 ++-
 test/libc/tinymath/tanh_test.c                |  78 ++---
 third_party/getopt/getopt.c                   |  13 +-
 third_party/getopt/getopt.mk                  |  12 +-
 third_party/zlib/zlib.mk                      |  12 +-
 46 files changed, 975 insertions(+), 1174 deletions(-)
 rename libc/{testlib/thunks/free.S => intrin/asaninit.S} (91%)
 create mode 100644 libc/intrin/asanthunk.c
 delete mode 100644 libc/intrin/somanyasan.S
 delete mode 100644 libc/log/loglevel.S
 rename third_party/getopt/initgetopt.S => libc/log/loglevel.c (80%)
 rename libc/testlib/{thunks/assert_eq.S => thunks.c} (79%)
 delete mode 100644 libc/testlib/thunks/assert_false.S
 delete mode 100644 libc/testlib/thunks/assert_ne.S
 delete mode 100644 libc/testlib/thunks/assert_true.S
 delete mode 100644 libc/testlib/thunks/expect_eq.S
 delete mode 100644 libc/testlib/thunks/expect_false.S
 delete mode 100644 libc/testlib/thunks/expect_ne.S
 delete mode 100644 libc/testlib/thunks/expect_true.S
 delete mode 100644 libc/testlib/thunks/jump.S

diff --git a/libc/intrin/asan.c b/libc/intrin/asan.c
index dea5b2bce..ff20745e9 100644
--- a/libc/intrin/asan.c
+++ b/libc/intrin/asan.c
@@ -49,8 +49,8 @@
 #include "third_party/dlmalloc/dlmalloc.h"
 
 #ifdef __x86_64__
-
 STATIC_YOINK("_init_asan");
+#endif
 
 #if IsModeDbg()
 // MODE=dbg
@@ -159,6 +159,11 @@ static struct AsanMorgue {
   _Atomic(void *) p[ASAN_MORGUE_ITEMS];
 } __asan_morgue;
 
+int __asan_option_detect_stack_use_after_return = 0;
+
+void __asan_version_mismatch_check_v8(void) {
+}
+
 static bool __asan_once(void) {
   bool want = false;
   static atomic_int once;
@@ -1463,8 +1468,7 @@ static textstartup void __asan_shadow_existing_mappings(void) {
   __asan_poison((void *)GetStackAddr(), GUARDSIZE, kAsanStackOverflow);
 }
 
-__attribute__((__constructor__)) void __asan_init(int argc, char **argv,
-                                                  char **envp, intptr_t *auxv) {
+void __asan_init(int argc, char **argv, char **envp, intptr_t *auxv) {
   static bool once;
   if (!_cmpxchg(&once, false, true)) return;
   if (IsWindows() && NtGetVersion() < kNtVersionWindows10) {
@@ -1499,5 +1503,3 @@ __attribute__((__constructor__)) void __asan_init(int argc, char **argv,
   STRACE("/_/   \\_\\____/_/   \\_\\_| \\_|");
   STRACE("cosmopolitan memory safety module initialized");
 }
-
-#endif /* __x86_64__ */
diff --git a/libc/testlib/thunks/free.S b/libc/intrin/asaninit.S
similarity index 91%
rename from libc/testlib/thunks/free.S
rename to libc/intrin/asaninit.S
index 5af1a57e1..7532e0efe 100644
--- a/libc/testlib/thunks/free.S
+++ b/libc/intrin/asaninit.S
@@ -18,9 +18,14 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/macros.internal.h"
 
-//	Delegates to free().
-//
-//	@note	reduces make dependency toil caused by macros
-testlib_free:
-	jmp	free
-	.endfn	testlib_free,globl
+	.init.start 303,_init_asan
+	push	%rdi
+	push	%rsi
+	mov	%r12,%rdi
+	mov	%r13,%rsi
+	mov	%r14,%rdx
+	mov	%r15,%rcx
+	call	__asan_init
+	pop	%rsi
+	pop	%rdi
+	.init.end 303,_init_asan
diff --git a/libc/intrin/asanthunk.c b/libc/intrin/asanthunk.c
new file mode 100644
index 000000000..4caf5be7c
--- /dev/null
+++ b/libc/intrin/asanthunk.c
@@ -0,0 +1,173 @@
+/*-*- 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 2023 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.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+
+void __asan_report_load(void *, int);
+void __asan_report_store(void *, int);
+void *__asan_stack_malloc(size_t, int);
+void __asan_stack_free(char *, size_t, int);
+
+void __asan_report_load1(void *p) {
+  __asan_report_load(p, 1);
+}
+void __asan_report_load2(void *p) {
+  __asan_report_load(p, 2);
+}
+void __asan_report_load4(void *p) {
+  __asan_report_load(p, 4);
+}
+void __asan_report_load8(void *p) {
+  __asan_report_load(p, 8);
+}
+void __asan_report_load16(void *p) {
+  __asan_report_load(p, 16);
+}
+void __asan_report_load32(void *p) {
+  __asan_report_load(p, 32);
+}
+void __asan_report_load_n(void *p, int n) {
+  __asan_report_load(p, n);
+}
+
+void __asan_report_store1(void *p) {
+  __asan_report_store(p, 1);
+}
+void __asan_report_store2(void *p) {
+  __asan_report_store(p, 2);
+}
+void __asan_report_store4(void *p) {
+  __asan_report_store(p, 4);
+}
+void __asan_report_store8(void *p) {
+  __asan_report_store(p, 8);
+}
+void __asan_report_store16(void *p) {
+  __asan_report_store(p, 16);
+}
+void __asan_report_store32(void *p) {
+  __asan_report_store(p, 32);
+}
+void __asan_report_store_n(void *p, int n) {
+  __asan_report_store(p, n);
+}
+
+void *__asan_stack_malloc_0(size_t n) {
+  return __asan_stack_malloc(n, 0);
+}
+void *__asan_stack_malloc_1(size_t n) {
+  return __asan_stack_malloc(n, 1);
+}
+void *__asan_stack_malloc_2(size_t n) {
+  return __asan_stack_malloc(n, 2);
+}
+void *__asan_stack_malloc_3(size_t n) {
+  return __asan_stack_malloc(n, 3);
+}
+void *__asan_stack_malloc_4(size_t n) {
+  return __asan_stack_malloc(n, 4);
+}
+void *__asan_stack_malloc_5(size_t n) {
+  return __asan_stack_malloc(n, 5);
+}
+void *__asan_stack_malloc_6(size_t n) {
+  return __asan_stack_malloc(n, 6);
+}
+void *__asan_stack_malloc_7(size_t n) {
+  return __asan_stack_malloc(n, 7);
+}
+void *__asan_stack_malloc_8(size_t n) {
+  return __asan_stack_malloc(n, 8);
+}
+void *__asan_stack_malloc_9(size_t n) {
+  return __asan_stack_malloc(n, 9);
+}
+void *__asan_stack_malloc_10(size_t n) {
+  return __asan_stack_malloc(n, 10);
+}
+
+void __asan_stack_free_0(char *p, size_t n) {
+  __asan_stack_free(p, n, 0);
+}
+void __asan_stack_free_1(char *p, size_t n) {
+  __asan_stack_free(p, n, 1);
+}
+void __asan_stack_free_2(char *p, size_t n) {
+  __asan_stack_free(p, n, 2);
+}
+void __asan_stack_free_3(char *p, size_t n) {
+  __asan_stack_free(p, n, 3);
+}
+void __asan_stack_free_4(char *p, size_t n) {
+  __asan_stack_free(p, n, 4);
+}
+void __asan_stack_free_5(char *p, size_t n) {
+  __asan_stack_free(p, n, 5);
+}
+void __asan_stack_free_6(char *p, size_t n) {
+  __asan_stack_free(p, n, 6);
+}
+void __asan_stack_free_7(char *p, size_t n) {
+  __asan_stack_free(p, n, 7);
+}
+void __asan_stack_free_8(char *p, size_t n) {
+  __asan_stack_free(p, n, 8);
+}
+void __asan_stack_free_9(char *p, size_t n) {
+  __asan_stack_free(p, n, 9);
+}
+void __asan_stack_free_10(char *p, size_t n) {
+  __asan_stack_free(p, n, 10);
+}
+
+void __asan_load1() {
+  __builtin_trap();
+}
+void __asan_load2() {
+  __builtin_trap();
+}
+void __asan_load4() {
+  __builtin_trap();
+}
+void __asan_load8() {
+  __builtin_trap();
+}
+void __asan_load16() {
+  __builtin_trap();
+}
+void __asan_load32() {
+  __builtin_trap();
+}
+
+void __asan_store1() {
+  __builtin_trap();
+}
+void __asan_store2() {
+  __builtin_trap();
+}
+void __asan_store4() {
+  __builtin_trap();
+}
+void __asan_store8() {
+  __builtin_trap();
+}
+void __asan_store16() {
+  __builtin_trap();
+}
+void __asan_store32() {
+  __builtin_trap();
+}
diff --git a/libc/intrin/somanyasan.S b/libc/intrin/somanyasan.S
deleted file mode 100644
index a05b12620..000000000
--- a/libc/intrin/somanyasan.S
+++ /dev/null
@@ -1,269 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.rodata.cst4
-__asan_option_detect_stack_use_after_return:
-	.long	0
-	.endobj	__asan_option_detect_stack_use_after_return,globl
-	.previous
-
-__asan_report_load1:
-	push	$1
-	jmp	1f
-	.endfn	__asan_report_load1,globl
-__asan_report_load2:
-	push	$2
-	jmp	1f
-	.endfn	__asan_report_load2,globl
-__asan_report_load4:
-	push	$4
-	jmp	1f
-	.endfn	__asan_report_load4,globl
-__asan_report_load8:
-	push	$8
-	jmp	1f
-	.endfn	__asan_report_load8,globl
-__asan_report_load16:
-	push	$16
-	jmp	1f
-	.endfn	__asan_report_load16,globl
-__asan_report_load32:
-	push	$32
-1:	pop	%rsi
-0:	jmp	__asan_report_load
-	.endfn	__asan_report_load32,globl
-__asan_report_load_n:
-	jmp	0b
-	.endfn	__asan_report_load_n,globl
-
-__asan_report_store1:
-	push	$1
-	jmp	1f
-	.endfn	__asan_report_store1,globl
-__asan_report_store2:
-	push	$2
-	jmp	1f
-	.endfn	__asan_report_store2,globl
-__asan_report_store4:
-	push	$4
-	jmp	1f
-	.endfn	__asan_report_store4,globl
-__asan_report_store8:
-	push	$8
-	jmp	1f
-	.endfn	__asan_report_store8,globl
-__asan_report_store16:
-	push	$16
-	jmp	1f
-	.endfn	__asan_report_store16,globl
-__asan_report_store32:
-	push	$32
-1:	pop	%rsi
-0:	jmp	__asan_report_store
-	.endfn	__asan_report_store32,globl
-__asan_report_store_n:
-	jmp	0b
-	.endfn	__asan_report_store_n,globl
-
-__asan_stack_free_0:
-	push	$0
-	jmp	1f
-	.endfn	__asan_stack_free_0,globl
-__asan_stack_free_1:
-	push	$1
-	jmp	1f
-	.endfn	__asan_stack_free_1,globl
-__asan_stack_free_2:
-	push	$2
-	jmp	1f
-	.endfn	__asan_stack_free_2,globl
-__asan_stack_free_3:
-	push	$3
-	jmp	1f
-	.endfn	__asan_stack_free_3,globl
-__asan_stack_free_4:
-	push	$4
-	jmp	1f
-	.endfn	__asan_stack_free_4,globl
-__asan_stack_free_5:
-	push	$5
-	.endfn	__asan_stack_free_5,globl
-__asan_stack_free_hop:
-1:	pop	%rdx
-	jmp	__asan_stack_free
-	.endfn	__asan_report_store_n,globl
-__asan_stack_free_6:
-	push	$6
-	jmp	1b
-	.endfn	__asan_stack_free_6,globl
-__asan_stack_free_7:
-	push	$7
-	jmp	1b
-	.endfn	__asan_stack_free_7,globl
-__asan_stack_free_8:
-	push	$8
-	jmp	1b
-	.endfn	__asan_stack_free_8,globl
-__asan_stack_free_9:
-	push	$9
-	jmp	1b
-	.endfn	__asan_stack_free_9,globl
-__asan_stack_free_10:
-	push	$10
-	jmp	1b
-	.endfn	__asan_stack_free_10,globl
-
-__asan_stack_malloc_0:
-	push	$0
-	jmp	1f
-	.endfn	__asan_stack_malloc_0,globl
-__asan_stack_malloc_1:
-	push	$1
-	jmp	1f
-	.endfn	__asan_stack_malloc_1,globl
-__asan_stack_malloc_2:
-	push	$2
-	jmp	1f
-	.endfn	__asan_stack_malloc_2,globl
-__asan_stack_malloc_3:
-	push	$3
-	jmp	1f
-	.endfn	__asan_stack_malloc_3,globl
-__asan_stack_malloc_4:
-	push	$4
-	jmp	1f
-	.endfn	__asan_stack_malloc_4,globl
-__asan_stack_malloc_5:
-	push	$5
-	jmp	1f
-	.endfn	__asan_stack_malloc_5,globl
-__asan_stack_malloc_hop:
-1:	pop	%rsi
-	jmp	__asan_stack_malloc
-	.endfn	__asan_report_store_n,globl
-__asan_stack_malloc_6:
-	push	$6
-	jmp	1b
-	.endfn	__asan_stack_malloc_6,globl
-__asan_stack_malloc_7:
-	push	$7
-	jmp	1b
-	.endfn	__asan_stack_malloc_7,globl
-__asan_stack_malloc_8:
-	push	$8
-	jmp	1b
-	.endfn	__asan_stack_malloc_8,globl
-__asan_stack_malloc_9:
-	push	$9
-	jmp	1b
-	.endfn	__asan_stack_malloc_9,globl
-__asan_stack_malloc_10:
-	push	$10
-	jmp	1b
-	.endfn	__asan_stack_malloc_10,globl
-
-__asan_version_mismatch_check_v8:
-	ret
-	.endfn	__asan_version_mismatch_check_v8,globl
-
-//	Initializes Address Sanitizer runtime earlier if linked.
-	.init.start 303,_init_asan
-	push	%rdi
-	push	%rsi
-	mov	%r12,%rdi
-	mov	%r13,%rsi
-	mov	%r14,%rdx
-	mov	%r15,%rcx
-	call	__asan_init
-	pop	%rsi
-	pop	%rdi
-	.init.end 303,_init_asan
-
-__asan_load1:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_load1,globl
-
-__asan_load2:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_load2,globl
-
-__asan_load4:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_load4,globl
-
-__asan_load8:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_load8,globl
-
-__asan_load16:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_load16,globl
-
-__asan_load32:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_load32,globl
-
-__asan_store1:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_store1,globl
-
-__asan_store2:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_store2,globl
-
-__asan_store4:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_store4,globl
-
-__asan_store8:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_store8,globl
-
-__asan_store16:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_store16,globl
-
-__asan_store32:
-	push	%rbp
-	mov	%rsp,%rbp
-	ud2
-	.endfn	__asan_store32,globl
diff --git a/libc/log/loglevel.S b/libc/log/loglevel.S
deleted file mode 100644
index 9bc16836c..000000000
--- a/libc/log/loglevel.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/log/log.h"
-#include "libc/macros.internal.h"
-
-	.bss
-	.balign	4
-__log_level:
-	.long	0
-	.endobj	__log_level,globl
-	.previous
-
-	.init.start 200,_init_log_level
-	movb	$kLogInfo,__log_level(%rip)
-	.init.end 200,_init_log_level
diff --git a/third_party/getopt/initgetopt.S b/libc/log/loglevel.c
similarity index 80%
rename from third_party/getopt/initgetopt.S
rename to libc/log/loglevel.c
index ffc4f7f2b..5d5da8975 100644
--- a/third_party/getopt/initgetopt.S
+++ b/libc/log/loglevel.c
@@ -1,7 +1,7 @@
-/*-*- mode:asm; indent-tabs-mode:t; tab-width:8; coding:utf-8               -*-│
-│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
+/*-*- 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                              │
+│ Copyright 2023 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         │
@@ -16,12 +16,6 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.internal.h"
+#include "libc/log/log.h"
 
-	.init.start 201,_init_getopt
-	push	$1
-	pop	%rax
-	mov	%eax,opterr(%rip)
-	mov	%eax,optind(%rip)
-	movl	$kGetoptEmsg,getopt_place(%rip)
-	.init.end 201,_init_getopt
+unsigned __log_level = kLogInfo;
diff --git a/libc/runtime/cosmo2.c b/libc/runtime/cosmo2.c
index 936d2ac5a..22dba5fd1 100644
--- a/libc/runtime/cosmo2.c
+++ b/libc/runtime/cosmo2.c
@@ -16,6 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/strace.internal.h"
 #include "libc/macros.internal.h"
@@ -81,6 +82,10 @@ textstartup void cosmo(long *sp) {
   argc = __strace_init(argc, argv, envp, auxv);
 #endif
 
+#if IsAsan()
+  __asan_init(argc, argv, envp, auxv);
+#endif
+
   // set helpful globals
   __argc = argc;
   __argv = argv;
diff --git a/libc/runtime/internal.h b/libc/runtime/internal.h
index 3c1333a8d..7ae8daa14 100644
--- a/libc/runtime/internal.h
+++ b/libc/runtime/internal.h
@@ -35,6 +35,7 @@ void __enable_threads(void) _Hide;
 void *__cxa_finalize(void *) _Hide;
 void __stack_chk_fail(void) wontreturn relegated;
 void __stack_chk_fail_local(void) wontreturn relegated _Hide;
+void __asan_init(int, char **, char **, intptr_t *) _Hide;
 void _jmpstack(void *, void *, ...) _Hide wontreturn;
 long _setstack(void *, void *, ...) _Hide;
 int GetDosArgv(const char16_t *, char *, size_t, char **, size_t);
diff --git a/libc/runtime/runtime.mk b/libc/runtime/runtime.mk
index 352186b79..ac403ea99 100644
--- a/libc/runtime/runtime.mk
+++ b/libc/runtime/runtime.mk
@@ -71,6 +71,7 @@ o/$(MODE)/libc/runtime/ftracer.o: private		\
 			-ffreestanding			\
 			-fno-sanitize=all
 
+o/$(MODE)/libc/runtime/cosmo2.o				\
 o/$(MODE)/libc/runtime/fork-nt.o			\
 o/$(MODE)/libc/runtime/printmemoryintervals.o		\
 o/$(MODE)/libc/runtime/arememoryintervalsok.o		\
diff --git a/libc/str/str.mk b/libc/str/str.mk
index bf2cf5302..417d4f0e4 100644
--- a/libc/str/str.mk
+++ b/libc/str/str.mk
@@ -45,6 +45,9 @@ $(LIBC_STR_A).pkg:						\
 		$(LIBC_STR_A_OBJS)				\
 		$(foreach x,$(LIBC_STR_A_DIRECTDEPS),$($(x)_A).pkg)
 
+o/$(MODE)/libc/str/wow.o: private				\
+		CC = gcc
+
 o/$(MODE)/libc/str/wmemset.o					\
 o/$(MODE)/libc/str/memset16.o					\
 o/$(MODE)/libc/str/dosdatetimetounix.o: private			\
diff --git a/libc/testlib/polluteregisters.S b/libc/testlib/polluteregisters.S
index 62971dc97..df7d75def 100644
--- a/libc/testlib/polluteregisters.S
+++ b/libc/testlib/polluteregisters.S
@@ -20,6 +20,7 @@
 #include "libc/macros.internal.h"
 
 __polluteregisters:
+#ifdef __x86_64__
 	.leafprologue
 	xor	%eax,%eax
 	xor	%ecx,%ecx
@@ -48,6 +49,9 @@ __polluteregisters:
 	xorps	%xmm6,%xmm6
 	xorps	%xmm7,%xmm7
 	.leafepilogue
+#else
+	ret
+#endif
 	.endfn	__polluteregisters,globl
 
 	.end
diff --git a/libc/testlib/showerror.c b/libc/testlib/showerror.c
index 60cc7345a..167df6357 100644
--- a/libc/testlib/showerror.c
+++ b/libc/testlib/showerror.c
@@ -32,10 +32,10 @@
 const char *testlib_showerror_errno;
 const char *testlib_showerror_file;
 const char *testlib_showerror_func;
-const char *testlib_showerror_isfatal;
 const char *testlib_showerror_macro;
 const char *testlib_showerror_symbol;
 
+// TODO(jart): Pay off tech debt re duplication
 void testlib_showerror(const char *file, int line, const char *func,
                        const char *method, const char *symbol, const char *code,
                        char *v1, char *v2) {
@@ -56,12 +56,14 @@ void testlib_showerror(const char *file, int line, const char *func,
   free(v2);
 }
 
-/* TODO(jart): Pay off tech debt re duplication */
-void testlib_showerror_(int line, const char *wantcode, const char *gotcode,
-                        char *FREED_want, char *FREED_got, const char *fmt,
-                        ...) {
+static void testlib_showerror_(int line,              //
+                               const char *wantcode,  //
+                               const char *gotcode,   //
+                               char *FREED_want,      //
+                               char *FREED_got,       //
+                               const char *fmt,       //
+                               va_list va) {
   int e;
-  va_list va;
   char hostname[128];
   e = errno;
   if (gethostname(hostname, sizeof(hostname))) {
@@ -81,9 +83,7 @@ void testlib_showerror_(int line, const char *wantcode, const char *gotcode,
   }
   if (!isempty(fmt)) {
     kprintf("\t");
-    va_start(va, fmt);
     kvprintf(fmt, va);
-    va_end(va);
     kprintf("\n");
   }
   kprintf("\t%s%s%s\n"
@@ -93,7 +93,128 @@ void testlib_showerror_(int line, const char *wantcode, const char *gotcode,
   free(FREED_want);
   free(FREED_got);
   ++g_testlib_failed;
-  if (testlib_showerror_isfatal) {
-    testlib_abort();
-  }
+}
+
+void testlib_showerror_assert_eq(int line,              //
+                                 const char *wantcode,  //
+                                 const char *gotcode,   //
+                                 char *FREED_want,      //
+                                 char *FREED_got,       //
+                                 const char *fmt,       //
+                                 ...) {
+  va_list va;
+  testlib_showerror_macro = "ASSERT_EQ";
+  testlib_showerror_symbol = "=";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
+  testlib_abort();
+}
+
+void testlib_showerror_expect_eq(int line,              //
+                                 const char *wantcode,  //
+                                 const char *gotcode,   //
+                                 char *FREED_want,      //
+                                 char *FREED_got,       //
+                                 const char *fmt,       //
+                                 ...) {
+  va_list va;
+  testlib_showerror_macro = "EXPECT_EQ";
+  testlib_showerror_symbol = "=";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
+}
+
+void testlib_showerror_assert_ne(int line,              //
+                                 const char *wantcode,  //
+                                 const char *gotcode,   //
+                                 char *FREED_want,      //
+                                 char *FREED_got,       //
+                                 const char *fmt,       //
+                                 ...) {
+  va_list va;
+  testlib_showerror_macro = "ASSERT_NE";
+  testlib_showerror_symbol = "≠";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
+  testlib_abort();
+}
+
+void testlib_showerror_expect_ne(int line,              //
+                                 const char *wantcode,  //
+                                 const char *gotcode,   //
+                                 char *FREED_want,      //
+                                 char *FREED_got,       //
+                                 const char *fmt,       //
+                                 ...) {
+  va_list va;
+  testlib_showerror_macro = "EXPECT_NE";
+  testlib_showerror_symbol = "≠";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
+}
+
+void testlib_showerror_assert_true(int line,              //
+                                   const char *wantcode,  //
+                                   const char *gotcode,   //
+                                   char *FREED_want,      //
+                                   char *FREED_got,       //
+                                   const char *fmt,       //
+                                   ...) {
+  va_list va;
+  testlib_showerror_macro = "ASSERT_TRUE";
+  testlib_showerror_symbol = "";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
+  testlib_abort();
+}
+
+void testlib_showerror_expect_true(int line,              //
+                                   const char *wantcode,  //
+                                   const char *gotcode,   //
+                                   char *FREED_want,      //
+                                   char *FREED_got,       //
+                                   const char *fmt,       //
+                                   ...) {
+  va_list va;
+  testlib_showerror_macro = "EXPECT_TRUE";
+  testlib_showerror_symbol = "";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
+}
+
+void testlib_showerror_assert_false(int line,              //
+                                    const char *wantcode,  //
+                                    const char *gotcode,   //
+                                    char *FREED_want,      //
+                                    char *FREED_got,       //
+                                    const char *fmt,       //
+                                    ...) {
+  va_list va;
+  testlib_showerror_macro = "ASSERT_FALSE";
+  testlib_showerror_symbol = "!";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
+  testlib_abort();
+}
+
+void testlib_showerror_expect_false(int line,              //
+                                    const char *wantcode,  //
+                                    const char *gotcode,   //
+                                    char *FREED_want,      //
+                                    char *FREED_got,       //
+                                    const char *fmt,       //
+                                    ...) {
+  va_list va;
+  testlib_showerror_macro = "EXPECT_FALSE";
+  testlib_showerror_symbol = "!";
+  va_start(va, fmt);
+  testlib_showerror_(line, wantcode, gotcode, FREED_want, FREED_got, fmt, va);
+  va_end(va);
 }
diff --git a/libc/testlib/testlib.mk b/libc/testlib/testlib.mk
index 74ba7b4a7..7bcebe91d 100644
--- a/libc/testlib/testlib.mk
+++ b/libc/testlib/testlib.mk
@@ -39,16 +39,6 @@ LIBC_TESTLIB_A_SRCS_S =						\
 	libc/testlib/polluteregisters.S				\
 	libc/testlib/testcase.S					\
 	libc/testlib/thrashcodecache.S				\
-	libc/testlib/thunks/assert_eq.S				\
-	libc/testlib/thunks/assert_false.S			\
-	libc/testlib/thunks/assert_ne.S				\
-	libc/testlib/thunks/assert_true.S			\
-	libc/testlib/thunks/expect_eq.S				\
-	libc/testlib/thunks/expect_false.S			\
-	libc/testlib/thunks/expect_ne.S				\
-	libc/testlib/thunks/expect_true.S			\
-	libc/testlib/thunks/free.S				\
-	libc/testlib/thunks/jump.S				\
 	libc/testlib/viewables.S
 
 LIBC_TESTLIB_A_SRCS_C =						\
@@ -87,6 +77,7 @@ LIBC_TESTLIB_A_SRCS_C =						\
 	libc/testlib/strequals.c				\
 	libc/testlib/strerror.c					\
 	libc/testlib/testrunner.c				\
+	libc/testlib/thunks.c					\
 	libc/testlib/waitforexit.c				\
 	libc/testlib/waitforterm.c				\
 	libc/testlib/yield.c
@@ -118,6 +109,7 @@ LIBC_TESTLIB_A_DIRECTDEPS =					\
 	LIBC_TINYMATH						\
 	LIBC_X							\
 	LIBC_ZIPOS						\
+	THIRD_PARTY_COMPILER_RT					\
 	THIRD_PARTY_DLMALLOC					\
 	THIRD_PARTY_GDTOA					\
 	THIRD_PARTY_XED
@@ -139,6 +131,28 @@ o/$(MODE)/libc/testlib/viewables.o: libc/testlib/viewables.txt
 o/$(MODE)/libc/testlib/hyperion.o: libc/testlib/hyperion.txt
 o/$(MODE)/libc/testlib/moby.o: libc/testlib/moby.txt
 
+# these assembly files are safe to build on aarch64
+o/$(MODE)/libc/testlib/bench.o: libc/testlib/bench.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/blocktronics.o: libc/testlib/blocktronics.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/combo.o: libc/testlib/combo.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/fixture.o: libc/testlib/fixture.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/hyperion.o: libc/testlib/hyperion.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/moby.o: libc/testlib/moby.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/polluteregisters.o: libc/testlib/polluteregisters.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/testcase.o: libc/testlib/testcase.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/thrashcodecache.o: libc/testlib/thrashcodecache.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+o/$(MODE)/libc/testlib/viewables.o: libc/testlib/viewables.S
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
+
 #───────────────────────────────────────────────────────────────────────────────
 
 LIBC_TESTLIB_ARTIFACTS += LIBC_TESTLIB_RUNNER_A
diff --git a/libc/testlib/thrashcodecache.S b/libc/testlib/thrashcodecache.S
index 171db6cea..c932064f8 100644
--- a/libc/testlib/thrashcodecache.S
+++ b/libc/testlib/thrashcodecache.S
@@ -21,6 +21,7 @@
 
 //	Empties L1 instruction cache.
 thrashcodecache:
+#ifdef __x86_64__
 	.leafprologue
 	push	%rbx
 	xor	%eax,%eax
@@ -42,4 +43,7 @@ thrashcodecache:
 	cpuid
 	pop	%rbx
 	.leafepilogue
+#else
+	ret
+#endif
 	.endfn	thrashcodecache,globl
diff --git a/libc/testlib/thunks/assert_eq.S b/libc/testlib/thunks.c
similarity index 79%
rename from libc/testlib/thunks/assert_eq.S
rename to libc/testlib/thunks.c
index 0a20900ef..1f9f1eb1d 100644
--- a/libc/testlib/thunks/assert_eq.S
+++ b/libc/testlib/thunks.c
@@ -1,7 +1,7 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
+/*-*- 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                              │
+│ Copyright 2023 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         │
@@ -16,13 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.internal.h"
+#include "libc/mem/mem.h"
+#include "libc/testlib/testlib.h"
 
-	.text.unlikely
-testlib_showerror_assert_eq:
-	push	$TRUE
-	pushstr	"ASSERT_EQ"
-	pushstr	"="
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_assert_eq,globl,hidden
-	.previous
+void testlib_free(void *p) {
+  free(p);
+}
diff --git a/libc/testlib/thunks/assert_false.S b/libc/testlib/thunks/assert_false.S
deleted file mode 100644
index f7bc2cd87..000000000
--- a/libc/testlib/thunks/assert_false.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_assert_false:
-	push	$TRUE
-	pushstr	"ASSERT_FALSE"
-	pushstr	"!"
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_assert_false,globl,hidden
-	.previous
diff --git a/libc/testlib/thunks/assert_ne.S b/libc/testlib/thunks/assert_ne.S
deleted file mode 100644
index 850eca544..000000000
--- a/libc/testlib/thunks/assert_ne.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_assert_ne:
-	push	$TRUE
-	pushstr	"ASSERT_NE"
-	pushstr	"≠"
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_assert_ne,globl,hidden
-	.previous
diff --git a/libc/testlib/thunks/assert_true.S b/libc/testlib/thunks/assert_true.S
deleted file mode 100644
index 4389957c5..000000000
--- a/libc/testlib/thunks/assert_true.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_assert_true:
-	push	$TRUE
-	pushstr	"ASSERT_TRUE"
-	pushstr	""
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_assert_true,globl,hidden
-	.previous
diff --git a/libc/testlib/thunks/expect_eq.S b/libc/testlib/thunks/expect_eq.S
deleted file mode 100644
index b703f4bcd..000000000
--- a/libc/testlib/thunks/expect_eq.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_expect_eq:
-	push	$FALSE
-	pushstr	"EXPECT_EQ"
-	pushstr	"="
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_expect_eq,globl,hidden
-	.previous
diff --git a/libc/testlib/thunks/expect_false.S b/libc/testlib/thunks/expect_false.S
deleted file mode 100644
index 900f8bd1d..000000000
--- a/libc/testlib/thunks/expect_false.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_expect_false:
-	push	$FALSE
-	pushstr	"EXPECT_FALSE"
-	pushstr	"!"
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_expect_false,globl,hidden
-	.previous
diff --git a/libc/testlib/thunks/expect_ne.S b/libc/testlib/thunks/expect_ne.S
deleted file mode 100644
index 55ba142de..000000000
--- a/libc/testlib/thunks/expect_ne.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_expect_ne:
-	push	$FALSE
-	pushstr	"EXPECT_NE"
-	pushstr	"≠"
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_expect_ne,globl,hidden
-	.previous
diff --git a/libc/testlib/thunks/expect_true.S b/libc/testlib/thunks/expect_true.S
deleted file mode 100644
index 3f2953b3d..000000000
--- a/libc/testlib/thunks/expect_true.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_expect_true:
-	push	$FALSE
-	pushstr	"EXPECT_TRUE"
-	pushstr	""
-	jmp	testlib_showerror_jump
-	.endfn	testlib_showerror_expect_true,globl,hidden
-	.previous
diff --git a/libc/testlib/thunks/jump.S b/libc/testlib/thunks/jump.S
deleted file mode 100644
index 5c23a9010..000000000
--- a/libc/testlib/thunks/jump.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 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/macros.internal.h"
-
-	.text.unlikely
-testlib_showerror_jump:
-	popstr	testlib_showerror_symbol(%rip)
-	popstr	testlib_showerror_macro(%rip)
-	pop	testlib_showerror_isfatal(%rip)
-	jmp	testlib_showerror_
-	.endfn	testlib_showerror_jump,globl,hidden
-	.previous
diff --git a/libc/tinymath/roundf.c b/libc/tinymath/roundf.c
index 1afaa8a4a..da07795a1 100644
--- a/libc/tinymath/roundf.c
+++ b/libc/tinymath/roundf.c
@@ -54,6 +54,16 @@ float roundf(float x)
 	asm("frinta\t%s0,%s1" : "=w"(x) : "w"(x));
 	return x;
 
+#elif defined(__powerpc64__) && defined(_ARCH_PWR5X)
+
+	asm("frin\t%0,%1" : "=f"(x) : "f"(x));
+	return x;
+
+#elif defined(__s390x__) && (defined(__HTM__) || __ARCH__ >= 9)
+
+	asm("fiebra\t%0,1,%1,4" : "=f"(x) : "f"(x));
+	return x;
+
 #else
 
 	union {float f; uint32_t i;} u = {x};
diff --git a/libc/vga/readv-vga.c b/libc/vga/readv-vga.c
index a03ba3d8f..983847111 100644
--- a/libc/vga/readv-vga.c
+++ b/libc/vga/readv-vga.c
@@ -29,6 +29,8 @@
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/vga/vga.internal.h"
 
+#ifdef __x86_64__
+
 ssize_t sys_readv_vga(struct Fd *fd, const struct iovec *iov, int iovlen) {
   /*
    * NOTE: this routine is always non-blocking.
@@ -52,3 +54,5 @@ ssize_t sys_readv_vga(struct Fd *fd, const struct iovec *iov, int iovlen) {
   if (!redd) return res;
   return redd;
 }
+
+#endif /* __x86_64__ */
diff --git a/libc/vga/tty-klog.greg.c b/libc/vga/tty-klog.greg.c
index 3b957d858..4730abd8d 100644
--- a/libc/vga/tty-klog.greg.c
+++ b/libc/vga/tty-klog.greg.c
@@ -30,6 +30,8 @@
 #include "libc/str/str.h"
 #include "libc/vga/vga.internal.h"
 
+#ifdef __x86_64__
+
 /*
  * @fileoverview Instantiation of routines for emergency or system console
  * output in graphical video modes.
@@ -95,3 +97,5 @@ privileged void _klog_vga(const char *b, size_t n) {
   klog_y = _TtyGetY(&tty);
   klog_x = _TtyGetX(&tty);
 }
+
+#endif /* __x86_64__ */
diff --git a/libc/vga/vga-init.greg.c b/libc/vga/vga-init.greg.c
index 12d817b8b..a4d4de62d 100644
--- a/libc/vga/vga-init.greg.c
+++ b/libc/vga/vga-init.greg.c
@@ -29,6 +29,8 @@
 #include "libc/str/str.h"
 #include "libc/vga/vga.internal.h"
 
+#ifdef __x86_64__
+
 struct Tty _vga_tty;
 
 void _vga_reinit(struct Tty *tty, unsigned short starty, unsigned short startx,
@@ -70,3 +72,5 @@ textstartup void _vga_init(void) {
     _vga_reinit(&_vga_tty, starty, startx, 0);
   }
 }
+
+#endif /* __x86_64__ */
diff --git a/libc/vga/writev-vga.c b/libc/vga/writev-vga.c
index 59f390070..6b879447c 100644
--- a/libc/vga/writev-vga.c
+++ b/libc/vga/writev-vga.c
@@ -30,6 +30,8 @@
 #include "libc/dce.h"
 #include "libc/vga/vga.internal.h"
 
+#ifdef __x86_64__
+
 ssize_t sys_writev_vga(struct Fd *fd, const struct iovec *iov, int iovlen) {
   size_t i, wrote = 0;
   ssize_t res = 0;
@@ -44,3 +46,5 @@ ssize_t sys_writev_vga(struct Fd *fd, const struct iovec *iov, int iovlen) {
   if (!wrote) return res;
   return wrote;
 }
+
+#endif /* __x86_64__ */
diff --git a/test/libc/tinymath/acosh_test.c b/test/libc/tinymath/acosh_test.c
index d358ec3bc..ed2ea29f8 100644
--- a/test/libc/tinymath/acosh_test.c
+++ b/test/libc/tinymath/acosh_test.c
@@ -21,36 +21,36 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define acoshl(x) acoshl(VEIL("t", (long double)(x)))
-#define acosh(x)  acosh(VEIL("x", (double)(x)))
-#define acoshf(x) acoshf(VEIL("x", (float)(x)))
+double _acosh(double) asm("acosh");
+float _acoshf(float) asm("acoshf");
+long double _acoshl(long double) asm("acoshl");
 
 TEST(acosh, test) {
-  EXPECT_STREQ(".962423650119207", gc(xdtoa(acosh(1.5))));
-  EXPECT_STREQ("0", gc(xdtoa(acosh(1))));
-  EXPECT_TRUE(isnan(acosh(NAN)));
-  EXPECT_TRUE(isnan(acosh(.5)));
-  EXPECT_TRUE(isnan(acosh(-.5)));
-  EXPECT_TRUE(isnan(acosh(-1.5)));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(acosh(INFINITY))));
+  EXPECT_STREQ(".962423650119207", gc(xdtoa(_acosh(1.5))));
+  EXPECT_STREQ("0", gc(xdtoa(_acosh(1))));
+  EXPECT_TRUE(isnan(_acosh(NAN)));
+  EXPECT_TRUE(isnan(_acosh(.5)));
+  EXPECT_TRUE(isnan(_acosh(-.5)));
+  EXPECT_TRUE(isnan(_acosh(-1.5)));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_acosh(INFINITY))));
 }
 
 TEST(acoshf, test) {
-  EXPECT_STREQ(".962424", gc(xdtoaf(acoshf(1.5))));
-  EXPECT_STREQ("0", gc(xdtoaf(acoshf(1))));
-  EXPECT_TRUE(isnan(acoshf(NAN)));
-  EXPECT_TRUE(isnan(acoshf(.5)));
-  EXPECT_TRUE(isnan(acoshf(-.5)));
-  EXPECT_TRUE(isnan(acoshf(-1.5)));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(acoshf(INFINITY))));
+  EXPECT_STREQ(".962424", gc(xdtoaf(_acoshf(1.5))));
+  EXPECT_STREQ("0", gc(xdtoaf(_acoshf(1))));
+  EXPECT_TRUE(isnan(_acoshf(NAN)));
+  EXPECT_TRUE(isnan(_acoshf(.5)));
+  EXPECT_TRUE(isnan(_acoshf(-.5)));
+  EXPECT_TRUE(isnan(_acoshf(-1.5)));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_acoshf(INFINITY))));
 }
 
 TEST(acoshl, test) {
-  EXPECT_STREQ(".9624236501192069", gc(xdtoal(acoshl(1.5))));
-  EXPECT_STREQ("0", gc(xdtoal(acoshl(1))));
-  EXPECT_TRUE(isnan(acoshl(NAN)));
-  EXPECT_TRUE(isnan(acoshl(.5)));
-  EXPECT_TRUE(isnan(acoshl(-.5)));
-  EXPECT_TRUE(isnan(acoshl(-1.5)));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(acoshl(INFINITY))));
+  EXPECT_STREQ(".9624236501192069", gc(xdtoal(_acoshl(1.5))));
+  EXPECT_STREQ("0", gc(xdtoal(_acoshl(1))));
+  EXPECT_TRUE(isnan(_acoshl(NAN)));
+  EXPECT_TRUE(isnan(_acoshl(.5)));
+  EXPECT_TRUE(isnan(_acoshl(-.5)));
+  EXPECT_TRUE(isnan(_acoshl(-1.5)));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_acoshl(INFINITY))));
 }
diff --git a/test/libc/tinymath/asinh_test.c b/test/libc/tinymath/asinh_test.c
index 4ba5590e8..2fa41a017 100644
--- a/test/libc/tinymath/asinh_test.c
+++ b/test/libc/tinymath/asinh_test.c
@@ -22,32 +22,32 @@
 #include "libc/x/x.h"
 #include "libc/x/xasprintf.h"
 
-#define asinhl(x) asinhl(VEIL("t", (long double)(x)))
-#define asinh(x)  asinh(VEIL("x", (double)(x)))
-#define asinhf(x) asinhf(VEIL("x", (float)(x)))
+double _asinh(double) asm("asinh");
+float _asinhf(float) asm("asinhf");
+long double _asinhl(long double) asm("asinhl");
 
 TEST(asinh, test) {
-  EXPECT_STREQ(".481211825059603", _gc(xdtoa(asinh(+.5))));
-  EXPECT_STREQ("-.481211825059603", _gc(xdtoa(asinh(-.5))));
-  EXPECT_STREQ("0", _gc(xdtoa(asinh(0))));
-  EXPECT_STREQ("NAN", _gc(xdtoa(asinh(NAN))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoa(asinh(INFINITY))));
+  EXPECT_STREQ(".481211825059603", _gc(xdtoa(_asinh(+.5))));
+  EXPECT_STREQ("-.481211825059603", _gc(xdtoa(_asinh(-.5))));
+  EXPECT_STREQ("0", _gc(xdtoa(_asinh(0))));
+  EXPECT_STREQ("NAN", _gc(xdtoa(_asinh(NAN))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoa(_asinh(INFINITY))));
   EXPECT_STREQ("-2.1073424255447e-08",
-               _gc(xasprintf("%.15g", asinh(-2.1073424255447e-08))));
+               _gc(xasprintf("%.15g", _asinh(-2.1073424255447e-08))));
 }
 
 TEST(asinhf, test) {
-  EXPECT_STREQ(".481212", _gc(xdtoaf(asinhf(+.5))));
-  EXPECT_STREQ("-.481212", _gc(xdtoaf(asinhf(-.5))));
-  EXPECT_STREQ("0", _gc(xdtoaf(asinhf(0))));
-  EXPECT_STREQ("NAN", _gc(xdtoaf(asinhf(NAN))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoaf(asinhf(INFINITY))));
+  EXPECT_STREQ(".481212", _gc(xdtoaf(_asinhf(+.5))));
+  EXPECT_STREQ("-.481212", _gc(xdtoaf(_asinhf(-.5))));
+  EXPECT_STREQ("0", _gc(xdtoaf(_asinhf(0))));
+  EXPECT_STREQ("NAN", _gc(xdtoaf(_asinhf(NAN))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoaf(_asinhf(INFINITY))));
 }
 
 TEST(asinhl, test) {
-  EXPECT_STREQ(".4812118250596034", _gc(xdtoal(asinhl(+.5))));
-  EXPECT_STREQ("-.4812118250596034", _gc(xdtoal(asinhl(-.5))));
-  EXPECT_STREQ("0", _gc(xdtoal(asinhl(0))));
-  EXPECT_STREQ("NAN", _gc(xdtoal(asinhl(NAN))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoal(asinhl(INFINITY))));
+  EXPECT_STREQ(".4812118250596034", _gc(xdtoal(_asinhl(+.5))));
+  EXPECT_STREQ("-.4812118250596034", _gc(xdtoal(_asinhl(-.5))));
+  EXPECT_STREQ("0", _gc(xdtoal(_asinhl(0))));
+  EXPECT_STREQ("NAN", _gc(xdtoal(_asinhl(NAN))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoal(_asinhl(INFINITY))));
 }
diff --git a/test/libc/tinymath/atanh_test.c b/test/libc/tinymath/atanh_test.c
index 6804ab6ce..f2fe695be 100644
--- a/test/libc/tinymath/atanh_test.c
+++ b/test/libc/tinymath/atanh_test.c
@@ -23,48 +23,48 @@
 #include "libc/x/x.h"
 #include "libc/x/xasprintf.h"
 
-#define atanhl(x) atanhl(VEIL("t", (long double)(x)))
-#define atanh(x)  atanh(VEIL("x", (double)(x)))
-#define atanhf(x) atanhf(VEIL("x", (float)(x)))
+double _atanh(double) asm("atanh");
+float _atanhf(float) asm("atanhf");
+long double _atanhl(long double) asm("atanhl");
 
 TEST(atanh, test) {
-  EXPECT_STREQ("0", _gc(xdtoa(atanh(0))));
-  EXPECT_STREQ("-0", _gc(xdtoa(atanh(-0.))));
-  EXPECT_STREQ(".549306144334055", _gc(xdtoa(atanh(.5))));
-  EXPECT_STREQ("-.549306144334055", _gc(xdtoa(atanh(-.5))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoa(atanh(+1))));
-  EXPECT_STREQ("-INFINITY", _gc(xdtoa(atanh(-1))));
-  EXPECT_TRUE(isnan(atanh(+1.1)));
-  EXPECT_TRUE(isnan(atanh(-1.1)));
+  EXPECT_STREQ("0", _gc(xdtoa(_atanh(0))));
+  EXPECT_STREQ("-0", _gc(xdtoa(_atanh(-0.))));
+  EXPECT_STREQ(".549306144334055", _gc(xdtoa(_atanh(.5))));
+  EXPECT_STREQ("-.549306144334055", _gc(xdtoa(_atanh(-.5))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoa(_atanh(+1))));
+  EXPECT_STREQ("-INFINITY", _gc(xdtoa(_atanh(-1))));
+  EXPECT_TRUE(isnan(_atanh(+1.1)));
+  EXPECT_TRUE(isnan(_atanh(-1.1)));
   EXPECT_STREQ("-2.1073424255447e-08",
-               _gc(xasprintf("%.15g", atanh(-2.1073424255447e-08))));
+               _gc(xasprintf("%.15g", _atanh(-2.1073424255447e-08))));
 }
 
 TEST(atanhl, test) {
-  EXPECT_STREQ("0", _gc(xdtoal(atanhl(0))));
-  EXPECT_STREQ("-0", _gc(xdtoal(atanhl(-0.))));
-  EXPECT_STREQ(".5493061443340548", _gc(xdtoal(atanhl(.5))));
-  EXPECT_STREQ("-.5493061443340548", _gc(xdtoal(atanhl(-.5))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoal(atanhl(+1))));
-  EXPECT_STREQ("-INFINITY", _gc(xdtoal(atanhl(-1))));
-  EXPECT_TRUE(isnan(atanhl(+1.1)));
-  EXPECT_TRUE(isnan(atanhl(-1.1)));
+  EXPECT_STREQ("0", _gc(xdtoal(_atanhl(0))));
+  EXPECT_STREQ("-0", _gc(xdtoal(_atanhl(-0.))));
+  EXPECT_STREQ(".5493061443340548", _gc(xdtoal(_atanhl(.5))));
+  EXPECT_STREQ("-.5493061443340548", _gc(xdtoal(_atanhl(-.5))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoal(_atanhl(+1))));
+  EXPECT_STREQ("-INFINITY", _gc(xdtoal(_atanhl(-1))));
+  EXPECT_TRUE(isnan(_atanhl(+1.1)));
+  EXPECT_TRUE(isnan(_atanhl(-1.1)));
 }
 
 TEST(atanhf, test) {
-  EXPECT_STREQ("0", _gc(xdtoaf(atanhf(0))));
-  EXPECT_STREQ("-0", _gc(xdtoaf(atanhf(-0.))));
-  EXPECT_STREQ(".549306", _gc(xdtoaf(atanhf(.5))));
-  EXPECT_STREQ("-.549306", _gc(xdtoaf(atanhf(-.5))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoaf(atanhf(+1))));
-  EXPECT_STREQ("-INFINITY", _gc(xdtoaf(atanhf(-1))));
-  EXPECT_TRUE(isnan(atanhf(+1.1)));
-  EXPECT_TRUE(isnan(atanhf(-1.1)));
+  EXPECT_STREQ("0", _gc(xdtoaf(_atanhf(0))));
+  EXPECT_STREQ("-0", _gc(xdtoaf(_atanhf(-0.))));
+  EXPECT_STREQ(".549306", _gc(xdtoaf(_atanhf(.5))));
+  EXPECT_STREQ("-.549306", _gc(xdtoaf(_atanhf(-.5))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoaf(_atanhf(+1))));
+  EXPECT_STREQ("-INFINITY", _gc(xdtoaf(_atanhf(-1))));
+  EXPECT_TRUE(isnan(_atanhf(+1.1)));
+  EXPECT_TRUE(isnan(_atanhf(-1.1)));
 }
 
-BENCH(atanh, bench) {
+BENCH(_atanh, bench) {
   volatile double a = .5;
-  EZBENCH2("atanhf", donothing, EXPROPRIATE(atanhf(a)));
-  EZBENCH2("atanh", donothing, EXPROPRIATE(atanh(a)));
-  EZBENCH2("atanhl", donothing, EXPROPRIATE(atanhl(a)));
+  EZBENCH2("atanhf", donothing, EXPROPRIATE(_atanhf(a)));
+  EZBENCH2("atanh", donothing, EXPROPRIATE(_atanh(a)));
+  EZBENCH2("atanhl", donothing, EXPROPRIATE(_atanhl(a)));
 }
diff --git a/test/libc/tinymath/cosh_test.c b/test/libc/tinymath/cosh_test.c
index 8bb3c1aa7..921bcbf7c 100644
--- a/test/libc/tinymath/cosh_test.c
+++ b/test/libc/tinymath/cosh_test.c
@@ -21,42 +21,42 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define coshl(x) coshl(VEIL("t", (long double)(x)))
-#define cosh(x)  cosh(VEIL("x", (double)(x)))
-#define coshf(x) coshf(VEIL("x", (float)(x)))
+double _cosh(double) asm("cosh");
+float _coshf(float) asm("coshf");
+long double _coshl(long double) asm("coshl");
 
 TEST(coshl, test) {
-  EXPECT_STREQ("1.127625965206381", gc(xdtoal(coshl(+.5))));
-  EXPECT_STREQ("1.127625965206381", gc(xdtoal(coshl(-.5))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(coshl(30000))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(coshl(-30000))));
-  EXPECT_STREQ("1", gc(xdtoal(coshl(+0.))));
-  EXPECT_STREQ("1", gc(xdtoal(coshl(-0.))));
-  EXPECT_TRUE(isnan(coshl(NAN)));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(coshl(INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(coshl(-INFINITY))));
+  EXPECT_STREQ("1.127625965206381", gc(xdtoal(_coshl(+.5))));
+  EXPECT_STREQ("1.127625965206381", gc(xdtoal(_coshl(-.5))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_coshl(30000))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_coshl(-30000))));
+  EXPECT_STREQ("1", gc(xdtoal(_coshl(+0.))));
+  EXPECT_STREQ("1", gc(xdtoal(_coshl(-0.))));
+  EXPECT_TRUE(isnan(_coshl(NAN)));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_coshl(INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_coshl(-INFINITY))));
 }
 
 TEST(cosh, test) {
-  EXPECT_STREQ("1.12762596520638", gc(xdtoa(cosh(+.5))));
-  EXPECT_STREQ("1.12762596520638", gc(xdtoa(cosh(-.5))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(cosh(30000))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(cosh(-30000))));
-  EXPECT_STREQ("1", gc(xdtoa(cosh(+0.))));
-  EXPECT_STREQ("1", gc(xdtoa(cosh(-0.))));
-  EXPECT_TRUE(isnan(cosh(NAN)));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(cosh(INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(cosh(-INFINITY))));
+  EXPECT_STREQ("1.12762596520638", gc(xdtoa(_cosh(+.5))));
+  EXPECT_STREQ("1.12762596520638", gc(xdtoa(_cosh(-.5))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_cosh(30000))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_cosh(-30000))));
+  EXPECT_STREQ("1", gc(xdtoa(_cosh(+0.))));
+  EXPECT_STREQ("1", gc(xdtoa(_cosh(-0.))));
+  EXPECT_TRUE(isnan(_cosh(NAN)));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_cosh(INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_cosh(-INFINITY))));
 }
 
 TEST(coshf, test) {
-  EXPECT_STREQ("1.12763", gc(xdtoaf(coshf(+.5))));
-  EXPECT_STREQ("1.12763", gc(xdtoaf(coshf(-.5))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(coshf(30000))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(coshf(-30000))));
-  EXPECT_STREQ("1", gc(xdtoaf(coshf(+0.))));
-  EXPECT_STREQ("1", gc(xdtoaf(coshf(-0.))));
-  EXPECT_TRUE(isnan(coshf(NAN)));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(coshf(INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(coshf(-INFINITY))));
+  EXPECT_STREQ("1.12763", gc(xdtoaf(_coshf(+.5))));
+  EXPECT_STREQ("1.12763", gc(xdtoaf(_coshf(-.5))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_coshf(30000))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_coshf(-30000))));
+  EXPECT_STREQ("1", gc(xdtoaf(_coshf(+0.))));
+  EXPECT_STREQ("1", gc(xdtoaf(_coshf(-0.))));
+  EXPECT_TRUE(isnan(_coshf(NAN)));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_coshf(INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_coshf(-INFINITY))));
 }
diff --git a/test/libc/tinymath/exp10_test.c b/test/libc/tinymath/exp10_test.c
index 24493edf9..116506f03 100644
--- a/test/libc/tinymath/exp10_test.c
+++ b/test/libc/tinymath/exp10_test.c
@@ -21,39 +21,39 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define exp10l(x) exp10l(VEIL("t", (long double)(x)))
-#define exp10(x)  exp10(VEIL("x", (double)(x)))
-#define exp10f(x) exp10f(VEIL("x", (float)(x)))
+double _exp10(double) asm("exp10");
+float _exp10f(float) asm("exp10f");
+long double _exp10l(long double) asm("exp10l");
 
 TEST(exp10l, test) {
-  EXPECT_STREQ("1", gc(xdtoal(exp10l(0))));
-  EXPECT_STREQ("1", gc(xdtoal(exp10l(-0.))));
-  EXPECT_STREQ(".01", gc(xdtoal(exp10l(-2.))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(exp10l(INFINITY))));
-  EXPECT_STREQ("0", gc(xdtoal(exp10l(-INFINITY))));
-  EXPECT_STREQ("NAN", gc(xdtoal(exp10l(NAN))));
-  EXPECT_STREQ("0", gc(xdtoal(exp10l(-132098844872390))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(exp10l(132098844872390))));
+  EXPECT_STREQ("1", gc(xdtoal(_exp10l(0))));
+  EXPECT_STREQ("1", gc(xdtoal(_exp10l(-0.))));
+  EXPECT_STREQ(".01", gc(xdtoal(_exp10l(-2.))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_exp10l(INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoal(_exp10l(-INFINITY))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_exp10l(NAN))));
+  EXPECT_STREQ("0", gc(xdtoal(_exp10l(-132098844872390))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_exp10l(132098844872390))));
 }
 
 TEST(exp10, test) {
-  EXPECT_STREQ("1", gc(xdtoa(exp10(0))));
-  EXPECT_STREQ("1", gc(xdtoa(exp10(-0.))));
-  EXPECT_STREQ(".01", gc(xdtoa(exp10(-2.))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(exp10(INFINITY))));
-  EXPECT_STREQ("0", gc(xdtoa(exp10(-INFINITY))));
-  EXPECT_STREQ("NAN", gc(xdtoa(exp10(NAN))));
-  EXPECT_STREQ("0", gc(xdtoa(exp10(-132098844872390))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(exp10(132098844872390))));
+  EXPECT_STREQ("1", gc(xdtoa(_exp10(0))));
+  EXPECT_STREQ("1", gc(xdtoa(_exp10(-0.))));
+  EXPECT_STREQ(".01", gc(xdtoa(_exp10(-2.))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_exp10(INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoa(_exp10(-INFINITY))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_exp10(NAN))));
+  EXPECT_STREQ("0", gc(xdtoa(_exp10(-132098844872390))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_exp10(132098844872390))));
 }
 
 TEST(exp10f, test) {
-  EXPECT_STREQ("1", gc(xdtoaf(exp10f(0))));
-  EXPECT_STREQ("1", gc(xdtoaf(exp10f(-0.))));
-  EXPECT_STREQ(".01", gc(xdtoaf(exp10f(-2.))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(exp10f(INFINITY))));
-  EXPECT_STREQ("0", gc(xdtoaf(exp10f(-INFINITY))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(exp10f(NAN))));
-  EXPECT_STREQ("0", gc(xdtoaf(exp10f(-132098844872390))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(exp10f(132098844872390))));
+  EXPECT_STREQ("1", gc(xdtoaf(_exp10f(0))));
+  EXPECT_STREQ("1", gc(xdtoaf(_exp10f(-0.))));
+  EXPECT_STREQ(".01", gc(xdtoaf(_exp10f(-2.))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_exp10f(INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoaf(_exp10f(-INFINITY))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_exp10f(NAN))));
+  EXPECT_STREQ("0", gc(xdtoaf(_exp10f(-132098844872390))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_exp10f(132098844872390))));
 }
diff --git a/test/libc/tinymath/exp2_test.c b/test/libc/tinymath/exp2_test.c
index 4da06e410..a2881c396 100644
--- a/test/libc/tinymath/exp2_test.c
+++ b/test/libc/tinymath/exp2_test.c
@@ -22,44 +22,41 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define exp2l(x) exp2l(VEIL("t", (long double)(x)))
-#define exp2(x)  exp2(VEIL("x", (double)(x)))
-#define exp2f(x) exp2f(VEIL("x", (float)(x)))
+double _exp2(double) asm("exp2");
+float _exp2f(float) asm("exp2f");
+long double _exp2l(long double) asm("exp2l");
 
 TEST(exp2l, test) {
-  EXPECT_STREQ("1", gc(xdtoal(exp2l(0))));
-  EXPECT_STREQ("1", gc(xdtoal(exp2l(-0.))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(exp2l(INFINITY))));
-  EXPECT_STREQ("0", gc(xdtoal(exp2l(-INFINITY))));
-  EXPECT_STREQ("NAN", gc(xdtoal(exp2l(NAN))));
-  EXPECT_STREQ("0", gc(xdtoal(exp2l(-132098844872390))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(exp2l(132098844872390))));
+  EXPECT_STREQ("1", gc(xdtoal(_exp2l(0))));
+  EXPECT_STREQ("1", gc(xdtoal(_exp2l(-0.))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_exp2l(INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoal(_exp2l(-INFINITY))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_exp2l(NAN))));
+  EXPECT_STREQ("0", gc(xdtoal(_exp2l(-132098844872390))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_exp2l(132098844872390))));
 }
 
 TEST(exp2, test) {
-  EXPECT_STREQ("1", gc(xdtoa(exp2(0))));
-  EXPECT_STREQ("1", gc(xdtoa(exp2(-0.))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(exp2(INFINITY))));
-  EXPECT_STREQ("0", gc(xdtoa(exp2(-INFINITY))));
-  EXPECT_STREQ("NAN", gc(xdtoa(exp2(NAN))));
-  EXPECT_STREQ("0", gc(xdtoa(exp2(-132098844872390))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(exp2(132098844872390))));
+  EXPECT_STREQ("1", gc(xdtoa(_exp2(0))));
+  EXPECT_STREQ("1", gc(xdtoa(_exp2(-0.))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_exp2(INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoa(_exp2(-INFINITY))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_exp2(NAN))));
+  EXPECT_STREQ("0", gc(xdtoa(_exp2(-132098844872390))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_exp2(132098844872390))));
 }
 
 TEST(exp2f, test) {
-  EXPECT_STREQ("1", gc(xdtoaf(exp2f(0))));
-  EXPECT_STREQ("1", gc(xdtoaf(exp2f(-0.))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(exp2f(INFINITY))));
-  EXPECT_STREQ("0", gc(xdtoaf(exp2f(-INFINITY))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(exp2f(NAN))));
-  EXPECT_STREQ("0", gc(xdtoaf(exp2f(-132098844872390))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(exp2f(132098844872390))));
+  EXPECT_STREQ("1", gc(xdtoaf(_exp2f(0))));
+  EXPECT_STREQ("1", gc(xdtoaf(_exp2f(-0.))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_exp2f(INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoaf(_exp2f(-INFINITY))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_exp2f(NAN))));
+  EXPECT_STREQ("0", gc(xdtoaf(_exp2f(-132098844872390))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_exp2f(132098844872390))));
 }
 
-BENCH(exp2l, bench) {
-  double _exp2(double) asm("exp2");
-  float _exp2f(float) asm("exp2f");
-  long double _exp2l(long double) asm("exp2l");
+BENCH(_exp2l, bench) {
   EZBENCH2("exp2", donothing, _exp2(.7));   /*  ~6ns */
   EZBENCH2("exp2f", donothing, _exp2f(.7)); /*  ~5ns */
   EZBENCH2("exp2l", donothing, _exp2l(.7)); /* ~30ns */
diff --git a/test/libc/tinymath/exp_test.c b/test/libc/tinymath/exp_test.c
index 77008978d..96e8bc38a 100644
--- a/test/libc/tinymath/exp_test.c
+++ b/test/libc/tinymath/exp_test.c
@@ -24,50 +24,47 @@
 #include "libc/x/x.h"
 #include "libc/x/xasprintf.h"
 
-#define expl(x) expl(VEIL("t", (long double)(x)))
-#define exp(x)  exp(VEIL("x", (double)(x)))
-#define expf(x) expf(VEIL("x", (float)(x)))
+double _exp(double) asm("exp");
+float _expf(float) asm("expf");
+long double _expl(long double) asm("expl");
 
 TEST(expl, test) {
-  EXPECT_STREQ("1", _gc(xdtoal(expl(0))));
-  EXPECT_STREQ("1", _gc(xdtoal(expl(-0.))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoal(expl(INFINITY))));
-  EXPECT_STREQ("0", _gc(xdtoal(expl(-INFINITY))));
-  EXPECT_STREQ("NAN", _gc(xdtoal(expl(NAN))));
-  EXPECT_STREQ("0", _gc(xdtoal(expl(-132098844872390))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoal(expl(132098844872390))));
+  EXPECT_STREQ("1", _gc(xdtoal(_expl(0))));
+  EXPECT_STREQ("1", _gc(xdtoal(_expl(-0.))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoal(_expl(INFINITY))));
+  EXPECT_STREQ("0", _gc(xdtoal(_expl(-INFINITY))));
+  EXPECT_STREQ("NAN", _gc(xdtoal(_expl(NAN))));
+  EXPECT_STREQ("0", _gc(xdtoal(_expl(-132098844872390))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoal(_expl(132098844872390))));
 }
 
 TEST(exp, test) {
-  EXPECT_STREQ("1", _gc(xdtoa(exp(0))));
-  EXPECT_STREQ("1", _gc(xdtoa(exp(-0.))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoa(exp(INFINITY))));
-  EXPECT_STREQ("0", _gc(xdtoa(exp(-INFINITY))));
-  EXPECT_STREQ("NAN", _gc(xdtoa(exp(NAN))));
-  EXPECT_STREQ("0", _gc(xdtoa(exp(-132098844872390))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoa(exp(132098844872390))));
+  EXPECT_STREQ("1", _gc(xdtoa(_exp(0))));
+  EXPECT_STREQ("1", _gc(xdtoa(_exp(-0.))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoa(_exp(INFINITY))));
+  EXPECT_STREQ("0", _gc(xdtoa(_exp(-INFINITY))));
+  EXPECT_STREQ("NAN", _gc(xdtoa(_exp(NAN))));
+  EXPECT_STREQ("0", _gc(xdtoa(_exp(-132098844872390))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoa(_exp(132098844872390))));
 }
 
 TEST(expf, test) {
-  EXPECT_STREQ("1", _gc(xdtoaf(expf(0))));
-  EXPECT_STREQ("1", _gc(xdtoaf(expf(-0.))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoaf(expf(INFINITY))));
-  EXPECT_STREQ("0", _gc(xdtoaf(expf(-INFINITY))));
-  EXPECT_STREQ("NAN", _gc(xdtoaf(expf(NAN))));
-  EXPECT_STREQ("0", _gc(xdtoaf(expf(-132098844872390))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoaf(expf(132098844872390))));
+  EXPECT_STREQ("1", _gc(xdtoaf(_expf(0))));
+  EXPECT_STREQ("1", _gc(xdtoaf(_expf(-0.))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoaf(_expf(INFINITY))));
+  EXPECT_STREQ("0", _gc(xdtoaf(_expf(-INFINITY))));
+  EXPECT_STREQ("NAN", _gc(xdtoaf(_expf(NAN))));
+  EXPECT_STREQ("0", _gc(xdtoaf(_expf(-132098844872390))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoaf(_expf(132098844872390))));
 }
 
 TEST(exp, fun) {
-  ASSERT_STREQ("7.389056", _gc(xasprintf("%f", exp(2.0))));
+  ASSERT_STREQ("7.389056", _gc(xasprintf("%f", _exp(2.0))));
   ASSERT_STREQ("6.389056", _gc(xasprintf("%f", expm1(2.0))));
-  ASSERT_STREQ("6.389056", _gc(xasprintf("%f", exp(2.0) - 1.0)));
+  ASSERT_STREQ("6.389056", _gc(xasprintf("%f", _exp(2.0) - 1.0)));
 }
 
-BENCH(expl, bench) {
-  double _exp(double) asm("exp");
-  float _expf(float) asm("expf");
-  long double _expl(long double) asm("expl");
+BENCH(_expl, bench) {
   EZBENCH2("exp", donothing, _exp(.7));   /*  ~6ns */
   EZBENCH2("expf", donothing, _expf(.7)); /*  ~5ns */
   EZBENCH2("expl", donothing, _expl(.7)); /* ~20ns */
diff --git a/test/libc/tinymath/expm1_test.c b/test/libc/tinymath/expm1_test.c
index 5b37389dc..d71bf235a 100644
--- a/test/libc/tinymath/expm1_test.c
+++ b/test/libc/tinymath/expm1_test.c
@@ -22,54 +22,54 @@
 #include "libc/x/x.h"
 #include "libc/x/xasprintf.h"
 
-#define expm1l(x) expm1l(VEIL("t", (long double)(x)))
-#define expm1(x)  expm1(VEIL("x", (double)(x)))
-#define expm1f(x) expm1f(VEIL("x", (float)(x)))
+double _expm1(double) asm("expm1");
+float _expm1f(float) asm("expm1f");
+long double _expm1l(long double) asm("expm1l");
 
 TEST(expm1, test) {
-  EXPECT_STREQ("0", _gc(xdtoa(expm1(0))));
-  EXPECT_STREQ("-0", _gc(xdtoa(expm1(-0.))));
-  EXPECT_STREQ("NAN", _gc(xdtoa(expm1(NAN))));
-  EXPECT_STREQ("-1", _gc(xdtoa(expm1(-INFINITY))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoa(expm1(INFINITY))));
-  /* EXPECT_STREQ("-INFINITY", _gc(xdtoa(expm1(-132098844872390)))); */
-  /* EXPECT_STREQ("INFINITY", _gc(xdtoa(expm1(132098844872390)))); */
-  EXPECT_STREQ("0", _gc(xasprintf("%.15g", expm1(0.))));
-  EXPECT_STREQ("-0", _gc(xasprintf("%.15g", expm1(-0.))));
-  EXPECT_STREQ("0.648721270700128", _gc(xasprintf("%.15g", expm1(.5))));
-  EXPECT_STREQ("-0.393469340287367", _gc(xasprintf("%.15g", expm1(-.5))));
-  EXPECT_STREQ("1.71828182845905", _gc(xasprintf("%.15g", expm1(1.))));
-  EXPECT_STREQ("-0.632120558828558", _gc(xasprintf("%.15g", expm1(-1.))));
-  EXPECT_STREQ("3.48168907033806", _gc(xasprintf("%.15g", expm1(1.5))));
-  EXPECT_STREQ("-0.77686983985157", _gc(xasprintf("%.15g", expm1(-1.5))));
-  EXPECT_STREQ("6.38905609893065", _gc(xasprintf("%.15g", expm1(2.))));
-  EXPECT_TRUE(isnan(expm1(NAN)));
-  EXPECT_TRUE(isnan(expm1(-NAN)));
-  EXPECT_STREQ("inf", _gc(xasprintf("%.15g", expm1(INFINITY))));
-  EXPECT_STREQ("-1", _gc(xasprintf("%.15g", expm1(-INFINITY))));
+  EXPECT_STREQ("0", _gc(xdtoa(_expm1(0))));
+  EXPECT_STREQ("-0", _gc(xdtoa(_expm1(-0.))));
+  EXPECT_STREQ("NAN", _gc(xdtoa(_expm1(NAN))));
+  EXPECT_STREQ("-1", _gc(xdtoa(_expm1(-INFINITY))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoa(_expm1(INFINITY))));
+  /* EXPECT_STREQ("-INFINITY", _gc(xdtoa(_expm1(-132098844872390)))); */
+  /* EXPECT_STREQ("INFINITY", _gc(xdtoa(_expm1(132098844872390)))); */
+  EXPECT_STREQ("0", _gc(xasprintf("%.15g", _expm1(0.))));
+  EXPECT_STREQ("-0", _gc(xasprintf("%.15g", _expm1(-0.))));
+  EXPECT_STREQ("0.648721270700128", _gc(xasprintf("%.15g", _expm1(.5))));
+  EXPECT_STREQ("-0.393469340287367", _gc(xasprintf("%.15g", _expm1(-.5))));
+  EXPECT_STREQ("1.71828182845905", _gc(xasprintf("%.15g", _expm1(1.))));
+  EXPECT_STREQ("-0.632120558828558", _gc(xasprintf("%.15g", _expm1(-1.))));
+  EXPECT_STREQ("3.48168907033806", _gc(xasprintf("%.15g", _expm1(1.5))));
+  EXPECT_STREQ("-0.77686983985157", _gc(xasprintf("%.15g", _expm1(-1.5))));
+  EXPECT_STREQ("6.38905609893065", _gc(xasprintf("%.15g", _expm1(2.))));
+  EXPECT_TRUE(isnan(_expm1(NAN)));
+  EXPECT_TRUE(isnan(_expm1(-NAN)));
+  EXPECT_STREQ("inf", _gc(xasprintf("%.15g", _expm1(INFINITY))));
+  EXPECT_STREQ("-1", _gc(xasprintf("%.15g", _expm1(-INFINITY))));
   EXPECT_STREQ("2.2250738585072e-308",
-               _gc(xasprintf("%.15g", expm1(__DBL_MIN__))));
-  EXPECT_STREQ("inf", _gc(xasprintf("%.15g", expm1(__DBL_MAX__))));
+               _gc(xasprintf("%.15g", _expm1(__DBL_MIN__))));
+  EXPECT_STREQ("inf", _gc(xasprintf("%.15g", _expm1(__DBL_MAX__))));
 }
 
 TEST(expm1l, test) {
-  EXPECT_STREQ("1.718281828459045", _gc(xdtoal(expm1l(1))));
+  EXPECT_STREQ("1.718281828459045", _gc(xdtoal(_expm1l(1))));
   EXPECT_STREQ("1.718281828459045", _gc(xdtoal(expl(1) - 1)));
-  EXPECT_STREQ("0", _gc(xdtoal(expm1l(0))));
-  EXPECT_STREQ("-0", _gc(xdtoal(expm1l(-0.))));
-  EXPECT_STREQ("NAN", _gc(xdtoal(expm1l(NAN))));
-  EXPECT_STREQ("-1", _gc(xdtoal(expm1l(-INFINITY))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoal(expm1l(INFINITY))));
-  /* EXPECT_STREQ("-INFINITY", _gc(xdtoal(expm1l(-132098844872390)))); */
-  /* EXPECT_STREQ("INFINITY", _gc(xdtoal(expm1l(132098844872390)))); */
+  EXPECT_STREQ("0", _gc(xdtoal(_expm1l(0))));
+  EXPECT_STREQ("-0", _gc(xdtoal(_expm1l(-0.))));
+  EXPECT_STREQ("NAN", _gc(xdtoal(_expm1l(NAN))));
+  EXPECT_STREQ("-1", _gc(xdtoal(_expm1l(-INFINITY))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoal(_expm1l(INFINITY))));
+  /* EXPECT_STREQ("-INFINITY", _gc(xdtoal(_expm1l(-132098844872390)))); */
+  /* EXPECT_STREQ("INFINITY", _gc(xdtoal(_expm1l(132098844872390)))); */
 }
 
 TEST(expm1f, test) {
-  EXPECT_STREQ("0", _gc(xdtoaf(expm1f(0))));
-  EXPECT_STREQ("-0", _gc(xdtoaf(expm1f(-0.))));
-  EXPECT_STREQ("NAN", _gc(xdtoaf(expm1f(NAN))));
-  EXPECT_STREQ("-1", _gc(xdtoaf(expm1f(-INFINITY))));
-  EXPECT_STREQ("INFINITY", _gc(xdtoaf(expm1f(INFINITY))));
-  /* EXPECT_STREQ("-INFINITY", _gc(xdtoaf(expm1f(-132098844872390)))); */
-  /* EXPECT_STREQ("INFINITY", _gc(xdtoaf(expm1f(132098844872390)))); */
+  EXPECT_STREQ("0", _gc(xdtoaf(_expm1f(0))));
+  EXPECT_STREQ("-0", _gc(xdtoaf(_expm1f(-0.))));
+  EXPECT_STREQ("NAN", _gc(xdtoaf(_expm1f(NAN))));
+  EXPECT_STREQ("-1", _gc(xdtoaf(_expm1f(-INFINITY))));
+  EXPECT_STREQ("INFINITY", _gc(xdtoaf(_expm1f(INFINITY))));
+  /* EXPECT_STREQ("-INFINITY", _gc(xdtoaf(_expm1f(-132098844872390)))); */
+  /* EXPECT_STREQ("INFINITY", _gc(xdtoaf(_expm1f(132098844872390)))); */
 }
diff --git a/test/libc/tinymath/fabs_test.c b/test/libc/tinymath/fabs_test.c
index dbb4371ab..81c93fccd 100644
--- a/test/libc/tinymath/fabs_test.c
+++ b/test/libc/tinymath/fabs_test.c
@@ -22,46 +22,43 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define fabsl(x) fabsl(VEIL("t", (long double)(x)))
-#define fabs(x)  fabs(VEIL("x", (double)(x)))
-#define fabsf(x) fabsf(VEIL("x", (float)(x)))
+double _fabs(double) asm("fabs");
+float _fabsf(float) asm("fabsf");
+long double _fabsl(long double) asm("fabsl");
 
 TEST(fabsl, test) {
-  EXPECT_STREQ("0", gc(xdtoal(fabsl(-0.))));
-  EXPECT_STREQ("0", gc(xdtoal(fabsl(-0.))));
-  EXPECT_STREQ("NAN", gc(xdtoal(fabsl(NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(fabsl(INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(fabsl(-INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoal(_fabsl(-0.))));
+  EXPECT_STREQ("0", gc(xdtoal(_fabsl(-0.))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_fabsl(NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_fabsl(INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_fabsl(-INFINITY))));
 }
 
 TEST(fabs, test) {
-  EXPECT_STREQ("0", gc(xdtoa(fabs(-0.))));
-  EXPECT_STREQ("0", gc(xdtoa(fabs(-0.))));
-  EXPECT_STREQ("NAN", gc(xdtoa(fabs(NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(fabs(INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(fabs(-INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoa(_fabs(-0.))));
+  EXPECT_STREQ("0", gc(xdtoa(_fabs(-0.))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_fabs(NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_fabs(INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_fabs(-INFINITY))));
 }
 
 TEST(fabsf, test) {
-  EXPECT_STREQ("0", gc(xdtoaf(fabsf(-0.))));
-  EXPECT_STREQ("0", gc(xdtoaf(fabsf(-0.))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(fabsf(NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(fabsf(INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(fabsf(-INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoaf(_fabsf(-0.))));
+  EXPECT_STREQ("0", gc(xdtoaf(_fabsf(-0.))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_fabsf(NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_fabsf(INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_fabsf(-INFINITY))));
 }
 
 TEST(fabs, stuff) {
-  EXPECT_LDBL_EQ(3.14, fabs(3.14));
-  EXPECT_LDBL_EQ(3.14, fabs(-3.14));
-  EXPECT_EQ(1, !!isnan(fabs(NAN)));
-  EXPECT_EQ(1, !!isnan(fabs(-NAN)));
-  EXPECT_EQ(0, !!signbit(fabs(-NAN)));
+  EXPECT_LDBL_EQ(3.14, _fabs(3.14));
+  EXPECT_LDBL_EQ(3.14, _fabs(-3.14));
+  EXPECT_EQ(1, !!isnan(_fabs(NAN)));
+  EXPECT_EQ(1, !!isnan(_fabs(-NAN)));
+  EXPECT_EQ(0, !!signbit(_fabs(-NAN)));
 }
 
 BENCH(fabs, bench) {
-  double _fabs(double) asm("fabs");
-  float _fabsf(float) asm("fabsf");
-  long double _fabsl(long double) asm("fabsl");
   EZBENCH2("fabs", donothing, _fabs(.7));   /*  ~6ns */
   EZBENCH2("fabsf", donothing, _fabsf(.7)); /*  ~5ns */
   EZBENCH2("fabsl", donothing, _fabsl(.7)); /* ~28ns */
diff --git a/test/libc/tinymath/hypot_test.c b/test/libc/tinymath/hypot_test.c
index 9d9258553..360a8a2fb 100644
--- a/test/libc/tinymath/hypot_test.c
+++ b/test/libc/tinymath/hypot_test.c
@@ -22,106 +22,106 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define hypotl(x, y) \
-  hypotl(VEIL("t", (long double)(x)), VEIL("t", (long double)(y)))
-#define hypot(x, y)  hypot(VEIL("x", (double)(x)), VEIL("x", (double)(y)))
-#define hypotf(x, y) hypotf(VEIL("x", (float)(x)), VEIL("x", (float)(y)))
+double _hypot(double, double) asm("hypot");
+float _hypotf(float, float) asm("hypotf");
+long double _hypotl(long double, long double) asm("hypotl");
 
 TEST(hypot, test) {
-  EXPECT_STREQ("0", gc(xdtoa(hypot(0, 0))));
-  EXPECT_STREQ("3", gc(xdtoa(hypot(3, 0))));
-  EXPECT_STREQ("3", gc(xdtoa(hypot(0, 3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(3, 4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(4, 3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(3, -4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(-4, 3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(-3, 4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(4, -3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(-3, -4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypot(-4, -3))));
-  EXPECT_STREQ("1.4142135623731", gc(xdtoa(hypot(1, 1))));
-  EXPECT_STREQ("1.4142135623731", gc(xdtoa(hypot(1, -1))));
-  EXPECT_STREQ("1.4142135623731", gc(xdtoa(hypot(-1, 1))));
-  EXPECT_STREQ("1.41421362601271", gc(xdtoa(hypot(1.0000001, .99999999))));
-  EXPECT_STREQ("1.41421362601271", gc(xdtoa(hypot(.99999999, 1.0000001))));
-  EXPECT_STREQ("1.4142135623731e+154", gc(xdtoa(hypot(1e154, 1e154))));
-  EXPECT_STREQ("NAN", gc(xdtoa(hypot(0, NAN))));
-  EXPECT_STREQ("NAN", gc(xdtoa(hypot(NAN, 0))));
-  EXPECT_STREQ("NAN", gc(xdtoa(hypot(NAN, NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(hypot(INFINITY, 0))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(hypot(0, INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(hypot(INFINITY, NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(hypot(NAN, INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(hypot(INFINITY, INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoa(_hypot(0, 0))));
+  EXPECT_STREQ("3", gc(xdtoa(_hypot(3, 0))));
+  EXPECT_STREQ("3", gc(xdtoa(_hypot(0, 3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(3, 4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(4, 3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(3, -4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(-4, 3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(-3, 4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(4, -3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(-3, -4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypot(-4, -3))));
+  EXPECT_STREQ("1.4142135623731", gc(xdtoa(_hypot(1, 1))));
+  EXPECT_STREQ("1.4142135623731", gc(xdtoa(_hypot(1, -1))));
+  EXPECT_STREQ("1.4142135623731", gc(xdtoa(_hypot(-1, 1))));
+  EXPECT_STREQ("1.41421362601271", gc(xdtoa(_hypot(1.0000001, .99999999))));
+  EXPECT_STREQ("1.41421362601271", gc(xdtoa(_hypot(.99999999, 1.0000001))));
+  EXPECT_STREQ("1.4142135623731e+154", gc(xdtoa(_hypot(1e154, 1e154))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_hypot(0, NAN))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_hypot(NAN, 0))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_hypot(NAN, NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_hypot(INFINITY, 0))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_hypot(0, INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_hypot(INFINITY, NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_hypot(NAN, INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_hypot(INFINITY, INFINITY))));
 }
 
 TEST(hypotf, test) {
-  EXPECT_STREQ("0", gc(xdtoa(hypotf(0, 0))));
-  EXPECT_STREQ("3", gc(xdtoa(hypotf(3, 0))));
-  EXPECT_STREQ("3", gc(xdtoa(hypotf(0, 3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(3, 4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(4, 3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(3, -4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(-4, 3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(-3, 4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(4, -3))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(-3, -4))));
-  EXPECT_STREQ("5", gc(xdtoa(hypotf(-4, -3))));
-  EXPECT_STREQ("1.41421", gc(xdtoaf(hypotf(1, 1))));
-  EXPECT_STREQ("1.41421", gc(xdtoaf(hypotf(1, -1))));
-  EXPECT_STREQ("1.41421", gc(xdtoaf(hypotf(-1, 1))));
-  EXPECT_STREQ("1.41421", gc(xdtoaf(hypotf(1.000001, 0.999999))));
-  EXPECT_STREQ("1.41421", gc(xdtoaf(hypotf(0.999999, 1.000001))));
-  EXPECT_STREQ("1.41421e+38", gc(xdtoaf(hypotf(1e38, 1e38))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(hypotf(0, NAN))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(hypotf(NAN, 0))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(hypotf(NAN, NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(hypotf(INFINITY, 0))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(hypotf(0, INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(hypotf(INFINITY, NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(hypotf(NAN, INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(hypotf(INFINITY, INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoa(_hypotf(0, 0))));
+  EXPECT_STREQ("3", gc(xdtoa(_hypotf(3, 0))));
+  EXPECT_STREQ("3", gc(xdtoa(_hypotf(0, 3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(3, 4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(4, 3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(3, -4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(-4, 3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(-3, 4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(4, -3))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(-3, -4))));
+  EXPECT_STREQ("5", gc(xdtoa(_hypotf(-4, -3))));
+  EXPECT_STREQ("1.41421", gc(xdtoaf(_hypotf(1, 1))));
+  EXPECT_STREQ("1.41421", gc(xdtoaf(_hypotf(1, -1))));
+  EXPECT_STREQ("1.41421", gc(xdtoaf(_hypotf(-1, 1))));
+  EXPECT_STREQ("1.41421", gc(xdtoaf(_hypotf(1.000001, 0.999999))));
+  EXPECT_STREQ("1.41421", gc(xdtoaf(_hypotf(0.999999, 1.000001))));
+  EXPECT_STREQ("1.41421e+38", gc(xdtoaf(_hypotf(1e38, 1e38))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_hypotf(0, NAN))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_hypotf(NAN, 0))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_hypotf(NAN, NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_hypotf(INFINITY, 0))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_hypotf(0, INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_hypotf(INFINITY, NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_hypotf(NAN, INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_hypotf(INFINITY, INFINITY))));
 }
 
 TEST(hypotll, test) {
-  EXPECT_STREQ("0", gc(xdtoal(hypotl(0, 0))));
-  EXPECT_STREQ("3", gc(xdtoal(hypotl(3, 0))));
-  EXPECT_STREQ("3", gc(xdtoal(hypotl(0, 3))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(3, 4))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(4, 3))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(3, -4))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(-4, 3))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(-3, 4))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(4, -3))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(-3, -4))));
-  EXPECT_STREQ("5", gc(xdtoal(hypotl(-4, -3))));
-  EXPECT_STREQ("1.414213562373095", gc(xdtoal(hypotl(1, 1))));
-  EXPECT_STREQ("1.414213562373095", gc(xdtoal(hypotl(1, -1))));
-  EXPECT_STREQ("1.414213562373095", gc(xdtoal(hypotl(-1, 1))));
-  EXPECT_STREQ("1.414213626012708", gc(xdtoal(hypotl(1.0000001, .99999999))));
-  EXPECT_STREQ("1.414213626012708", gc(xdtoal(hypotl(.99999999, 1.0000001))));
-  EXPECT_STREQ("1.414213562373095e+4931", gc(xdtoal(hypotl(1e4931L, 1e4931L))));
-  EXPECT_STREQ("NAN", gc(xdtoal(hypotl(0, NAN))));
-  EXPECT_STREQ("NAN", gc(xdtoal(hypotl(NAN, 0))));
-  EXPECT_STREQ("NAN", gc(xdtoal(hypotl(NAN, NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(hypotl(INFINITY, 0))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(hypotl(0, INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(hypotl(INFINITY, NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(hypotl(NAN, INFINITY))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(hypotl(INFINITY, INFINITY))));
+  EXPECT_STREQ("0", gc(xdtoal(_hypotl(0, 0))));
+  EXPECT_STREQ("3", gc(xdtoal(_hypotl(3, 0))));
+  EXPECT_STREQ("3", gc(xdtoal(_hypotl(0, 3))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(3, 4))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(4, 3))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(3, -4))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(-4, 3))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(-3, 4))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(4, -3))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(-3, -4))));
+  EXPECT_STREQ("5", gc(xdtoal(_hypotl(-4, -3))));
+  EXPECT_STREQ("1.414213562373095", gc(xdtoal(_hypotl(1, 1))));
+  EXPECT_STREQ("1.414213562373095", gc(xdtoal(_hypotl(1, -1))));
+  EXPECT_STREQ("1.414213562373095", gc(xdtoal(_hypotl(-1, 1))));
+  EXPECT_STREQ("1.414213626012708", gc(xdtoal(_hypotl(1.0000001, .99999999))));
+  EXPECT_STREQ("1.414213626012708", gc(xdtoal(_hypotl(.99999999, 1.0000001))));
+  EXPECT_STREQ("1.414213562373095e+4931",
+               gc(xdtoal(_hypotl(1e4931L, 1e4931L))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_hypotl(0, NAN))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_hypotl(NAN, 0))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_hypotl(NAN, NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_hypotl(INFINITY, 0))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_hypotl(0, INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_hypotl(INFINITY, NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_hypotl(NAN, INFINITY))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_hypotl(INFINITY, INFINITY))));
 }
 
 /*
-hypot (musl)               l:        53𝑐        17𝑛𝑠   m:        85𝑐        27𝑛𝑠
-hypot                      l:        39𝑐        13𝑛𝑠   m:        66𝑐        21𝑛𝑠
-hypotf                     l:        25𝑐         8𝑛𝑠   m:        55𝑐        18𝑛𝑠
-hypotl                     l:        43𝑐        14𝑛𝑠   m:        74𝑐        24𝑛𝑠
+_hypot (musl)               l:        53𝑐        17𝑛𝑠   m:        85𝑐 27𝑛𝑠
+_hypot                      l:        39𝑐        13𝑛𝑠   m:        66𝑐 21𝑛𝑠
+_hypotf                     l:        25𝑐         8𝑛𝑠   m:        55𝑐 18𝑛𝑠
+_hypotl                     l:        43𝑐        14𝑛𝑠   m:        74𝑐 24𝑛𝑠
 */
 
-BENCH(hypot, bench) {
+BENCH(_hypot, bench) {
   volatile double a = 2;
   volatile double b = 3;
-  EZBENCH2("hypotf", donothing, EXPROPRIATE(hypotf(a, b)));
-  EZBENCH2("hypot", donothing, EXPROPRIATE(hypot(a, b)));
-  EZBENCH2("hypotl", donothing, EXPROPRIATE(hypotl(a, b)));
+  EZBENCH2("hypotf", donothing, EXPROPRIATE(_hypotf(a, b)));
+  EZBENCH2("hypot", donothing, EXPROPRIATE(_hypot(a, b)));
+  EZBENCH2("hypotl", donothing, EXPROPRIATE(_hypotl(a, b)));
 }
diff --git a/test/libc/tinymath/round_test.c b/test/libc/tinymath/round_test.c
index 3adbea539..5f2e781d1 100644
--- a/test/libc/tinymath/round_test.c
+++ b/test/libc/tinymath/round_test.c
@@ -24,61 +24,69 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define roundl(x) roundl(VEIL("t", (long double)(x)))
-#define round(x)  round(VEIL("x", (double)(x)))
-#define roundf(x) roundf(VEIL("x", (float)(x)))
+double _round(double) asm("round");
+float _roundf(float) asm("roundf");
+long double _roundl(long double) asm("roundl");
+
+long _lround(double) asm("lround");
+long _lroundf(float) asm("lroundf");
+long _lroundl(long double) asm("lroundl");
+
+long _lrint(double) asm("lrint");
+long _lrintf(float) asm("lrintf");
+long _lrintl(long double) asm("lrintl");
 
 FIXTURE(intrin, disableHardwareExtensions) {
   memset((/*unconst*/ void *)kCpuids, 0, sizeof(kCpuids));
 }
 
 TEST(round, testCornerCases) {
-  EXPECT_STREQ("-0", gc(xdtoa(round(-0.0))));
-  EXPECT_STREQ("NAN", gc(xdtoa(round(NAN))));
-  EXPECT_STREQ("-NAN", gc(xdtoa(round(-NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(round(INFINITY))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoa(round(-INFINITY))));
+  EXPECT_STREQ("-0", gc(xdtoa(_round(-0.0))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_round(NAN))));
+  EXPECT_STREQ("-NAN", gc(xdtoa(_round(-NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_round(INFINITY))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoa(_round(-INFINITY))));
 }
 
 TEST(roundl, testCornerCases) {
-  EXPECT_STREQ("-0", gc(xdtoa(roundl(-0.0))));
-  EXPECT_STREQ("NAN", gc(xdtoa(roundl(NAN))));
-  EXPECT_STREQ("-NAN", gc(xdtoa(roundl(-NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(roundl(INFINITY))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoa(roundl(-INFINITY))));
+  EXPECT_STREQ("-0", gc(xdtoa(_roundl(-0.0))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_roundl(NAN))));
+  EXPECT_STREQ("-NAN", gc(xdtoa(_roundl(-NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_roundl(INFINITY))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoa(_roundl(-INFINITY))));
 }
 
 TEST(round, test) {
-  EXPECT_STREQ("-3", gc(xdtoa(round(-2.5))));
-  EXPECT_STREQ("-2", gc(xdtoa(round(-1.5))));
-  EXPECT_STREQ("-1", gc(xdtoa(round(-.5))));
-  EXPECT_STREQ("-0", gc(xdtoa(round(-.4))));
-  EXPECT_STREQ("0", gc(xdtoa(round(.4))));
-  EXPECT_STREQ("1", gc(xdtoa(round(.5))));
-  EXPECT_STREQ("2", gc(xdtoa(round(1.5))));
-  EXPECT_STREQ("3", gc(xdtoa(round(2.5))));
+  EXPECT_STREQ("-3", gc(xdtoa(_round(-2.5))));
+  EXPECT_STREQ("-2", gc(xdtoa(_round(-1.5))));
+  EXPECT_STREQ("-1", gc(xdtoa(_round(-.5))));
+  EXPECT_STREQ("-0", gc(xdtoa(_round(-.4))));
+  EXPECT_STREQ("0", gc(xdtoa(_round(.4))));
+  EXPECT_STREQ("1", gc(xdtoa(_round(.5))));
+  EXPECT_STREQ("2", gc(xdtoa(_round(1.5))));
+  EXPECT_STREQ("3", gc(xdtoa(_round(2.5))));
 }
 
 TEST(roundf, test) {
-  EXPECT_STREQ("-3", gc(xdtoa(roundf(-2.5))));
-  EXPECT_STREQ("-2", gc(xdtoa(roundf(-1.5))));
-  EXPECT_STREQ("-1", gc(xdtoa(roundf(-.5))));
-  EXPECT_STREQ("-0", gc(xdtoa(roundf(-.4))));
-  EXPECT_STREQ("0", gc(xdtoa(roundf(.4))));
-  EXPECT_STREQ("1", gc(xdtoa(roundf(.5))));
-  EXPECT_STREQ("2", gc(xdtoa(roundf(1.5))));
-  EXPECT_STREQ("3", gc(xdtoa(roundf(2.5))));
+  EXPECT_STREQ("-3", gc(xdtoa(_roundf(-2.5))));
+  EXPECT_STREQ("-2", gc(xdtoa(_roundf(-1.5))));
+  EXPECT_STREQ("-1", gc(xdtoa(_roundf(-.5))));
+  EXPECT_STREQ("-0", gc(xdtoa(_roundf(-.4))));
+  EXPECT_STREQ("0", gc(xdtoa(_roundf(.4))));
+  EXPECT_STREQ("1", gc(xdtoa(_roundf(.5))));
+  EXPECT_STREQ("2", gc(xdtoa(_roundf(1.5))));
+  EXPECT_STREQ("3", gc(xdtoa(_roundf(2.5))));
 }
 
 TEST(roundl, test) {
-  EXPECT_STREQ("-3", gc(xdtoa(roundl(-2.5))));
-  EXPECT_STREQ("-2", gc(xdtoa(roundl(-1.5))));
-  EXPECT_STREQ("-1", gc(xdtoa(roundl(-.5))));
-  EXPECT_STREQ("-0", gc(xdtoa(roundl(-.4))));
-  EXPECT_STREQ("0", gc(xdtoa(roundl(.4))));
-  EXPECT_STREQ("1", gc(xdtoa(roundl(.5))));
-  EXPECT_STREQ("2", gc(xdtoa(roundl(1.5))));
-  EXPECT_STREQ("3", gc(xdtoa(roundl(2.5))));
+  EXPECT_STREQ("-3", gc(xdtoa(_roundl(-2.5))));
+  EXPECT_STREQ("-2", gc(xdtoa(_roundl(-1.5))));
+  EXPECT_STREQ("-1", gc(xdtoa(_roundl(-.5))));
+  EXPECT_STREQ("-0", gc(xdtoa(_roundl(-.4))));
+  EXPECT_STREQ("0", gc(xdtoa(_roundl(.4))));
+  EXPECT_STREQ("1", gc(xdtoa(_roundl(.5))));
+  EXPECT_STREQ("2", gc(xdtoa(_roundl(1.5))));
+  EXPECT_STREQ("3", gc(xdtoa(_roundl(2.5))));
 }
 
 TEST(nearbyint, test) {
@@ -126,25 +134,25 @@ TEST(rint, test) {
 }
 
 TEST(lrint, test) {
-  EXPECT_EQ(-2, lrint(-2.5));
-  EXPECT_EQ(-2, lrint(-1.5));
-  EXPECT_EQ(-0, lrint(-.5));
-  EXPECT_EQ(-0, lrint(-.4));
-  EXPECT_EQ(0, lrint(.4));
-  EXPECT_EQ(0, lrint(.5));
-  EXPECT_EQ(2, lrint(1.5));
-  EXPECT_EQ(2, lrint(2.5));
+  EXPECT_EQ(-2, _lrint(-2.5));
+  EXPECT_EQ(-2, _lrint(-1.5));
+  EXPECT_EQ(-0, _lrint(-.5));
+  EXPECT_EQ(-0, _lrint(-.4));
+  EXPECT_EQ(0, _lrint(.4));
+  EXPECT_EQ(0, _lrint(.5));
+  EXPECT_EQ(2, _lrint(1.5));
+  EXPECT_EQ(2, _lrint(2.5));
 }
 
 TEST(lrintf, test) {
-  EXPECT_EQ(-2, lrintf(-2.5));
-  EXPECT_EQ(-2, lrintf(-1.5));
-  EXPECT_EQ(-0, lrintf(-.5));
-  EXPECT_EQ(-0, lrintf(-.4));
-  EXPECT_EQ(0, lrintf(.4));
-  EXPECT_EQ(0, lrintf(.5));
-  EXPECT_EQ(2, lrintf(1.5));
-  EXPECT_EQ(2, lrintf(2.5));
+  EXPECT_EQ(-2, _lrintf(-2.5));
+  EXPECT_EQ(-2, _lrintf(-1.5));
+  EXPECT_EQ(-0, _lrintf(-.5));
+  EXPECT_EQ(-0, _lrintf(-.4));
+  EXPECT_EQ(0, _lrintf(.4));
+  EXPECT_EQ(0, _lrintf(.5));
+  EXPECT_EQ(2, _lrintf(1.5));
+  EXPECT_EQ(2, _lrintf(2.5));
 }
 
 TEST(rintf, test) {
@@ -170,43 +178,43 @@ TEST(rintl, test) {
 }
 
 TEST(roundf, testCornerCases) {
-  EXPECT_STREQ("-0", gc(xdtoa(roundf(-0.0))));
-  EXPECT_STREQ("NAN", gc(xdtoa(roundf(NAN))));
-  EXPECT_STREQ("-NAN", gc(xdtoa(roundf(-NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(roundf(INFINITY))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoa(roundf(-INFINITY))));
+  EXPECT_STREQ("-0", gc(xdtoa(_roundf(-0.0))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_roundf(NAN))));
+  EXPECT_STREQ("-NAN", gc(xdtoa(_roundf(-NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_roundf(INFINITY))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoa(_roundf(-INFINITY))));
 }
 
 TEST(lroundf, test) {
-  EXPECT_EQ(-3, lroundf(-2.5));
-  EXPECT_EQ(-2, lroundf(-1.5));
-  EXPECT_EQ(-1, lroundf(-.5));
-  EXPECT_EQ(0, lroundf(-.0));
-  EXPECT_EQ(1, lroundf(.5));
-  EXPECT_EQ(2, lroundf(1.5));
-  EXPECT_EQ(3, lroundf(2.5));
+  EXPECT_EQ(-3, _lroundf(-2.5));
+  EXPECT_EQ(-2, _lroundf(-1.5));
+  EXPECT_EQ(-1, _lroundf(-.5));
+  EXPECT_EQ(0, _lroundf(-.0));
+  EXPECT_EQ(1, _lroundf(.5));
+  EXPECT_EQ(2, _lroundf(1.5));
+  EXPECT_EQ(3, _lroundf(2.5));
 }
 
 TEST(lround, test) {
-  EXPECT_EQ(-3, lround(-2.5));
-  EXPECT_EQ(-2, lround(-1.5));
-  EXPECT_EQ(-1, lround(-.5));
-  EXPECT_EQ(-0, lround(-.4));
-  EXPECT_EQ(0, lround(.4));
-  EXPECT_EQ(1, lround(.5));
-  EXPECT_EQ(2, lround(1.5));
-  EXPECT_EQ(3, lround(2.5));
+  EXPECT_EQ(-3, _lround(-2.5));
+  EXPECT_EQ(-2, _lround(-1.5));
+  EXPECT_EQ(-1, _lround(-.5));
+  EXPECT_EQ(-0, _lround(-.4));
+  EXPECT_EQ(0, _lround(.4));
+  EXPECT_EQ(1, _lround(.5));
+  EXPECT_EQ(2, _lround(1.5));
+  EXPECT_EQ(3, _lround(2.5));
 }
 
 TEST(lroundl, test) {
-  EXPECT_EQ(-3, lroundl(-2.5));
-  EXPECT_EQ(-2, lroundl(-1.5));
-  EXPECT_EQ(-1, lroundl(-.5));
-  EXPECT_EQ(-0, lroundl(-.4));
-  EXPECT_EQ(0, lroundl(.4));
-  EXPECT_EQ(1, lroundl(.5));
-  EXPECT_EQ(2, lroundl(1.5));
-  EXPECT_EQ(3, lroundl(2.5));
+  EXPECT_EQ(-3, _lroundl(-2.5));
+  EXPECT_EQ(-2, _lroundl(-1.5));
+  EXPECT_EQ(-1, _lroundl(-.5));
+  EXPECT_EQ(-0, _lroundl(-.4));
+  EXPECT_EQ(0, _lroundl(.4));
+  EXPECT_EQ(1, _lroundl(.5));
+  EXPECT_EQ(2, _lroundl(1.5));
+  EXPECT_EQ(3, _lroundl(2.5));
 }
 
 BENCH(round, bench) {
@@ -214,16 +222,10 @@ BENCH(round, bench) {
   EZBENCH2("float+.5f", donothing, EXPROPRIATE(VEIL("x", (float)(-3.5)) + .5));
   EZBENCH2("ldbl+.5l", donothing,
            EXPROPRIATE(VEIL("t", (long double)(-3.5)) + .5));
-  double _round(double) asm("round");
-  float _roundf(float) asm("roundf");
-  long double _roundl(long double) asm("roundl");
-  EZBENCH2("-round", donothing, _round(.7));   /* ~4ns */
-  EZBENCH2("-roundf", donothing, _roundf(.7)); /* ~3ns */
-  EZBENCH2("-roundl", donothing, _roundl(.7)); /* ~8ns */
-  double _lrint(double) asm("lrint");
-  float _lrintf(float) asm("lrintf");
-  long double _lrintl(long double) asm("lrintl");
-  EZBENCH2("-lrint", donothing, _lrint(.7));   /* ~1ns */
-  EZBENCH2("-lrintf", donothing, _lrintf(.7)); /* ~1ns */
-  EZBENCH2("-lrintl", donothing, _lrintl(.7)); /* ~78ns */
+  EZBENCH2("round", donothing, _round(.7));   /* ~4ns */
+  EZBENCH2("roundf", donothing, _roundf(.7)); /* ~3ns */
+  EZBENCH2("roundl", donothing, _roundl(.7)); /* ~8ns */
+  EZBENCH2("lrint", donothing, _lrint(.7));   /* ~1ns */
+  EZBENCH2("lrintf", donothing, _lrintf(.7)); /* ~1ns */
+  EZBENCH2("lrintl", donothing, _lrintl(.7)); /* ~78ns */
 }
diff --git a/test/libc/tinymath/sin_test.c b/test/libc/tinymath/sin_test.c
index b6519155b..63b908b11 100644
--- a/test/libc/tinymath/sin_test.c
+++ b/test/libc/tinymath/sin_test.c
@@ -23,61 +23,58 @@
 #include "libc/x/x.h"
 #include "libc/x/xasprintf.h"
 
-#define sinl(x) sinl(VEIL("t", (long double)(x)))
-#define sin(x)  sin(VEIL("x", (double)(x)))
-#define sinf(x) sinf(VEIL("x", (float)(x)))
+double _sin(double) asm("sin");
+float _sinf(float) asm("sinf");
+long double _sinl(long double) asm("sinl");
 
 TEST(sinl, test) {
-  EXPECT_STREQ("NAN", _gc(xdtoal(sinl(NAN))));
-  EXPECT_STREQ("-NAN", _gc(xdtoal(sinl(+INFINITY))));
-  EXPECT_STREQ("-NAN", _gc(xdtoal(sinl(-INFINITY))));
-  EXPECT_STREQ(".479425538604203", _gc(xdtoal(sinl(.5))));
-  EXPECT_STREQ("-.479425538604203", _gc(xdtoal(sinl(-.5))));
-  EXPECT_STREQ(".8414709794048734", _gc(xdtoal(sinl(.99999999))));
-  /* EXPECT_STREQ("-.998836772397", _gc(xdtoal(sinl(555555555555)))); */
-  /* EXPECT_STREQ("1", _gc(xdtoal(sinl(5.319372648326541e+255L)))); */
+  EXPECT_STREQ("NAN", _gc(xdtoal(_sinl(NAN))));
+  EXPECT_STREQ("-NAN", _gc(xdtoal(_sinl(+INFINITY))));
+  EXPECT_STREQ("-NAN", _gc(xdtoal(_sinl(-INFINITY))));
+  EXPECT_STREQ(".479425538604203", _gc(xdtoal(_sinl(.5))));
+  EXPECT_STREQ("-.479425538604203", _gc(xdtoal(_sinl(-.5))));
+  EXPECT_STREQ(".8414709794048734", _gc(xdtoal(_sinl(.99999999))));
+  /* EXPECT_STREQ("-.998836772397", _gc(xdtoal(_sinl(555555555555)))); */
+  /* EXPECT_STREQ("1", _gc(xdtoal(_sinl(5.319372648326541e+255L)))); */
 }
 
 TEST(sin, test) {
-  EXPECT_STREQ("0", _gc(xasprintf("%.15g", sin(0.))));
-  EXPECT_STREQ("-0", _gc(xasprintf("%.15g", sin(-0.))));
-  EXPECT_STREQ("0.0998334166468282", _gc(xasprintf("%.15g", sin(.1))));
-  EXPECT_STREQ("-0.0998334166468282", _gc(xasprintf("%.15g", sin(-.1))));
-  EXPECT_STREQ("0.479425538604203", _gc(xasprintf("%.15g", sin(.5))));
-  EXPECT_STREQ("-0.479425538604203", _gc(xasprintf("%.15g", sin(-.5))));
-  EXPECT_STREQ("0.841470984807897", _gc(xasprintf("%.15g", sin(1.))));
-  EXPECT_STREQ("-0.841470984807897", _gc(xasprintf("%.15g", sin(-1.))));
-  EXPECT_STREQ("0.997494986604054", _gc(xasprintf("%.15g", sin(1.5))));
-  EXPECT_STREQ("-0.997494986604054", _gc(xasprintf("%.15g", sin(-1.5))));
-  EXPECT_STREQ("0.909297426825682", _gc(xasprintf("%.15g", sin(2.))));
-  EXPECT_TRUE(isnan(sin(NAN)));
-  EXPECT_TRUE(isnan(sin(-NAN)));
-  EXPECT_TRUE(isnan(sin(INFINITY)));
-  EXPECT_TRUE(isnan(sin(-INFINITY)));
+  EXPECT_STREQ("0", _gc(xasprintf("%.15g", _sin(0.))));
+  EXPECT_STREQ("-0", _gc(xasprintf("%.15g", _sin(-0.))));
+  EXPECT_STREQ("0.0998334166468282", _gc(xasprintf("%.15g", _sin(.1))));
+  EXPECT_STREQ("-0.0998334166468282", _gc(xasprintf("%.15g", _sin(-.1))));
+  EXPECT_STREQ("0.479425538604203", _gc(xasprintf("%.15g", _sin(.5))));
+  EXPECT_STREQ("-0.479425538604203", _gc(xasprintf("%.15g", _sin(-.5))));
+  EXPECT_STREQ("0.841470984807897", _gc(xasprintf("%.15g", _sin(1.))));
+  EXPECT_STREQ("-0.841470984807897", _gc(xasprintf("%.15g", _sin(-1.))));
+  EXPECT_STREQ("0.997494986604054", _gc(xasprintf("%.15g", _sin(1.5))));
+  EXPECT_STREQ("-0.997494986604054", _gc(xasprintf("%.15g", _sin(-1.5))));
+  EXPECT_STREQ("0.909297426825682", _gc(xasprintf("%.15g", _sin(2.))));
+  EXPECT_TRUE(isnan(_sin(NAN)));
+  EXPECT_TRUE(isnan(_sin(-NAN)));
+  EXPECT_TRUE(isnan(_sin(INFINITY)));
+  EXPECT_TRUE(isnan(_sin(-INFINITY)));
   EXPECT_STREQ("2.2250738585072e-308",
-               _gc(xasprintf("%.15g", sin(__DBL_MIN__))));
+               _gc(xasprintf("%.15g", _sin(__DBL_MIN__))));
   EXPECT_STREQ("0.00496195478918406",
-               _gc(xasprintf("%.15g", sin(__DBL_MAX__))));
+               _gc(xasprintf("%.15g", _sin(__DBL_MAX__))));
   EXPECT_STREQ("-0.841470984807897",
-               _gc(xasprintf("%.15g", sin(-1.0000000000000002))));
+               _gc(xasprintf("%.15g", _sin(-1.0000000000000002))));
   EXPECT_STREQ("-2.1073424255447e-08",
-               _gc(xasprintf("%.15g", sin(-2.1073424255447e-08))));
+               _gc(xasprintf("%.15g", _sin(-2.1073424255447e-08))));
 }
 
 TEST(sinf, test) {
-  EXPECT_TRUE(isnan(sinf(NAN)));
-  EXPECT_TRUE(isnan(sinf(+INFINITY)));
-  EXPECT_TRUE(isnan(sinf(-INFINITY)));
-  EXPECT_STREQ("NAN", _gc(xdtoaf(sinf(NAN))));
-  EXPECT_STARTSWITH(".479426", _gc(xdtoaf(sinf(.5f))));
-  EXPECT_STARTSWITH("-.479426", _gc(xdtoaf(sinf(-.5f))));
-  EXPECT_STARTSWITH(".873283", _gc(xdtoaf(sinf(555))));
+  EXPECT_TRUE(isnan(_sinf(NAN)));
+  EXPECT_TRUE(isnan(_sinf(+INFINITY)));
+  EXPECT_TRUE(isnan(_sinf(-INFINITY)));
+  EXPECT_STREQ("NAN", _gc(xdtoaf(_sinf(NAN))));
+  EXPECT_STARTSWITH(".479426", _gc(xdtoaf(_sinf(.5f))));
+  EXPECT_STARTSWITH("-.479426", _gc(xdtoaf(_sinf(-.5f))));
+  EXPECT_STARTSWITH(".873283", _gc(xdtoaf(_sinf(555))));
 }
 
-BENCH(sin, bench) {
-  double _sin(double) asm("sin");
-  float _sinf(float) asm("sinf");
-  long double _sinl(long double) asm("sinl");
+BENCH(_sin, bench) {
   EZBENCH2("sin", donothing, _sin(.7));   /*  ~5ns */
   EZBENCH2("sinf", donothing, _sinf(.7)); /*  ~5ns */
   EZBENCH2("sinl", donothing, _sinl(.7)); /* ~28ns */
diff --git a/test/libc/tinymath/sinh_test.c b/test/libc/tinymath/sinh_test.c
index 68ee5680c..5721c05c3 100644
--- a/test/libc/tinymath/sinh_test.c
+++ b/test/libc/tinymath/sinh_test.c
@@ -21,42 +21,42 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define sinhl(x) sinhl(VEIL("t", (long double)(x)))
-#define sinh(x)  sinh(VEIL("x", (double)(x)))
-#define sinhf(x) sinhf(VEIL("x", (float)(x)))
+double _sinh(double) asm("sinh");
+float _sinhf(float) asm("sinhf");
+long double _sinhl(long double) asm("sinhl");
 
 TEST(sinh, test) {
-  EXPECT_STREQ(".521095305493747", gc(xdtoa(sinh(+.5))));
-  EXPECT_STREQ("-.521095305493747", gc(xdtoa(sinh(-.5))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(sinh(30000))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoa(sinh(-30000))));
-  EXPECT_STREQ("0", gc(xdtoa(sinh(0))));
-  EXPECT_STREQ("-0", gc(xdtoa(sinh(-0.))));
-  EXPECT_STREQ("NAN", gc(xdtoa(sinh(NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(sinh(INFINITY))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoa(sinh(-INFINITY))));
+  EXPECT_STREQ(".521095305493747", gc(xdtoa(_sinh(+.5))));
+  EXPECT_STREQ("-.521095305493747", gc(xdtoa(_sinh(-.5))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_sinh(30000))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoa(_sinh(-30000))));
+  EXPECT_STREQ("0", gc(xdtoa(_sinh(0))));
+  EXPECT_STREQ("-0", gc(xdtoa(_sinh(-0.))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_sinh(NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_sinh(INFINITY))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoa(_sinh(-INFINITY))));
 }
 
 TEST(sinhl, test) {
-  EXPECT_STREQ(".5210953054937474", gc(xdtoal(sinhl(+.5))));
-  EXPECT_STREQ("-.5210953054937474", gc(xdtoal(sinhl(-.5))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(sinhl(30000))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoal(sinhl(-30000))));
-  EXPECT_STREQ("0", gc(xdtoal(sinhl(0))));
-  EXPECT_STREQ("-0", gc(xdtoal(sinhl(-0.))));
-  EXPECT_STREQ("NAN", gc(xdtoal(sinhl(NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(sinhl(INFINITY))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoal(sinhl(-INFINITY))));
+  EXPECT_STREQ(".5210953054937474", gc(xdtoal(_sinhl(+.5))));
+  EXPECT_STREQ("-.5210953054937474", gc(xdtoal(_sinhl(-.5))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_sinhl(30000))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoal(_sinhl(-30000))));
+  EXPECT_STREQ("0", gc(xdtoal(_sinhl(0))));
+  EXPECT_STREQ("-0", gc(xdtoal(_sinhl(-0.))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_sinhl(NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_sinhl(INFINITY))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoal(_sinhl(-INFINITY))));
 }
 
 TEST(sinhf, test) {
-  EXPECT_STREQ(".521095", gc(xdtoaf(sinhf(+.5))));
-  EXPECT_STREQ("-.521095", gc(xdtoaf(sinhf(-.5))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(sinhf(30000))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoaf(sinhf(-30000))));
-  EXPECT_STREQ("0", gc(xdtoaf(sinhf(0))));
-  EXPECT_STREQ("-0", gc(xdtoaf(sinhf(-0.))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(sinhf(NAN))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(sinhf(INFINITY))));
-  EXPECT_STREQ("-INFINITY", gc(xdtoaf(sinhf(-INFINITY))));
+  EXPECT_STREQ(".521095", gc(xdtoaf(_sinhf(+.5))));
+  EXPECT_STREQ("-.521095", gc(xdtoaf(_sinhf(-.5))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_sinhf(30000))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoaf(_sinhf(-30000))));
+  EXPECT_STREQ("0", gc(xdtoaf(_sinhf(0))));
+  EXPECT_STREQ("-0", gc(xdtoaf(_sinhf(-0.))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_sinhf(NAN))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_sinhf(INFINITY))));
+  EXPECT_STREQ("-INFINITY", gc(xdtoaf(_sinhf(-INFINITY))));
 }
diff --git a/test/libc/tinymath/sqrt_test.c b/test/libc/tinymath/sqrt_test.c
index 6098938e9..11aee70d0 100644
--- a/test/libc/tinymath/sqrt_test.c
+++ b/test/libc/tinymath/sqrt_test.c
@@ -22,39 +22,36 @@
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
 
-#define sqrtl(x) sqrtl(VEIL("t", (long double)(x)))
-#define sqrt(x)  sqrt(VEIL("x", (double)(x)))
-#define sqrtf(x) sqrtf(VEIL("x", (float)(x)))
+double _sqrt(double) asm("sqrt");
+float _sqrtf(float) asm("sqrtf");
+long double _sqrtl(long double) asm("sqrtl");
 
 TEST(sqrtl, test) {
-  EXPECT_STREQ("7", gc(xdtoal(sqrtl(7 * 7))));
-  EXPECT_STREQ("NAN", gc(xdtoal(sqrtl(NAN))));
-  EXPECT_STREQ("0", gc(xdtoal(sqrtl(0))));
-  EXPECT_STREQ("INFINITY", gc(xdtoal(sqrtl(INFINITY))));
-  EXPECT_STREQ("-NAN", gc(xdtoal(sqrtl(-1))));
+  EXPECT_STREQ("7", gc(xdtoal(_sqrtl(7 * 7))));
+  EXPECT_STREQ("NAN", gc(xdtoal(_sqrtl(NAN))));
+  EXPECT_STREQ("0", gc(xdtoal(_sqrtl(0))));
+  EXPECT_STREQ("INFINITY", gc(xdtoal(_sqrtl(INFINITY))));
+  EXPECT_STREQ("-NAN", gc(xdtoal(_sqrtl(-1))));
 }
 
 TEST(sqrt, test) {
-  EXPECT_STREQ("7", gc(xdtoa(sqrt(7 * 7))));
-  EXPECT_STREQ("NAN", gc(xdtoa(sqrt(NAN))));
-  EXPECT_STREQ("0", gc(xdtoa(sqrt(0))));
-  EXPECT_STREQ("INFINITY", gc(xdtoa(sqrt(INFINITY))));
-  EXPECT_STREQ("-NAN", gc(xdtoa(sqrt(-1))));
+  EXPECT_STREQ("7", gc(xdtoa(_sqrt(7 * 7))));
+  EXPECT_STREQ("NAN", gc(xdtoa(_sqrt(NAN))));
+  EXPECT_STREQ("0", gc(xdtoa(_sqrt(0))));
+  EXPECT_STREQ("INFINITY", gc(xdtoa(_sqrt(INFINITY))));
+  EXPECT_STREQ("-NAN", gc(xdtoa(_sqrt(-1))));
 }
 
 TEST(sqrtf, test) {
-  EXPECT_STREQ("7", gc(xdtoaf(sqrtf(7 * 7))));
-  EXPECT_STREQ("NAN", gc(xdtoaf(sqrtf(NAN))));
-  EXPECT_STREQ("0", gc(xdtoaf(sqrtf(0))));
-  EXPECT_STREQ("INFINITY", gc(xdtoaf(sqrtf(INFINITY))));
-  EXPECT_STREQ("-NAN", gc(xdtoaf(sqrtf(-1))));
+  EXPECT_STREQ("7", gc(xdtoaf(_sqrtf(7 * 7))));
+  EXPECT_STREQ("NAN", gc(xdtoaf(_sqrtf(NAN))));
+  EXPECT_STREQ("0", gc(xdtoaf(_sqrtf(0))));
+  EXPECT_STREQ("INFINITY", gc(xdtoaf(_sqrtf(INFINITY))));
+  EXPECT_STREQ("-NAN", gc(xdtoaf(_sqrtf(-1))));
 }
 
-BENCH(sqrt, bench) {
-  double _sqrt(double) asm("sqrt");
-  float _sqrtf(float) asm("sqrtf");
-  long double _sqrtl(long double) asm("sqrtl");
-  EZBENCH2("sqrt", donothing, _sqrt(.7));   /*  ~5ns */
-  EZBENCH2("sqrtf", donothing, _sqrtf(.7)); /*  ~5ns */
-  EZBENCH2("sqrtl", donothing, _sqrtl(.7)); /* ~28ns */
+BENCH(_sqrt, bench) {
+  EZBENCH2("sqrt", donothing, _sqrt(.7));   /* ~2ns */
+  EZBENCH2("sqrtf", donothing, _sqrtf(.7)); /* ~1ns */
+  EZBENCH2("sqrtl", donothing, _sqrtl(.7)); /* ~9ns */
 }
diff --git a/test/libc/tinymath/tanh_test.c b/test/libc/tinymath/tanh_test.c
index dc3d9b789..5f5ece917 100644
--- a/test/libc/tinymath/tanh_test.c
+++ b/test/libc/tinymath/tanh_test.c
@@ -22,51 +22,51 @@
 #include "libc/x/x.h"
 #include "libc/x/xasprintf.h"
 
-#define tanhl(x) tanhl(VEIL("t", (long double)(x)))
-#define tanh(x)  tanh(VEIL("x", (double)(x)))
-#define tanhf(x) tanhf(VEIL("x", (float)(x)))
+double _tanh(double) asm("tanh");
+float _tanhf(float) asm("tanhf");
+long double _tanhl(long double) asm("tanhl");
 
-TEST(tanhl, test) {
-  EXPECT_STREQ(".09966799462495582", _gc(xdtoal(tanhl(+.1))));
-  EXPECT_STREQ("-.09966799462495582", _gc(xdtoal(tanhl(-.1))));
-  EXPECT_STREQ("0", _gc(xdtoal(tanhl(0))));
-  EXPECT_STREQ("-0", _gc(xdtoal(tanhl(-0.))));
-  EXPECT_TRUE(isnan(tanhl(NAN)));
-  EXPECT_STREQ("1", _gc(xdtoal(tanhl(INFINITY))));
-  EXPECT_STREQ("-1", _gc(xdtoal(tanhl(-INFINITY))));
+TEST(_tanhl, test) {
+  EXPECT_STREQ(".09966799462495582", _gc(xdtoal(_tanhl(+.1))));
+  EXPECT_STREQ("-.09966799462495582", _gc(xdtoal(_tanhl(-.1))));
+  EXPECT_STREQ("0", _gc(xdtoal(_tanhl(0))));
+  EXPECT_STREQ("-0", _gc(xdtoal(_tanhl(-0.))));
+  EXPECT_TRUE(isnan(_tanhl(NAN)));
+  EXPECT_STREQ("1", _gc(xdtoal(_tanhl(INFINITY))));
+  EXPECT_STREQ("-1", _gc(xdtoal(_tanhl(-INFINITY))));
 }
 
-TEST(tanh, test) {
-  EXPECT_STREQ("0", _gc(xasprintf("%.15g", tanh(0.))));
-  EXPECT_STREQ("-0", _gc(xasprintf("%.15g", tanh(-0.))));
-  EXPECT_STREQ("0.0996679946249558", _gc(xasprintf("%.15g", tanh(.1))));
-  EXPECT_STREQ("-0.0996679946249558", _gc(xasprintf("%.15g", tanh(-.1))));
-  EXPECT_STREQ("0.46211715726001", _gc(xasprintf("%.15g", tanh(.5))));
-  EXPECT_STREQ("-0.46211715726001", _gc(xasprintf("%.15g", tanh(-.5))));
-  EXPECT_STREQ("0.761594155955765", _gc(xasprintf("%.15g", tanh(1.))));
-  EXPECT_STREQ("-0.761594155955765", _gc(xasprintf("%.15g", tanh(-1.))));
-  EXPECT_STREQ("0.905148253644866", _gc(xasprintf("%.15g", tanh(1.5))));
-  EXPECT_STREQ("-0.905148253644866", _gc(xasprintf("%.15g", tanh(-1.5))));
-  EXPECT_STREQ("0.964027580075817", _gc(xasprintf("%.15g", tanh(2.))));
-  EXPECT_TRUE(isnan(tanh(NAN)));
-  EXPECT_TRUE(isnan(tanh(-NAN)));
-  EXPECT_STREQ("1", _gc(xasprintf("%.15g", tanh(INFINITY))));
-  EXPECT_STREQ("-1", _gc(xasprintf("%.15g", tanh(-INFINITY))));
+TEST(_tanh, test) {
+  EXPECT_STREQ("0", _gc(xasprintf("%.15g", _tanh(0.))));
+  EXPECT_STREQ("-0", _gc(xasprintf("%.15g", _tanh(-0.))));
+  EXPECT_STREQ("0.0996679946249558", _gc(xasprintf("%.15g", _tanh(.1))));
+  EXPECT_STREQ("-0.0996679946249558", _gc(xasprintf("%.15g", _tanh(-.1))));
+  EXPECT_STREQ("0.46211715726001", _gc(xasprintf("%.15g", _tanh(.5))));
+  EXPECT_STREQ("-0.46211715726001", _gc(xasprintf("%.15g", _tanh(-.5))));
+  EXPECT_STREQ("0.761594155955765", _gc(xasprintf("%.15g", _tanh(1.))));
+  EXPECT_STREQ("-0.761594155955765", _gc(xasprintf("%.15g", _tanh(-1.))));
+  EXPECT_STREQ("0.905148253644866", _gc(xasprintf("%.15g", _tanh(1.5))));
+  EXPECT_STREQ("-0.905148253644866", _gc(xasprintf("%.15g", _tanh(-1.5))));
+  EXPECT_STREQ("0.964027580075817", _gc(xasprintf("%.15g", _tanh(2.))));
+  EXPECT_TRUE(isnan(_tanh(NAN)));
+  EXPECT_TRUE(isnan(_tanh(-NAN)));
+  EXPECT_STREQ("1", _gc(xasprintf("%.15g", _tanh(INFINITY))));
+  EXPECT_STREQ("-1", _gc(xasprintf("%.15g", _tanh(-INFINITY))));
   EXPECT_STREQ("2.2250738585072e-308",
-               _gc(xasprintf("%.15g", tanh(__DBL_MIN__))));
-  EXPECT_STREQ("1", _gc(xasprintf("%.15g", tanh(__DBL_MAX__))));
+               _gc(xasprintf("%.15g", _tanh(__DBL_MIN__))));
+  EXPECT_STREQ("1", _gc(xasprintf("%.15g", _tanh(__DBL_MAX__))));
   EXPECT_STREQ("-0.761594155955765",
-               _gc(xasprintf("%.15g", tanh(-1.0000000000000002))));
+               _gc(xasprintf("%.15g", _tanh(-1.0000000000000002))));
   EXPECT_STREQ("-2.1073424255447e-08",
-               _gc(xasprintf("%.15g", tanh(-2.1073424255447e-08))));
+               _gc(xasprintf("%.15g", _tanh(-2.1073424255447e-08))));
 }
 
-TEST(tanhf, test) {
-  EXPECT_STREQ(".099668", _gc(xdtoaf(tanhf(+.1))));
-  EXPECT_STREQ("-.099668", _gc(xdtoaf(tanhf(-.1))));
-  EXPECT_STREQ("0", _gc(xdtoaf(tanhf(0))));
-  EXPECT_STREQ("-0", _gc(xdtoaf(tanhf(-0.))));
-  EXPECT_TRUE(isnan(tanhf(NAN)));
-  EXPECT_STREQ("1", _gc(xdtoaf(tanhf(INFINITY))));
-  EXPECT_STREQ("-1", _gc(xdtoaf(tanhf(-INFINITY))));
+TEST(_tanhf, test) {
+  EXPECT_STREQ(".099668", _gc(xdtoaf(_tanhf(+.1))));
+  EXPECT_STREQ("-.099668", _gc(xdtoaf(_tanhf(-.1))));
+  EXPECT_STREQ("0", _gc(xdtoaf(_tanhf(0))));
+  EXPECT_STREQ("-0", _gc(xdtoaf(_tanhf(-0.))));
+  EXPECT_TRUE(isnan(_tanhf(NAN)));
+  EXPECT_STREQ("1", _gc(xdtoaf(_tanhf(INFINITY))));
+  EXPECT_STREQ("-1", _gc(xdtoaf(_tanhf(-INFINITY))));
 }
diff --git a/third_party/getopt/getopt.c b/third_party/getopt/getopt.c
index 3c208219b..2263550a9 100644
--- a/third_party/getopt/getopt.c
+++ b/third_party/getopt/getopt.c
@@ -40,8 +40,6 @@ getopt (BSD-3)\\n\
 Copyright 1987, 1993, 1994 The Regents of the University of California\"");
 asm(".include \"libc/disclaimer.inc\"");
 
-STATIC_YOINK("_init_getopt");
-
 #define BADCH  (int)'?'
 #define BADARG (int)':'
 
@@ -75,8 +73,8 @@ int optreset;
  */
 char *optarg;
 
-_Hide char *getopt_place;
-_Hide char kGetoptEmsg[1];
+char *getopt_place;
+static char kGetoptEmsg[1];
 
 static void getopt_print_badch(const char *s) {
   char b1[512];
@@ -117,6 +115,13 @@ static void getopt_print_badch(const char *s) {
  */
 int getopt(int nargc, char *const nargv[], const char *ostr) {
   char *oli; /* option letter list index */
+  static bool once;
+  if (!once) {
+    opterr = 1;
+    optind = 1;
+    getopt_place = kGetoptEmsg;
+    once = true;
+  }
   /*
    * Some programs like cvs expect optind = 0 to trigger
    * a reset of getopt.
diff --git a/third_party/getopt/getopt.mk b/third_party/getopt/getopt.mk
index 99242c216..89b5c3476 100644
--- a/third_party/getopt/getopt.mk
+++ b/third_party/getopt/getopt.mk
@@ -8,16 +8,8 @@ THIRD_PARTY_GETOPT = $(THIRD_PARTY_GETOPT_A_DEPS) $(THIRD_PARTY_GETOPT_A)
 THIRD_PARTY_GETOPT_A = o/$(MODE)/third_party/getopt/getopt.a
 THIRD_PARTY_GETOPT_A_FILES := $(wildcard third_party/getopt/*)
 THIRD_PARTY_GETOPT_A_HDRS = $(filter %.h,$(THIRD_PARTY_GETOPT_A_FILES))
-THIRD_PARTY_GETOPT_A_SRCS_S = $(filter %.S,$(THIRD_PARTY_GETOPT_A_FILES))
-THIRD_PARTY_GETOPT_A_SRCS_C = $(filter %.c,$(THIRD_PARTY_GETOPT_A_FILES))
-
-THIRD_PARTY_GETOPT_A_SRCS =					\
-	$(THIRD_PARTY_GETOPT_A_SRCS_S)				\
-	$(THIRD_PARTY_GETOPT_A_SRCS_C)
-
-THIRD_PARTY_GETOPT_A_OBJS =					\
-	$(THIRD_PARTY_GETOPT_A_SRCS_S:%.S=o/$(MODE)/%.o)	\
-	$(THIRD_PARTY_GETOPT_A_SRCS_C:%.c=o/$(MODE)/%.o)
+THIRD_PARTY_GETOPT_A_SRCS = $(filter %.c,$(THIRD_PARTY_GETOPT_A_FILES))
+THIRD_PARTY_GETOPT_A_OBJS = $(THIRD_PARTY_GETOPT_A_SRCS:%.c=o/$(MODE)/%.o)
 
 THIRD_PARTY_GETOPT_A_CHECKS =					\
 	$(THIRD_PARTY_GETOPT_A).pkg				\
diff --git a/third_party/zlib/zlib.mk b/third_party/zlib/zlib.mk
index 0234bfb9f..d6f726585 100644
--- a/third_party/zlib/zlib.mk
+++ b/third_party/zlib/zlib.mk
@@ -8,16 +8,8 @@ THIRD_PARTY_ZLIB = $(THIRD_PARTY_ZLIB_A_DEPS) $(THIRD_PARTY_ZLIB_A)
 THIRD_PARTY_ZLIB_A = o/$(MODE)/third_party/zlib/zlib.a
 THIRD_PARTY_ZLIB_A_FILES := $(wildcard third_party/zlib/*)
 THIRD_PARTY_ZLIB_A_HDRS = $(filter %.h,$(THIRD_PARTY_ZLIB_A_FILES))
-THIRD_PARTY_ZLIB_A_SRCS_S = $(filter %.S,$(THIRD_PARTY_ZLIB_A_FILES))
-THIRD_PARTY_ZLIB_A_SRCS_C = $(filter %.c,$(THIRD_PARTY_ZLIB_A_FILES))
-
-THIRD_PARTY_ZLIB_A_SRCS =				\
-	$(THIRD_PARTY_ZLIB_A_SRCS_S)			\
-	$(THIRD_PARTY_ZLIB_A_SRCS_C)
-
-THIRD_PARTY_ZLIB_A_OBJS =				\
-	$(THIRD_PARTY_ZLIB_A_SRCS_S:%.S=o/$(MODE)/%.o)	\
-	$(THIRD_PARTY_ZLIB_A_SRCS_C:%.c=o/$(MODE)/%.o)
+THIRD_PARTY_ZLIB_A_SRCS = $(filter %.c,$(THIRD_PARTY_ZLIB_A_FILES))
+THIRD_PARTY_ZLIB_A_OBJS = $(THIRD_PARTY_ZLIB_A_SRCS:%.c=o/$(MODE)/%.o)
 
 THIRD_PARTY_ZLIB_A_CHECKS =				\
 	$(THIRD_PARTY_ZLIB_A).pkg			\