Reduce header complexity

- Remove most __ASSEMBLER__ __LINKER__ ifdefs
- Rename libc/intrin/bits.h to libc/serialize.h
- Block pthread cancelation in fchmodat() polyfill
- Remove `clang-format off` statements in third_party

libc/log/appendresourcereport.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/rusage.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/log/log.h"
 #include "libc/math.h"
 #include "libc/runtime/clktck.h"

libc/log/appendresourcereport.internal.h

@@ -1,11 +1,9 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_APPENDRESOURCEREPORT_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_LOG_APPENDRESOURCEREPORT_INTERNAL_H_
 #include "libc/calls/struct/rusage.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 void AppendResourceReport(char **, struct rusage *, const char *);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_APPENDRESOURCEREPORT_INTERNAL_H_ */

libc/log/backtrace.internal.h

@@ -3,7 +3,6 @@
 #include "libc/nexgen32e/stackframe.h"
 #include "libc/runtime/memtrack.internal.h"
 #include "libc/runtime/symbols.internal.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 forceinline pureconst bool IsValidStackFramePointer(struct StackFrame *x) {
@@ -20,5 +19,4 @@ int PrintBacktraceUsingSymbols(int, const struct StackFrame *,
                                struct SymbolTable *);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_BACKTRACE_H_ */

libc/log/bsd.h

@@ -1,6 +1,5 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_BSD_H_
 #define COSMOPOLITAN_LIBC_LOG_BSD_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 void err(int, const char *, ...) wontreturn;
@@ -18,5 +17,4 @@ void vwarnx(const char *, va_list);
 void err_set_exit(void (*)(int));
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_BSD_H_ */

libc/log/check.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_LIBC_LOG_CHECK_H_
 #include "libc/dce.h"
 #include "libc/macros.internal.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 #define CHECK(X, ...)         __CHK(ne, !=, false, "false", !!(X), #X, "" __VA_ARGS__)
@@ -107,5 +106,4 @@ void __check_fail_aligned(unsigned, uint64_t, const char *, int, const char *,
 #endif
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_CHECK_H_ */

libc/log/color.internal.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_COLOR_H_
 #define COSMOPOLITAN_LIBC_LOG_COLOR_H_
 #include "libc/log/internal.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 #define CLS    (!__nocolor ? "\r\e[J" : "")
 #define RED    (!__nocolor ? "\e[30;101m" : "")
@@ -13,5 +12,4 @@
 #define RESET  (!__nocolor ? "\e[0m" : "")
 #define SUBTLE (!__nocolor ? "\e[35m" : "")
 
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_COLOR_H_ */

libc/log/countbranch.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_LIBC_LOG_COUNTBRANCH_H_
 #include "libc/macros.internal.h"
 #include "libc/stdbool.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 #define COUNTBRANCH(x) COUNTBRANCH_(x, #x, STRINGIFY(__FILE__), __LINE__)
@@ -55,5 +54,4 @@ extern struct countbranch countbranch_data[];
 void countbranch_report(void);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_COUNTBRANCH_H_ */

libc/log/countexpr.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_LIBC_LOG_COUNTEXPR_H_
 #include "libc/macros.internal.h"
 #include "libc/nexgen32e/bench.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 /**
@@ -80,5 +79,4 @@ extern struct countexpr countexpr_data[];
 void countexpr_report(void);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_COUNTEXPR_H_ */

libc/log/gdb.h

@@ -6,7 +6,6 @@
 #include "libc/proc/proc.internal.h"
 #include "libc/sysv/consts/nr.h"
 #include "libc/sysv/consts/w.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 /**
@@ -63,5 +62,4 @@ int AttachDebugger(intptr_t);
 #endif
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_GDB_H_ */

libc/log/getcallername.internal.h

@@ -1,11 +1,9 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_GETCALLERNAME_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_LOG_GETCALLERNAME_INTERNAL_H_
 #include "libc/nexgen32e/stackframe.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 const char *GetCallerName(const struct StackFrame *);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_GETCALLERNAME_INTERNAL_H_ */

libc/log/internal.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_LOG_INTERNAL_H_
 #include "libc/calls/struct/siginfo.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern bool __nocolor;
@@ -12,5 +11,4 @@ void __restore_tty(void);
 void __oncrash(int, struct siginfo *, void *);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_INTERNAL_H_ */

libc/log/leaks.c

@@ -19,7 +19,6 @@
 #include "libc/cxxabi.h"
 #include "libc/dce.h"
 #include "libc/intrin/asan.internal.h"
-#include "libc/intrin/bits.h"
 #include "libc/intrin/cmpxchg.h"
 #include "libc/intrin/cxaatexit.internal.h"
 #include "libc/intrin/kprintf.h"

libc/log/libfatal.internal.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_
 #include "libc/macros.internal.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 __funline unsigned long __strlen(const char *s) {
@@ -197,5 +196,4 @@ __funline void *__memmove(void *a, const void *b, unsigned long n) {
 }
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_LIBFATAL_INTERNAL_H_ */

libc/log/log.h

@@ -30,7 +30,6 @@
 #define _LOG_TINY 0
 #endif
 
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern FILE *__log_file;
@@ -225,6 +224,5 @@ void vffatalf(ARGS, va_list) asm("vflogf") ATTRV relegated wontreturn libcesque;
 
 #endif /* __STRICT_ANSI__ */
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* _COSMO_SOURCE */
 #endif /* COSMOPOLITAN_LIBC_LOG_LOG_H_ */

libc/log/traceme.h

@@ -1,10 +1,8 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_TRACEME_H_
 #define COSMOPOLITAN_LIBC_LOG_TRACEME_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern int traceme;
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_LOG_TRACEME_H_ */

libc/log/vflogf.c

@@ -25,7 +25,6 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/bits.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/intrin/strace.internal.h"
 #include "libc/log/internal.h"

libc/log/watch.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/log.h"