diff --git a/ape/ape.S b/ape/ape.S index 054e4bf3e..1b4338f8e 100644 --- a/ape/ape.S +++ b/ape/ape.S @@ -1082,8 +1082,8 @@ ape_pe: .ascin "PE",4 .long 0 // Checksum .short v_ntsubsystem // Subsystem: 0=Neutral,2=GUI,3=Console .short v_ntdllchar // DllCharacteristics - .quad 8 * 1024 * 1024 // StackReserve - .quad 64 * 1024 // StackCommit + .quad 0x30000 // StackReserve + .quad 0x30000 // StackCommit .quad 0 // HeapReserve .quad 0 // HeapCommit .long 0 // LoaderFlags diff --git a/bin/aarch64-unknown-cosmo-ar b/bin/aarch64-unknown-cosmo-ar index 58cc7ca32..79a86a39e 100755 --- a/bin/aarch64-unknown-cosmo-ar +++ b/bin/aarch64-unknown-cosmo-ar @@ -9,21 +9,8 @@ fatal_error() { exit 1 } -if [ ! -x "$COSMO/o//tool/build/ar.com" ]; then +if [ ! -x "$COSMO/o/third_party/gcc/bin/aarch64-linux-musl-ar" ]; then fatal_error "you need to run: aarch64-unknown-cosmo-cc --update" fi -if [ x"$1" = x"rc" ] || - [ x"$1" = x"rcD" ] || - [ x"$1" = x"rcu" ] | - [ x"$1" = x"rcuD" ] || - [ x"$1" = x"rcs" ] || - [ x"$1" = x"rcsD" ] || - [ x"$1" = x"--help" ] || - [ x"$1" = x"--version" ]; then - AR="$COSMO/o//tool/build/ar.com" -else - AR="$COSMO/o/third_party/gcc/bin/aarch64-linux-musl-ar" -fi - -exec "$AR" "$@" +exec "$COSMO/o/third_party/gcc/bin/aarch64-linux-musl-ar" "$@" diff --git a/bin/fatcosmoar b/bin/fatcosmoar index 69c18a913..f08d9a399 100755 --- a/bin/fatcosmoar +++ b/bin/fatcosmoar @@ -9,47 +9,28 @@ fatal_error() { exit 1 } -if [ ! -x "$COSMO/o//tool/build/ar.com" ]; then +if [ ! -x "$COSMO/o/third_party/gcc/bin/x86_64-linux-musl-ar" ]; then fatal_error "you need to run: fatcosmocc --update" fi -if [ x"$1" = x"rc" ] || - [ x"$1" = x"rcD" ] || - [ x"$1" = x"rcu" ] | - [ x"$1" = x"rcuD" ] || - [ x"$1" = x"rcs" ] || - [ x"$1" = x"rcsD" ] || - [ x"$1" = x"--help" ] || - [ x"$1" = x"--version" ]; then - # binutils ar is accidentally quadratic - # cosmopolitan ar is significantly faster - # it'll also use tricks like copy_file_range - AR_X86_64="$COSMO/o//tool/build/ar.com" - AR_AARCH64="$COSMO/o//tool/build/ar.com" - if [ "$1" = "--help" ] || - [ "$1" = "--version" ]; then - exec "$AR_X86_64" "$1" - fi -else - AR_X86_64="$COSMO/o/third_party/gcc/bin/x86_64-linux-musl-ar" - AR_AARCH64="$COSMO/o/third_party/gcc/bin/aarch64-linux-musl-ar" - if [ "$1" = "--version" ]; then - # note: only the underlying gnu compiler binaries are gpl - # our shell script is released with the isc license - cat </dev/null || - "$AR_X86_64" --help - exit - fi + exit 0 +elif [ "$1" = "--help" ]; then + "$AR_X86_64" --help | + sed "s!$AR_X86_64!$PROG!g" 2>/dev/null || + "$AR_X86_64" --help + exit fi FIRST=1 diff --git a/bin/x86_64-unknown-cosmo-ar b/bin/x86_64-unknown-cosmo-ar index bb0a35092..dee1394bb 100755 --- a/bin/x86_64-unknown-cosmo-ar +++ b/bin/x86_64-unknown-cosmo-ar @@ -9,21 +9,8 @@ fatal_error() { exit 1 } -if [ ! -x "$COSMO/o/$MODE/tool/build/ar.com" ]; then +if [ ! -x "$COSMO/o/third_party/gcc/bin/x86_64-linux-musl-ar" ]; then fatal_error "you need to run: x86_64-unknown-cosmo-cc --update" fi -if [ x"$1" = x"rc" ] || - [ x"$1" = x"rcD" ] || - [ x"$1" = x"rcu" ] | - [ x"$1" = x"rcuD" ] || - [ x"$1" = x"rcs" ] || - [ x"$1" = x"rcsD" ] || - [ x"$1" = x"--help" ] || - [ x"$1" = x"--version" ]; then - AR="$COSMO/o/$MODE/tool/build/ar.com" -else - AR="$COSMO/o/third_party/gcc/bin/x86_64-linux-musl-ar" -fi - -exec "$AR" "$@" +exec "$COSMO/o/third_party/gcc/bin/x86_64-linux-musl-ar" "$@"