Make improvements

- Fix unused local variable errors
- Remove yoinks from sigaction() header
- Add nox87 and aarch64 to github actions
- Fix cosmocc -fportcosmo in linking mode
- It's now possible to build `make m=llvm o/llvm/libc`
This commit is contained in:
Justine Tunney 2023-07-10 04:29:46 -07:00
parent 3dc86ce154
commit f7ae50462a
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
118 changed files with 342 additions and 392 deletions

View file

@ -36,6 +36,7 @@
#include "libc/str/str.h"
#include "libc/sysv/consts/sa.h"
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/sig.h"
#include "third_party/awk/awk.h"
// clang-format off

View file

@ -1,14 +0,0 @@
#if 0
/*─────────────────────────────────────────────────────────────────╗
To the extent possible under law, Justine Tunney has waived
all copyright and related or neighboring rights to division,
as it is written in the following disclaimers:
http://unlicense.org/ │
http://creativecommons.org/publicdomain/zero/1.0/ │
*/
#endif
#include "third_party/compiler_rt/int_lib.h"
COMPILER_RT_ABI tu_int __udivti3(tu_int a, tu_int b) {
return __udivmodti4(a, b, NULL);
}

View file

@ -40,6 +40,7 @@
#include "libc/stdio/stdio.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/sa.h"
#include "libc/sysv/consts/sig.h"
#include "libc/thread/thread.h"
#include "third_party/linenoise/linenoise.h"
#include "third_party/lua/cosmo.h"

View file

@ -22,6 +22,7 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
#include "third_party/make/variable.h"
/**/
#include "libc/runtime/runtime.h"
#include "libc/sysv/consts/sig.h"
#include "third_party/make/commands.h"
/* clang-format off */

View file

@ -57,6 +57,7 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
#include "libc/sysv/consts/pr.h"
#include "libc/sysv/consts/prot.h"
#include "libc/sysv/consts/rlimit.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/errfuns.h"
#include "libc/time/time.h"
#include "libc/x/x.h"

View file

