update cosmo config

Author: ahgamut

.cargo/config.toml

@@ -1,3 +1,15 @@
+[unstable]
+build-std-features = [""]
+build-std = ["libc", "panic_abort", "std"]
+
+[profile.dev]
+panic = "abort"
+opt-level = "s"
+
+[profile.release]
+panic = "abort"
+opt-level = "s"
+
 # On Windows MSVC, statically link the C runtime so that the resulting EXE does
 # not depend on the vcruntime DLL.
 #

Cargo.toml

@@ -61,7 +61,7 @@ version = "2.33.0"
 default-features = false
 features = ["suggestions"]
 
-[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
+[target.'cfg(all(target_env = "dont-compile", target_pointer_width = "64"))'.dependencies.jemallocator]
 version = "0.5.0"
 
 [build-dependencies.clap]

aarch64-unknown-linux-cosmo.json

@@ -0,0 +1,51 @@
+{
+  "llvm-target": "aarch64-unknown-linux-musl",
+  "target-pointer-width": "64",
+  "arch": "aarch64",
+  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+  "os":"linux",
+  "env": "musl",
+  "panic-strategy":"abort",
+  "requires-uwtable":false,
+  "dynamic-linking": false,
+  "executables": true,
+  "exe-suffix": ".com.dbg",
+  "emit-debug-gdb-scripts":false,
+  "crt-static-default": true,
+  "crt-static-respected": false,
+  "linker-is-gnu":true,
+  "allows-weak-linkage":true,
+  "has-rpath": false,
+  "has-thread-local": false,
+  "is-builtin": false,
+  "trap-unreachable":true,
+  "position-independent-executables": false,
+  "static-position-independent-executables": false,
+  "relocation-model": "static",
+  "disable-redzone":true,
+  "frame-pointer":"always",
+  "requires-lto":false,
+  "eh-frame-header":false,
+  "no-default-libraries":true,
+  "max-atomic-width":64,
+  "linker-flavor":"gcc",
+  "linker": "./gcc-linker-wrapper.bash",
+  "late-link-args": {
+      "gcc": []
+  },
+  "pre-link-args": {
+      "gcc": [
+          "-static"
+      ]
+  },
+  "post-link-args": {
+      "gcc": [
+      ]
+  },
+  "stack-probes": {
+    "kind": "none"
+  },
+  "target-family": [
+    "unix"
+  ]
+}

crates/cli/src/lib.rs

@@ -120,7 +120,7 @@ them to the corresponding number of bytes (`2 * 1<<20` in this case). If an
 invalid size is found, then a good error message is crafted that typically
 tells the user how to fix the problem.
 */
-
+#![feature(rustc_private)]
 #![deny(missing_docs)]
 
 mod decompress;

gcc-linker-wrapper.bash

@@ -1,21 +1,18 @@
 #!/bin/bash
 set -eu
 
+COSMO="${COSMO:-/opt/cosmo}"
+ARCH="${ARCH:-x86_64}"
+
 declare -a args
 args=()
 for o in "$@" ; do
     case $o in
         "-lunwind") continue;;
-        "-lutil") continue;;
-        "-lrt") continue;;
-        "-lc") continue;;
-        "-lm") continue;;
-        "-lpthread") continue;;
-        "-lgcc") continue;;
         "-Wl,-Bdynamic") continue;;
         "-Wl,-Bstatic") continue;;
     esac
     args+=("$o")
 done
 
-gcc "${args[@]}"
+$COSMO/bin/$ARCH-unknown-cosmo-cc "${args[@]}"

x86_64-unknown-linux-cosmo.json

@@ -37,20 +37,12 @@
   "pre-link-args": {
       "gcc": [
           "-static",
-          "-nostdinc",
-          "-nostdlib",
           "-pg",
           "-mnop-mcount"
       ]
   },
   "post-link-args": {
       "gcc": [
-          "-Wl,--gc-sections",
-          "-fuse-ld=bfd",
-          "-Wl,-T,./libcosmo/ape.lds",
-          "./libcosmo/crt.o",
-          "./libcosmo/ape-no-modify-self.o",
-          "./libcosmo/cosmopolitan.a"
       ]
   },
   "stack-probes": {