Add more missing C / C++ headers

libc/integral/c.inc

@@ -26,7 +26,6 @@
 #define _Alignof(x) alignof(x)
 #endif /* C++11 */
 #else  /* __cplusplus */
-#define alignof(x) _Alignof(x)
 #if __STDC_VERSION__ + 0 < 201112
 #if __GNUC__ + _MSC_VER + 0 && !defined(__STRICT_ANSI__)
 #define _Alignof(x) __alignof(x)

libc/intrin/asan.c

@@ -898,7 +898,7 @@ static size_t __asan_user_size(size_t n) {
 
 static size_t __asan_heap_size(size_t n) {
   if (n < 0x7fffffff0000) {
-    n = ROUNDUP(n, alignof(struct AsanExtra));
+    n = ROUNDUP(n, _Alignof(struct AsanExtra));
     return __asan_roundup2pow(n + sizeof(struct AsanExtra));
   } else {
     return -1;
@@ -990,7 +990,7 @@ static struct AsanExtra *__asan_get_extra(const void *p, size_t *c) {
       (LIKELY(f == (int)((x - 1) >> 16)) || !kisdangerous((void *)(x - 1))) &&
       (LIKELY(f == (int)((x = x - sizeof(*e)) >> 16)) ||
        __asan_is_mapped(x >> 16)) &&
-      !(x & (alignof(struct AsanExtra) - 1))) {
+      !(x & (_Alignof(struct AsanExtra) - 1))) {
     *c = n;
     return (struct AsanExtra *)x;
   } else {

libc/iso646.internal.h

@@ -0,0 +1,18 @@
+#ifndef COSMOPOLITAN_LIBC_ISO646_H_
+#define COSMOPOLITAN_LIBC_ISO646_H_
+
+#ifndef __cplusplus
+#define and &&
+#define and_eq &=
+#define bitand &
+#define bitor |
+#define compl ~
+#define not !
+#define not_eq !=
+#define or ||
+#define or_eq |=
+#define xor ^
+#define xor_eq ^=
+#endif /* __cplusplus */
+
+#endif /* COSMOPOLITAN_LIBC_ISO646_H_ */

libc/isystem/algorithm

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ALGORITHM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_ALGORITHM_
+#include "third_party/libcxx/algorithm"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_ALGORITHM_ */

libc/isystem/any

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ANY_
+#define COSMOPOLITAN_LIBC_ISYSTEM_ANY_
+#include "third_party/libcxx/any"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_ANY_ */

libc/isystem/array

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ARRAY_
+#define COSMOPOLITAN_LIBC_ISYSTEM_ARRAY_
+#include "third_party/libcxx/array"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_ARRAY_ */

libc/isystem/atomic

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ATOMIC_
+#define COSMOPOLITAN_LIBC_ISYSTEM_ATOMIC_
+#include "third_party/libcxx/atomic"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_ATOMIC_ */

libc/isystem/bit

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_BIT_
+#define COSMOPOLITAN_LIBC_ISYSTEM_BIT_
+#include "third_party/libcxx/bit"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_BIT_ */

libc/isystem/bitset

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_BITSET_
+#define COSMOPOLITAN_LIBC_ISYSTEM_BITSET_
+#include "third_party/libcxx/bitset"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_BITSET_ */

libc/isystem/cassert

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CASSERT_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CASSERT_
+#include "third_party/libcxx/cassert"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CASSERT_ */

libc/isystem/ccomplex

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CCOMPLEX_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CCOMPLEX_
+#include "third_party/libcxx/ccomplex"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CCOMPLEX_ */

libc/isystem/cctype

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CCTYPE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CCTYPE_
+#include "third_party/libcxx/cctype"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CCTYPE_ */

libc/isystem/cerrno

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CERRNO_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CERRNO_
+#include "third_party/libcxx/cerrno"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CERRNO_ */

libc/isystem/cfenv

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CFENV_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CFENV_
+#include "third_party/libcxx/cfenv"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CFENV_ */

libc/isystem/cfloat

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CFLOAT_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CFLOAT_
+#include "third_party/libcxx/cfloat"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CFLOAT_ */

libc/isystem/charconv

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CHARCONV_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CHARCONV_
+#include "third_party/libcxx/charconv"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CHARCONV_ */

libc/isystem/chrono

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CHRONO_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CHRONO_
+#include "third_party/libcxx/chrono"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CHRONO_ */

libc/isystem/cinttypes

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CINTTYPES_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CINTTYPES_
+#include "third_party/libcxx/cinttypes"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CINTTYPES_ */

libc/isystem/ciso646

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CISO646_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CISO646_
+#include "third_party/libcxx/ciso646"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CISO646_ */

libc/isystem/climits

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CLIMITS_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CLIMITS_
+#include "third_party/libcxx/climits"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CLIMITS_ */

libc/isystem/clocale

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CLOCALE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CLOCALE_
+#include "third_party/libcxx/clocale"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CLOCALE_ */

libc/isystem/cmath

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CMATH_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CMATH_
+#include "third_party/libcxx/cmath"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CMATH_ */

libc/isystem/codecvt

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CODECVT_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CODECVT_
+#include "third_party/libcxx/codecvt"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CODECVT_ */

libc/isystem/compare

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_COMPARE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_COMPARE_
+#include "third_party/libcxx/compare"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_COMPARE_ */

libc/isystem/complex

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_COMPLEX_
+#define COSMOPOLITAN_LIBC_ISYSTEM_COMPLEX_
+#include "third_party/libcxx/complex"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_COMPLEX_ */

libc/isystem/condition_variable

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CONDITION_VARIABLE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CONDITION_VARIABLE_
+#include "third_party/libcxx/condition_variable"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CONDITION_VARIABLE_ */

libc/isystem/csetjmp

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSETJMP_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSETJMP_
+#include "third_party/libcxx/csetjmp"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSETJMP_ */

libc/isystem/csignal

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSIGNAL_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSIGNAL_
+#include "third_party/libcxx/csignal"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSIGNAL_ */

libc/isystem/cstdarg

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSTDARG_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSTDARG_
+#include "third_party/libcxx/cstdarg"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSTDARG_ */

libc/isystem/cstdbool

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSTDBOOL_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSTDBOOL_
+#include "third_party/libcxx/cstdbool"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSTDBOOL_ */

libc/isystem/cstddef

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSTDDEF_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSTDDEF_
+#include "third_party/libcxx/cstddef"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSTDDEF_ */

libc/isystem/cstdint

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSTDINT_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSTDINT_
+#include "third_party/libcxx/cstdint"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSTDINT_ */

libc/isystem/cstdio

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSTDIO_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSTDIO_
+#include "third_party/libcxx/cstdio"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSTDIO_ */

libc/isystem/cstdlib

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSTDLIB_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSTDLIB_
+#include "third_party/libcxx/cstdlib"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSTDLIB_ */

libc/isystem/cstring

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CSTRING_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CSTRING_
+#include "third_party/libcxx/cstring"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CSTRING_ */

libc/isystem/ctgmath

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CTGMATH_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CTGMATH_
+#include "third_party/libcxx/ctgmath"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CTGMATH_ */

libc/isystem/ctime

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CTIME_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CTIME_
+#include "third_party/libcxx/ctime"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CTIME_ */

libc/isystem/cwchar

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CWCHAR_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CWCHAR_
+#include "third_party/libcxx/cwchar"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CWCHAR_ */

libc/isystem/cwctype

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CWCTYPE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_CWCTYPE_
+#include "third_party/libcxx/cwctype"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CWCTYPE_ */

libc/isystem/deque

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_DEQUE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_DEQUE_
+#include "third_party/libcxx/deque"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_DEQUE_ */

libc/isystem/exception

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_EXCEPTION_
+#define COSMOPOLITAN_LIBC_ISYSTEM_EXCEPTION_
+#include "third_party/libcxx/exception"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_EXCEPTION_ */

libc/isystem/execution

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_EXECUTION_
+#define COSMOPOLITAN_LIBC_ISYSTEM_EXECUTION_
+#include "third_party/libcxx/execution"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_EXECUTION_ */

libc/isystem/fenv.h

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FENV_H_
+#define COSMOPOLITAN_LIBC_ISYSTEM_FENV_H_
+#include "libc/runtime/fenv.h"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FENV_H_ */

libc/isystem/filesystem

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FILESYSTEM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_FILESYSTEM_
+#include "third_party/libcxx/filesystem"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FILESYSTEM_ */

libc/isystem/forward_list

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FORWARD_LIST_
+#define COSMOPOLITAN_LIBC_ISYSTEM_FORWARD_LIST_
+#include "third_party/libcxx/forward_list"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FORWARD_LIST_ */

libc/isystem/fstream

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FSTREAM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_FSTREAM_
+#include "third_party/libcxx/fstream"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FSTREAM_ */

libc/isystem/functional

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FUNCTIONAL_
+#define COSMOPOLITAN_LIBC_ISYSTEM_FUNCTIONAL_
+#include "third_party/libcxx/functional"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FUNCTIONAL_ */

libc/isystem/initializer_list

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_INITIALIZER_LIST_
+#define COSMOPOLITAN_LIBC_ISYSTEM_INITIALIZER_LIST_
+#include "third_party/libcxx/initializer_list"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_INITIALIZER_LIST_ */

libc/isystem/inttypes.h

@@ -1,4 +1,5 @@
 #ifndef LIBC_ISYSTEM_INTTYPES_H_
 #define LIBC_ISYSTEM_INTTYPES_H_
+#include "libc/fmt/conv.h"
 #include "libc/inttypes.h"
 #endif /* LIBC_ISYSTEM_INTTYPES_H_ */

libc/isystem/iomanip

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_IOMANIP_
+#define COSMOPOLITAN_LIBC_ISYSTEM_IOMANIP_
+#include "third_party/libcxx/iomanip"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_IOMANIP_ */

libc/isystem/ios

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_IOS_
+#define COSMOPOLITAN_LIBC_ISYSTEM_IOS_
+#include "third_party/libcxx/ios"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_IOS_ */

libc/isystem/iosfwd

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_IOSFWD_
+#define COSMOPOLITAN_LIBC_ISYSTEM_IOSFWD_
+#include "third_party/libcxx/iosfwd"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_IOSFWD_ */

libc/isystem/iostream

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_IOSTREAM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_IOSTREAM_
+#include "third_party/libcxx/iostream"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_IOSTREAM_ */

libc/isystem/iso646.h

@@ -1,16 +1,4 @@
 #ifndef COSMOPOLITAN_LIBC_ISYSTEM_ISO646_H_
 #define COSMOPOLITAN_LIBC_ISYSTEM_ISO646_H_
-
-#define and &&
-#define and_eq &=
-#define bitand &
-#define bitor |
-#define compl ~
-#define not !
-#define not_eq !=
-#define or ||
-#define or_eq |=
-#define xor ^
-#define xor_eq ^=
-
+#include "libc/iso646.internal.h"
 #endif

libc/isystem/istream

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ISTREAM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_ISTREAM_
+#include "third_party/libcxx/istream"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_ISTREAM_ */

libc/isystem/iterator

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ITERATOR_
+#define COSMOPOLITAN_LIBC_ISYSTEM_ITERATOR_
+#include "third_party/libcxx/iterator"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_ITERATOR_ */

libc/isystem/limits

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_LIMITS_
+#define COSMOPOLITAN_LIBC_ISYSTEM_LIMITS_
+#include "third_party/libcxx/limits"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_LIMITS_ */

libc/isystem/list

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_LIST_
+#define COSMOPOLITAN_LIBC_ISYSTEM_LIST_
+#include "third_party/libcxx/list"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_LIST_ */

libc/isystem/locale

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_LOCALE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_LOCALE_
+#include "third_party/libcxx/locale"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_LOCALE_ */

libc/isystem/map

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_MAP_
+#define COSMOPOLITAN_LIBC_ISYSTEM_MAP_
+#include "third_party/libcxx/map"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_MAP_ */

libc/isystem/memory

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_MEMORY_
+#define COSMOPOLITAN_LIBC_ISYSTEM_MEMORY_
+#include "third_party/libcxx/memory"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_MEMORY_ */

libc/isystem/mutex

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_MUTEX_
+#define COSMOPOLITAN_LIBC_ISYSTEM_MUTEX_
+#include "third_party/libcxx/mutex"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_MUTEX_ */

libc/isystem/new

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_NEW_
+#define COSMOPOLITAN_LIBC_ISYSTEM_NEW_
+#include "third_party/libcxx/new"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_NEW_ */

libc/isystem/numeric

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_NUMERIC_
+#define COSMOPOLITAN_LIBC_ISYSTEM_NUMERIC_
+#include "third_party/libcxx/numeric"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_NUMERIC_ */

libc/isystem/optional

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_OPTIONAL_
+#define COSMOPOLITAN_LIBC_ISYSTEM_OPTIONAL_
+#include "third_party/libcxx/optional"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_OPTIONAL_ */

libc/isystem/ostream

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_OSTREAM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_OSTREAM_
+#include "third_party/libcxx/ostream"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_OSTREAM_ */

libc/isystem/queue

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_QUEUE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_QUEUE_
+#include "third_party/libcxx/queue"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_QUEUE_ */

libc/isystem/random

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_RANDOM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_RANDOM_
+#include "third_party/libcxx/random"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_RANDOM_ */

libc/isystem/ratio

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_RATIO_
+#define COSMOPOLITAN_LIBC_ISYSTEM_RATIO_
+#include "third_party/libcxx/ratio"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_RATIO_ */

libc/isystem/regex

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_REGEX_
+#define COSMOPOLITAN_LIBC_ISYSTEM_REGEX_
+#include "third_party/libcxx/regex"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_REGEX_ */

libc/isystem/scoped_allocator

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_SCOPED_ALLOCATOR_
+#define COSMOPOLITAN_LIBC_ISYSTEM_SCOPED_ALLOCATOR_
+#include "third_party/libcxx/scoped_allocator"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_SCOPED_ALLOCATOR_ */

libc/isystem/set

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_SET_
+#define COSMOPOLITAN_LIBC_ISYSTEM_SET_
+#include "third_party/libcxx/set"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_SET_ */

libc/isystem/sstream

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_SSTREAM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_SSTREAM_
+#include "third_party/libcxx/sstream"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_SSTREAM_ */

libc/isystem/stack

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STACK_
+#define COSMOPOLITAN_LIBC_ISYSTEM_STACK_
+#include "third_party/libcxx/stack"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STACK_ */

libc/isystem/stdalign.h

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STDALIGN_H_
+#define COSMOPOLITAN_LIBC_ISYSTEM_STDALIGN_H_
+#include "libc/stdalign.internal.h"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STDALIGN_H_ */

libc/isystem/stdexcept

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STDEXCEPT_
+#define COSMOPOLITAN_LIBC_ISYSTEM_STDEXCEPT_
+#include "third_party/libcxx/stdexcept"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STDEXCEPT_ */

libc/isystem/streambuf

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STREAMBUF_
+#define COSMOPOLITAN_LIBC_ISYSTEM_STREAMBUF_
+#include "third_party/libcxx/streambuf"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STREAMBUF_ */

libc/isystem/string

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STRING_
+#define COSMOPOLITAN_LIBC_ISYSTEM_STRING_
+#include "third_party/libcxx/string"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STRING_ */

libc/isystem/string_view

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STRING_VIEW_
+#define COSMOPOLITAN_LIBC_ISYSTEM_STRING_VIEW_
+#include "third_party/libcxx/string_view"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STRING_VIEW_ */

libc/isystem/strstream

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STRSTREAM_
+#define COSMOPOLITAN_LIBC_ISYSTEM_STRSTREAM_
+#include "third_party/libcxx/strstream"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STRSTREAM_ */

libc/isystem/system_error

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_SYSTEM_ERROR_
+#define COSMOPOLITAN_LIBC_ISYSTEM_SYSTEM_ERROR_
+#include "third_party/libcxx/system_error"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_SYSTEM_ERROR_ */

libc/isystem/thread

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_THREAD_
+#define COSMOPOLITAN_LIBC_ISYSTEM_THREAD_
+#include "third_party/libcxx/thread"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_THREAD_ */

libc/isystem/tuple

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_TUPLE_
+#define COSMOPOLITAN_LIBC_ISYSTEM_TUPLE_
+#include "third_party/libcxx/tuple"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_TUPLE_ */

libc/isystem/type_traits

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_TYPE_TRAITS_
+#define COSMOPOLITAN_LIBC_ISYSTEM_TYPE_TRAITS_
+#include "third_party/libcxx/type_traits"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_TYPE_TRAITS_ */

libc/isystem/typeindex

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_TYPEINDEX_
+#define COSMOPOLITAN_LIBC_ISYSTEM_TYPEINDEX_
+#include "third_party/libcxx/typeindex"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_TYPEINDEX_ */

libc/isystem/typeinfo

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_TYPEINFO_
+#define COSMOPOLITAN_LIBC_ISYSTEM_TYPEINFO_
+#include "third_party/libcxx/typeinfo"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_TYPEINFO_ */

libc/isystem/uchar.h

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_UCHAR_H_
+#define COSMOPOLITAN_LIBC_ISYSTEM_UCHAR_H_
+#include "libc/str/str.h"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_UCHAR_H_ */

libc/isystem/unordered_map

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_UNORDERED_MAP_
+#define COSMOPOLITAN_LIBC_ISYSTEM_UNORDERED_MAP_
+#include "third_party/libcxx/unordered_map"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_UNORDERED_MAP_ */

libc/isystem/unordered_set

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_UNORDERED_SET_
+#define COSMOPOLITAN_LIBC_ISYSTEM_UNORDERED_SET_
+#include "third_party/libcxx/unordered_set"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_UNORDERED_SET_ */

libc/isystem/utility

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_UTILITY_
+#define COSMOPOLITAN_LIBC_ISYSTEM_UTILITY_
+#include "third_party/libcxx/utility"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_UTILITY_ */

libc/isystem/valarray

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_VALARRAY_
+#define COSMOPOLITAN_LIBC_ISYSTEM_VALARRAY_
+#include "third_party/libcxx/valarray"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_VALARRAY_ */

libc/isystem/variant

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_VARIANT_
+#define COSMOPOLITAN_LIBC_ISYSTEM_VARIANT_
+#include "third_party/libcxx/variant"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_VARIANT_ */

libc/isystem/vector

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_VECTOR_
+#define COSMOPOLITAN_LIBC_ISYSTEM_VECTOR_
+#include "third_party/libcxx/vector"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_VECTOR_ */

libc/isystem/version

@@ -0,0 +1,4 @@
+#ifndef COSMOPOLITAN_LIBC_ISYSTEM_VERSION_
+#define COSMOPOLITAN_LIBC_ISYSTEM_VERSION_
+#include "third_party/libcxx/version"
+#endif /* COSMOPOLITAN_LIBC_ISYSTEM_VERSION_ */

libc/macros.internal.h

@@ -13,8 +13,6 @@
 #define TRUE  1
 #define FALSE 0
 
-#define alignas(x) _Alignas(x)
-
 #define IS2POW(X)           (!((X) & ((X)-1)))
 #define ROUNDUP(X, K)       (((X) + (K)-1) & -(K))
 #define ROUNDDOWN(X, K)     ((X) & -(K))

libc/nexgen32e/nexgen32e.h

@@ -10,7 +10,6 @@ extern const uint64_t kSha512[80];
 extern const unsigned char kTensIndex[64];
 
 void imapxlatab(void *);
-void insertionsort(int32_t *, size_t);
 void CheckStackIsAligned(void);
 
 COSMOPOLITAN_C_END_

libc/runtime/clone.c

@@ -33,6 +33,7 @@
 #include "libc/nt/thunk/msabi.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"
+#include "libc/stdalign.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/clone.h"
 #include "libc/sysv/consts/futex.h"

libc/runtime/enable_tls.c

@@ -31,6 +31,7 @@
 #include "libc/nt/thread.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"
+#include "libc/stdalign.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/nrlinux.h"
 #include "libc/thread/thread.h"

libc/stdalign.internal.h

@@ -0,0 +1,12 @@
+#ifndef COSMOPOLITAN_LIBC_STDALIGN_INTERNAL_H_
+#define COSMOPOLITAN_LIBC_STDALIGN_INTERNAL_H_
+
+#ifndef __cplusplus
+#define alignas _Alignas
+#define alignof _Alignof
+#endif /* __cplusplus */
+
+#define __alignas_is_defined 1
+#define __alignof_is_defined 1
+
+#endif /* COSMOPOLITAN_LIBC_STDALIGN_INTERNAL_H_ */

libc/str/insertionsort.greg.c

@@ -1,38 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/log/log.h"
-#include "libc/nexgen32e/nexgen32e.h"
-
-/**
- * Sorts array of signed 32-bit integers.
- * @see djbsort()
- */
-textreal void insertionsort(int32_t *a, size_t n) {
-  int t;
-  unsigned i, j;
-  for (i = 1; i < n; ++i) {
-    j = i;
-    t = a[i];
-    while (j > 0 && t < a[j - 1]) {
-      a[j] = a[j - 1];
-      --j;
-    }
-    a[j] = t;
-  }
-}