@ -41,7 +41,7 @@ static ssize_t vstrfmon_l(char *s, size_t n, locale_t loc, const char *fmt, va_l
{
size_t l;
double x;
int fill, nogrp, negpar, nosym, left, intl;
int left;
int lp, rp, w, fw;
char *s0=s;
for (; n && *fmt; ) {
@ -54,25 +54,17 @@ static ssize_t vstrfmon_l(char *s, size_t n, locale_t loc, const char *fmt, va_l
fmt++;
if (*fmt == '%') goto literal;
fill = ' ';
nogrp = 0;
negpar = 0;
nosym = 0;
left = 0;
for (; ; fmt++) {
switch (*fmt) {
case '=':
fill = *++fmt;
continue;
case '^':
nogrp = 1;
continue;
case '(':
negpar = 1;
case '+':
continue;
case '!':
nosym = 1;
continue;
case '-':
left = 1;
@ -90,8 +82,6 @@ static ssize_t vstrfmon_l(char *s, size_t n, locale_t loc, const char *fmt, va_l
if (*fmt=='.') for (rp=0, fmt++; isdigit(*fmt); fmt++)
rp = 10*rp + (*fmt-'0');
intl = *fmt++ == 'i';
w = lp + 1 + rp;
if (!left && fw>w) w = fw;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __big5_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __cp932ext_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __cp949_encmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __cp949ext_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __cp950ext_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __gb18030ext_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __gb18030ext_encmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __gb2312_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __gbcommon_encmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __gbkext_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __jisx0208_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __jisx0212_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __jisx0213_1_bmp_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __jisx0213_2_bmp_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __jisx0213_pair_decmap_ptr;

View file

@ -1,4 +1,5 @@
#include "libc/x/x.h"
#include "third_party/python/Modules/cjkcodecs/xloadzd.h"
/* clang-format off */
static _Atomic(void *) __ksx1001_decmap_ptr;

View file

@ -0,0 +1,77 @@
/*-*- 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 2021 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/assert.h"
#include "libc/fmt/leb128.h"
#include "libc/intrin/atomic.h"
#include "libc/intrin/kmalloc.h"
#include "libc/mem/mem.h"
#include "libc/nexgen32e/crc32.h"
#include "libc/runtime/internal.h"
#include "libc/runtime/runtime.h"
#include "libc/x/x.h"
#include "third_party/zlib/zlib.h"
/**
* Loads δzd encoded data once atomically.
*
* @param a points to your static pointer holder
* @param p is read-only data compressed using raw deflate
* @param n is byte length of deflated data
* @param m is byte length of inflated data
* @param c is number of items in array
* @param z is byte length of items
* @param s is crc32 checksum
* @return pointer to decoded data
* @threadsafe
*/
void *xloadzd(_Atomic(void *) *a, const void *p, size_t n, size_t m, size_t c,
size_t z, uint32_t s) {
size_t i;
char *q, *b;
void *r, *g;
int64_t x, y;
if ((r = atomic_load_explicit(a, memory_order_acquire))) return r;
_unassert(z == 2 || z == 4);
if (!(b = q = malloc(m))) return 0;
if (__inflate(q, m, p, n)) {
free(q);
return 0;
}
if (!(r = kmalloc(c * z))) {
free(q);
return 0;
}
for (x = i = 0; i < c; ++i) {
b += unzleb64(b, 10, &y);
x += y;
if (z == 2) {
((uint16_t *)r)[i] = x;
} else {
((uint32_t *)r)[i] = x;
}
}
free(q);
assert(crc32_z(0, r, c * z) == s);
g = 0;
if (!atomic_compare_exchange_strong_explicit(a, &g, r, memory_order_relaxed,
memory_order_relaxed)) {
r = g;
}
return r;
}

View file

@ -0,0 +1,11 @@
#ifndef COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_
#define COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_
#if !(__ASSEMBLER__ + __LINKER__ + 0)
COSMOPOLITAN_C_START_
void *xloadzd(_Atomic(void *) *, const void *, size_t, size_t, size_t, size_t,
uint32_t);
COSMOPOLITAN_C_END_
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
#endif /* COSMOPOLITAN_THIRD_PARTY_PYTHON_MODULES_CJKCODECS_XLOADZD_H_ */

View file

@ -6,6 +6,7 @@
*/
#include "libc/calls/calls.h"
#include "libc/calls/struct/sigaction.h"
#include "libc/calls/struct/sigaltstack.h"
#include "libc/errno.h"
#include "libc/sysv/consts/rlimit.h"
#include "libc/sysv/consts/sa.h"

View file

@ -188,6 +188,7 @@ THIRD_PARTY_PYTHON_HDRS = \
third_party/python/Modules/_sqlite/row.h \
third_party/python/Modules/_sqlite/statement.h \
third_party/python/Modules/_sqlite/util.h \
third_party/python/Modules/cjkcodecs/xloadzd.h \
third_party/python/Modules/cjkcodecs/cjkcodecs.h \
third_party/python/Modules/cjkcodecs/multibytecodec.h \
third_party/python/Modules/cjkcodecs/somanyencodings.h \
@ -586,6 +587,7 @@ THIRD_PARTY_PYTHON_STAGE2_A_SRCS = \
third_party/python/Modules/atexitmodule.c \
third_party/python/Modules/audioop.c \
third_party/python/Modules/binascii.c \
third_party/python/Modules/cjkcodecs/xloadzd.c \
third_party/python/Modules/cjkcodecs/_codecs_cn.c \
third_party/python/Modules/cjkcodecs/_codecs_hk.c \
third_party/python/Modules/cjkcodecs/_codecs_iso2022.c \

View file

@ -47,6 +47,7 @@
#include "libc/sysv/consts/clock.h"
#include "libc/sysv/consts/o.h"
#include "libc/sysv/consts/s.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/consts/termios.h"
#include "libc/sysv/consts/w.h"
#include "libc/time/time.h"

View file

@ -41,6 +41,7 @@
#include "libc/sysv/consts/ok.h"
#include "libc/sysv/consts/sa.h"
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/consts/ss.h"
#include "libc/time/time.h"
#include "third_party/libcxx/algorithm"

View file

@ -41,6 +41,7 @@
#include "libc/sysv/consts/ok.h"
#include "libc/sysv/consts/sa.h"
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/consts/ss.h"
#include "libc/time/time.h"
#include "third_party/libcxx/cassert"

View file

@ -31,6 +31,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
*/
#include "libc/dce.h"
#if (defined(_WIN32) || defined(WIN32)) && !defined(_CRT_SECURE_NO_WARNINGS)
/* This needs to come before any includes for MSVC compiler */
#define _CRT_SECURE_NO_WARNINGS

View file

@ -56,6 +56,7 @@
#include "third_party/zip/ttyio.h"
#include "libc/str/str.h"
#include "libc/errno.h"
#include "libc/sysv/consts/sig.h"
#include "third_party/bzip2/bzlib.h"
#ifdef VMS

View file

@ -91,7 +91,8 @@ THIRD_PARTY_ZIP_DIRECTDEPS = \
LIBC_SYSV \
LIBC_TIME \
LIBC_X \
THIRD_PARTY_BZIP2
THIRD_PARTY_BZIP2 \
THIRD_PARTY_ZLIB
THIRD_PARTY_ZIP_DEPS := \
$(call uniq,$(foreach x,$(THIRD_PARTY_ZIP_DIRECTDEPS),$($(x))))

View file

@ -26,6 +26,7 @@
#include "libc/calls/struct/siginfo.h"
#include "libc/sysv/consts/sa.h"
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/consts/ss.h"
/* Calculate size of static line buffer used in write (-w) mode. */

View file

@ -26,6 +26,7 @@
#include "libc/calls/struct/siginfo.h"
#include "libc/sysv/consts/sa.h"
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/consts/ss.h"
#define DEFSIZ 36000L /* Default split size (change in help() too) */

View file

@ -85,6 +85,7 @@
#include "libc/sysv/consts/sa.h"
#include "libc/sysv/consts/sicode.h"
#include "libc/sysv/consts/ss.h"
#include "libc/sysv/consts/sig.h"
#include "third_party/zstd/programs/timefn.h" /* UTIL_getTime, UTIL_clockSpanMicro */
#if defined (_MSC_VER)