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

tool/decode/ar.c

@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/mem/mem.h"

tool/decode/elf.c

@@ -26,7 +26,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"

tool/decode/lib/asmcodegen.h

@@ -2,7 +2,6 @@
 #define COSMOPOLITAN_TOOL_DECODE_LIB_ASMCODEGEN_H_
 #include "libc/stdio/stdio.h"
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 #define COLUMN_WIDTH 24
@@ -24,5 +23,4 @@ char *tabpad(const char *s, unsigned width) __wur;
 void show(const char *directive, const char *value, const char *comment);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_ASMCODEGEN_H_ */

tool/decode/lib/bitabuilder.c

@@ -18,7 +18,6 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "tool/decode/lib/bitabuilder.h"
 #include "libc/assert.h"
-#include "libc/intrin/bits.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/macros.internal.h"

tool/decode/lib/bitabuilder.h

@@ -1,6 +1,5 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_BITABUILDER_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_BITABUILDER_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct FILE;
@@ -11,5 +10,4 @@ bool bitabuilder_fwrite(const struct BitaBuilder *, struct FILE *);
 void bitabuilder_free(struct BitaBuilder **);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_BITABUILDER_H_ */

tool/decode/lib/disassemblehex.h

@@ -3,11 +3,9 @@
 
 #define kDisassembleHexColumns 8
 
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 void disassemblehex(uint8_t *data, size_t size, FILE *f);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_DISASSEMBLEHEX_H_ */

tool/decode/lib/elfidnames.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_ELFIDNAMES_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_ELFIDNAMES_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kElfTypeNames[];
@@ -20,5 +19,4 @@ extern const struct IdName kElfSpecialSectionNames[];
 extern const struct IdName kElfNexgen32eRelocationNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_ELFIDNAMES_H_ */

tool/decode/lib/flagger.h

@@ -1,11 +1,9 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_FLAGGER_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_FLAGGER_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 char *RecreateFlags(const struct IdName *, unsigned long) __wur;
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_FLAGGER_H_ */

tool/decode/lib/idname.h

@@ -1,6 +1,5 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_IDNAME_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_IDNAME_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct IdName {
@@ -11,5 +10,4 @@ struct IdName {
 const char *findnamebyid(const struct IdName *names, unsigned long id);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_IDNAME_H_ */

tool/decode/lib/machoidnames.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_MACHOIDNAMES_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_MACHOIDNAMES_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kMachoArchitectures[];
@@ -14,5 +13,4 @@ extern const struct IdName kMachoLoadCommandNames[];
 extern const struct IdName kMachoVmProtNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_MACHOIDNAMES_H_ */

tool/decode/lib/ntfileflagnames.h

@@ -1,11 +1,9 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_NTFILEFLAGNAMES_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_NTFILEFLAGNAMES_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kNtFileFlagNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_NTFILEFLAGNAMES_H_ */

tool/decode/lib/peidnames.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_PEIDNAMES_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_PEIDNAMES_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kNtImageFileMachineNames[];
@@ -14,5 +13,4 @@ extern const struct IdName kNtImageDirectoryEntryNames[];
 extern const struct IdName kNtPeSectionNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_PEIDNAMES_H_ */

tool/decode/lib/socknames.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_SOCKNAMES_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_SOCKNAMES_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kAddressFamilyNames[];
@@ -10,5 +9,4 @@ extern const struct IdName kAddrInfoFlagNames[];
 extern const struct IdName kProtocolNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_SOCKNAMES_H_ */

tool/decode/lib/titlegen.h

@@ -1,6 +1,5 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_TITLEGEN_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_TITLEGEN_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 struct Modeline {
@@ -14,5 +13,4 @@ void showtitle(const char *brand, const char *tool, const char *title,
                const char *description, const struct Modeline *modeline);
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_TITLEGEN_H_ */

tool/decode/lib/x86idnames.h

@@ -1,12 +1,10 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_X86IDNAMES_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_X86IDNAMES_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kX86MarchNames[];
 extern const struct IdName kX86GradeNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_X86IDNAMES_H_ */

tool/decode/lib/xederrors.h

@@ -1,11 +1,9 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_XEDERRORS_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_XEDERRORS_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kXedErrorIdNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_XEDERRORS_H_ */

tool/decode/lib/zipnames.h

@@ -1,7 +1,6 @@
 #ifndef COSMOPOLITAN_TOOL_DECODE_LIB_ZIPNAMES_H_
 #define COSMOPOLITAN_TOOL_DECODE_LIB_ZIPNAMES_H_
 #include "tool/decode/lib/idname.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
 extern const struct IdName kZipCompressionNames[];
@@ -11,5 +10,4 @@ extern const struct IdName kZipOsNames[];
 extern const struct IdName kZipEraNames[];
 
 COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_TOOL_DECODE_LIB_ZIPNAMES_H_ */

tool/decode/pe2.c

@@ -20,7 +20,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/gc.internal.h"

tool/decode/x86opinfo.c

@@ -17,7 +17,6 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/intrin/bits.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"

tool/decode/zip.c

@@ -20,7 +20,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/libgen.h"
 #include "libc/fmt/wintime.internal.h"
-#include "libc/intrin/bits.h"
+#include "libc/serialize.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/safemacros.internal.h"
 #include "libc/log/check.h"