mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-13 05:10:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'jart:master' into issues-431-gh-actions

Browse source
This commit is contained in:
Theta Nil 2022-06-21 05:41:08 -04:00 • committed by GitHub
commit c34e8e99ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
build/bootstrap/compile.com
View file

Binary file not shown.

2
examples/pyapp/pyapp.mk
View file

@ -96,7 +96,7 @@ o/$(MODE)/examples/pyapp/pyapp.com.dbg: \
o/$(MODE)/examples/pyapp/pyapp.o \ o/$(MODE)/examples/pyapp/pyapp.o \
$(CRT) \ $(CRT) \
$(APE_NO_MODIFY_SELF) $(APE_NO_MODIFY_SELF)
$(LINK) $(LINKARGS) -o $@ @$(COMPILE) -ALINK.ape $(LINK) $(LINKARGS) -o $@
# # Unwrap the APE .COM binary, that's embedded within the linked file # # Unwrap the APE .COM binary, that's embedded within the linked file
# # NOTE: This line can be commented out, since it's in build/rules.mk # # NOTE: This line can be commented out, since it's in build/rules.mk

3
libc/str/strcmp.c
View file

@ -16,6 +16,7 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │ │ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/dce.h"
#include "libc/str/str.h" #include "libc/str/str.h"
static inline noasan uint64_t UncheckedAlignedRead64(const char *p) { static inline noasan uint64_t UncheckedAlignedRead64(const char *p) {
@ -39,7 +40,7 @@ int strcmp(const char *a, const char *b) {
uint64_t v, w, d; uint64_t v, w, d;
if (a == b) return 0; if (a == b) return 0;
if ((c = (*a & 255) - (*b & 255))) return c; if ((c = (*a & 255) - (*b & 255))) return c;
if (((uintptr_t)a & 7) == ((uintptr_t)b & 7)) { if (!IsTiny() && ((uintptr_t)a & 7) == ((uintptr_t)b & 7)) {
for (; (uintptr_t)(a + i) & 7; ++i) { for (; (uintptr_t)(a + i) & 7; ++i) {
if (a[i] != b[i] || !b[i]) { if (a[i] != b[i] || !b[i]) {
return (a[i] & 255) - (b[i] & 255); return (a[i] & 255) - (b[i] & 255);

1
tool/build/compile.c
View file

@ -1179,7 +1179,6 @@ int main(int argc, char *argv[]) {
} else { } else {
appendd(&output, command, n); appendd(&output, command, n);
} }
appendw(&output, '\n');
} else { } else {
n = 0; n = 0;
if (verbose >= 3) { if (verbose >= 3) {