Compare revisions

22cf7709 · c2c7965b · 371cde00 · 59e7d2d7 · 0f5e6a56 · 8ab61e3d
--- a/.gitmodules
+++ b/.gitmodules
 [submodule "openlibm"]
 	path = openlibm
-	url = https://gitlab.redox-os.org/redox-os/openlibm.git
+	url = https://github.com/JuliaMath/openlibm.git
+	branch = master
 [submodule "posix-regex"]
 	path = posix-regex
 	url = https://gitlab.redox-os.org/redox-os/posix-regex.git

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
+{
+    "cmake.ignoreCMakeListsMissing": true
+}
\ No newline at end of file
--- a/Cargo.lock
+++ b/Cargo.lock
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 [[package]]
 name = "base64ct"
@@ -27,9 +36,9 @@ dependencies = [
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 [[package]]
 name = "block-buffer"
@@ -67,9 +76,11 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/tea/cc-rs?branch=riscv-abi-arch-fix#588ceacb084af41415690c57688e338a32a1f1b4"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+dependencies = [
+ "shlex",
+]
 [[package]]
 name = "cfg-if"
@@ -77,6 +88,36 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "chrono"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+dependencies = [
+ "num-traits",
+]
+[[package]]
+name = "chrono-tz"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6"
+dependencies = [
+ "chrono",
+ "chrono-tz-build",
+ "phf",
+]
+[[package]]
+name = "chrono-tz-build"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
+dependencies = [
+ "parse-zoneinfo",
+ "phf_codegen",
+]
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -89,9 +130,9 @@ dependencies = [
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
 "libc",
 ]
@@ -143,6 +184,10 @@ dependencies = [
 "version_check",
 ]
+[[package]]
+name = "generic-rt"
+version = "0.1.0"
 [[package]]
 name = "goblin"
 version = "0.7.1"
@@ -178,25 +223,41 @@ version = "0.1.0"
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+[[package]]
+name = "libm"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 [[package]]
 name = "libredox"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "309ba69985d5170852ebbe8fbb33850d20794d0aed5b210dfea2db798df64e10"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
 "bitflags",
 "libc",
 ]
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 [[package]]
 name = "md-5"
@@ -210,26 +271,34 @@ dependencies = [
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 [[package]]
-name = "memoffset"
+name = "num-traits"
-version = "0.9.0"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
 "autocfg",
 ]
 [[package]]
-name = "num-traits"
+name = "object"
-version = "0.2.18"
+version = "0.36.7"
+source = "git+https://gitlab.redox-os.org/andypython/object#7270e3f0d06e5ef4c2b80abc6166d31f4ddf4fea"
+dependencies = [
+ "memchr",
+]
+[[package]]
+name = "parse-zoneinfo"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
 dependencies = [
- "autocfg",
+ "regex",
 ]
 [[package]]
@@ -239,7 +308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
 "base64ct",
- "rand_core 0.6.4",
+ "rand_core",
 "subtle",
 ]
@@ -254,6 +323,44 @@ dependencies = [
 "sha2",
 ]
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_shared",
+]
+[[package]]
+name = "phf_codegen"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
 [[package]]
 name = "plain"
 version = "0.2.3"
@@ -264,121 +371,80 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 name = "posix-regex"
 version = "0.1.0"
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
 "proc-macro2",
 ]
 [[package]]
 name = "rand"
-version = "0.7.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "rand_chacha",
+ "rand_core",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
 ]
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 [[package]]
 name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
 [[package]]
 name = "rand_jitter"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a404fd88e0f817fc1c3351b9ba2207ffa65038cdde464405308a5f5d254835fe"
+checksum = "814ba4c101d5c52ef4e6e8e5288c4b6e03d840af28e4d0ff9edab06ed5e1f2f4"
 dependencies = [
 "libc",
- "rand_core 0.5.1",
+ "rand_core",
 "winapi",
 ]
 [[package]]
-name = "rand_pcg"
+name = "rand_xorshift"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.5.1",
+ "rand_core",
 ]
 [[package]]
-name = "rand_xorshift"
+name = "redox-path"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
+checksum = "64072665120942deff5fd5425d6c1811b854f4939e7f1c01ce755f64432bbea7"
-dependencies = [
- "rand_core 0.5.1",
-]
 [[package]]
-name = "redox-exec"
+name = "redox-rt"
 version = "0.1.0"
 dependencies = [
+ "bitflags",
+ "generic-rt",
 "goblin",
 "plain",
 "redox_syscall",
 ]
-[[package]]
-name = "redox-path"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64072665120942deff5fd5425d6c1811b854f4939e7f1c01ce755f64432bbea7"
 [[package]]
 name = "redox_event"
 version = "0.4.0"
-source = "git+https://gitlab.redox-os.org/redox-os/event.git#269452fca1655396536f38eba0f860c77e11cb92"
+source = "git+https://gitlab.redox-os.org/redox-os/event.git#36ac5a57a8573f7546d7dc0893596ebe99bd2b7f"
 dependencies = [
 "bitflags",
 "libredox",
@@ -387,13 +453,42 @@ dependencies = [
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
 "bitflags",
 ]
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relibc"
 version = "0.2.5"
@@ -403,26 +498,30 @@ dependencies = [
 "bitflags",
 "cbitset",
 "cc",
+ "chrono",
+ "chrono-tz",
 "dlmalloc",
- "goblin",
+ "generic-rt",
 "libc",
+ "libm",
 "md-5",
 "memchr",
- "memoffset",
+ "object",
 "pbkdf2",
 "plain",
 "posix-regex",
 "rand",
 "rand_jitter",
 "rand_xorshift",
- "redox-exec",
 "redox-path",
+ "redox-rt",
 "redox_event",
 "redox_syscall",
 "sc",
 "scrypt",
 "sha-crypt",
 "sha2",
+ "spin",
 "unicode-width",
 ]
@@ -441,6 +540,12 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "010e18bd3bfd1d45a7e666b236c78720df0d9a7698ebaa9c1c559961eb60a38b"
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "scroll"
 version = "0.11.0"
@@ -494,17 +599,38 @@ dependencies = [
 "digest",
 ]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -519,21 +645,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 [[package]]
 name = "winapi"

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,8 +13,9 @@ members = [
    "src/crt0",
    "src/crti",
    "src/crtn",
-    "src/ld_so",
+    "redox-rt",
-    "src/platform/redox/redox-exec",
+    "ld_so",
+    "generic-rt",
 ]
 exclude = ["tests", "dlmalloc-rs"]
@@ -24,30 +25,32 @@ cc = "1"
 [dependencies]
 bitflags = "2"
 cbitset = "0.2"
-memoffset = "0.9"
 posix-regex = { path = "posix-regex", features = ["no_std"] }
 # TODO: For some reason, rand_jitter hasn't been updated to use the latest rand_core
-rand = { version = "0.7", default-features = false, features = ["small_rng"] }
+rand = { version = "0.8", default-features = false, features = ["small_rng"] }
-rand_xorshift = "0.2"
+rand_xorshift = "0.3"
-rand_jitter = "0.3"
+rand_jitter = "0.4"
 memchr = { version = "2.2.0", default-features = false }
 plain = "0.2"
 unicode-width = "0.1"
 __libc_only_for_layout_checks = { package = "libc", version = "0.2.149", optional = true }
-md5-crypto = { package = "md-5", version = "0.10.6", default-features = false}
+md5-crypto = { package = "md-5", version = "0.10.6", default-features = false }
 sha-crypt = { version = "0.5", default-features = false }
 base64ct = { version = "1.6", default-features = false, features = ["alloc"] }
-bcrypt-pbkdf = { version = "0.10", default-features = false, features = ["alloc"] }
+bcrypt-pbkdf = { version = "0.10", default-features = false, features = [
-scrypt = { version = "0.11", default-features = false, features = ["simple"]}
+    "alloc",
-pbkdf2 = { version = "0.12", features = ["sha2"]}
+] }
+scrypt = { version = "0.11", default-features = false, features = ["simple"] }
+pbkdf2 = { version = "0.12", features = ["sha2"] }
 sha2 = { version = "0.10", default-features = false }
+generic-rt = { path = "generic-rt" }
-[dependencies.goblin]
+chrono-tz = {version = "0.10", default-features = false}
-version = "0.7"
+chrono = {version = "0.4", default-features = false, features = ["alloc"]}
-default-features = false
+libm = "0.2"
-features = ["elf32", "elf64", "endian_fd"]
+object = { version = "0.36.7", git = "https://gitlab.redox-os.org/andypython/object", default-features = false, features = ["elf", "read_core"] }
+spin = "0.9.8"
 [dependencies.dlmalloc]
 path = "dlmalloc-rs"
@@ -58,10 +61,12 @@ features = ["c_api"]
 sc = "0.2.3"
 [target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.5.1"
+redox_syscall = "0.5.8"
-redox-exec = { path = "src/platform/redox/redox-exec" }
+redox-rt = { path = "redox-rt" }
 redox-path = "0.2"
-redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git", default-features = false, features = ["redox_syscall"] }
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git", default-features = false, features = [
+    "redox_syscall",
+] }
 [features]
 default = ["check_against_libc_crate"]
@@ -73,3 +78,6 @@ panic = "abort"
 [profile.release]
 panic = "abort"
+[patch.crates-io]
+cc-11 = { git = "https://github.com/tea/cc-rs", branch = "riscv-abi-arch-fix", package = "cc" }
--- a/Makefile
+++ b/Makefile
-TARGET?=$(shell rustc -Z unstable-options --print target-spec-json | grep llvm-target | cut -d '"' -f4)
+ifndef TARGET
+	export TARGET:=$(shell rustc -Z unstable-options --print target-spec-json | grep llvm-target | cut -d '"' -f4)
+endif
 CARGO?=cargo
 CARGO_TEST?=$(CARGO)
@@ -7,10 +9,13 @@ CARGOFLAGS?=$(CARGO_COMMON_FLAGS)
 RUSTCFLAGS?=
 export OBJCOPY?=objcopy
-BUILD?="$(shell pwd)/target/$(TARGET)"
+BUILD?=$(shell pwd)/target/$(TARGET)
-CARGOFLAGS+="--target=$(TARGET)"
+CARGOFLAGS+=--target=$(TARGET)
+TARGET_HEADERS?=$(BUILD)/include
+export CFLAGS=-I$(TARGET_HEADERS)
-TARGET_HEADERS?="$(BUILD)/include"
+PROFILE?=release
 HEADERS_UNPARSED=$(shell find src/header -mindepth 1 -maxdepth 1 -type d -not -name "_*" -printf "%f\n")
 HEADERS_DEPS=$(shell find src/header -type f \( -name "cbindgen.toml" -o -name "*.rs" \))
@@ -20,35 +25,54 @@ ifeq ($(TARGET),aarch64-unknown-linux-gnu)
 	export CC=aarch64-linux-gnu-gcc
 	export LD=aarch64-linux-gnu-ld
 	export AR=aarch64-linux-gnu-ar
+	export NM=aarch64-linux-gnu-nm
 	export OBJCOPY=aarch64-linux-gnu-objcopy
+	export CPPFLAGS=
 endif
 ifeq ($(TARGET),aarch64-unknown-redox)
 	export CC=aarch64-unknown-redox-gcc
 	export LD=aarch64-unknown-redox-ld
 	export AR=aarch64-unknown-redox-ar
+	export NM=aarch64-unknown-redox-nm
 	export OBJCOPY=aarch64-unknown-redox-objcopy
+	export CPPFLAGS=
 endif
 ifeq ($(TARGET),x86_64-unknown-linux-gnu)
 	export CC=x86_64-linux-gnu-gcc
 	export LD=x86_64-linux-gnu-ld
 	export AR=x86_64-linux-gnu-ar
-	export OBJCOPY=x86_64-linux-gnu-objcopy
+	export NM=x86_64-linux-gnu-nm
+	export OBJCOPY=objcopy
+	export CPPFLAGS=
 endif
 ifeq ($(TARGET),i686-unknown-redox)
 	export CC=i686-unknown-redox-gcc
 	export LD=i686-unknown-redox-ld
 	export AR=i686-unknown-redox-ar
+	export NM=i686-unknown-redox-nm
 	export OBJCOPY=i686-unknown-redox-objcopy
+	export CPPFLAGS=
 endif
 ifeq ($(TARGET),x86_64-unknown-redox)
 	export CC=x86_64-unknown-redox-gcc
 	export LD=x86_64-unknown-redox-ld
 	export AR=x86_64-unknown-redox-ar
+	export NM=x86_64-unknown-redox-nm
 	export OBJCOPY=x86_64-unknown-redox-objcopy
+	export CPPFLAGS=
+endif
+ifeq ($(TARGET),riscv64gc-unknown-redox)
+	export CC=riscv64-unknown-redox-gcc
+	export LD=riscv64-unknown-redox-ld
+	export AR=riscv64-unknown-redox-ar
+	export NM=riscv64-unknown-redox-nm
+	export OBJCOPY=riscv64-unknown-redox-objcopy
+	export CPPFLAGS=-march=rv64gc -mabi=lp64d
 endif
 SRC=\
@@ -62,13 +86,20 @@ BUILTINS_VERSION=0.1.70
 all: | headers libs
 headers: $(HEADERS_DEPS)
+	rm -rf $(TARGET_HEADERS)
+	mkdir -pv $(TARGET_HEADERS)
+	cp -rv include/* $(TARGET_HEADERS)
+	cp -v "openlibm/include"/*.h $(TARGET_HEADERS)
+	cp -v "openlibm/src"/*.h $(TARGET_HEADERS)
+	set -e ; \
 	for header in $(HEADERS_UNPARSED); do \
-		out=`echo "$$header" | sed 's/_/\//g'`; \
+		echo "Header $$header"; \
-		out="$(TARGET_HEADERS)/$$out.h"; \
+		if test -f "src/header/$$header/cbindgen.toml"; then \
-		cbindgen --output "$$out" \
+			out=`echo "$$header" | sed 's/_/\//g'`; \
-			--config="src/header/$$header/cbindgen.toml" \
+			out="$(TARGET_HEADERS)/$$out.h"; \
-			"src/header/$$header/mod.rs"; \
+			cat "src/header/$$header/cbindgen.toml" cbindgen.globdefs.toml \
-		sed -i "s/va_list __valist/.../g" "$$out"; \
+				 | cbindgen "src/header/$$header/mod.rs" --config=/dev/stdin --output "$$out"; \
+		fi \
 	done
 clean:
@@ -84,29 +115,26 @@ fmt:
 install-headers: headers libs
 	mkdir -pv "$(DESTDIR)/include"
-	cp -rv "include"/* "$(DESTDIR)/include"
 	cp -rv "$(TARGET_HEADERS)"/* "$(DESTDIR)/include"
-	cp -v "openlibm/include"/*.h "$(DESTDIR)/include"
-	cp -v "openlibm/src"/*.h "$(DESTDIR)/include"
 libs: \
-	$(BUILD)/release/libc.a \
+	$(BUILD)/$(PROFILE)/libc.a \
-	$(BUILD)/release/libc.so \
+	$(BUILD)/$(PROFILE)/libc.so \
-	$(BUILD)/release/crt0.o \
+	$(BUILD)/$(PROFILE)/crt0.o \
-	$(BUILD)/release/crti.o \
+	$(BUILD)/$(PROFILE)/crti.o \
-	$(BUILD)/release/crtn.o \
+	$(BUILD)/$(PROFILE)/crtn.o \
-	$(BUILD)/release/ld_so
+	$(BUILD)/$(PROFILE)/ld_so
 install-libs: headers libs
 	mkdir -pv "$(DESTDIR)/lib"
-	cp -v "$(BUILD)/release/libc.a" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/libc.a" "$(DESTDIR)/lib"
-	cp -v "$(BUILD)/release/libc.so" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/libc.so" "$(DESTDIR)/lib"
 	ln -vnfs libc.so "$(DESTDIR)/lib/libc.so.6"
-	cp -v "$(BUILD)/release/crt0.o" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/crt0.o" "$(DESTDIR)/lib"
 	ln -vnfs crt0.o "$(DESTDIR)/lib/crt1.o"
-	cp -v "$(BUILD)/release/crti.o" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/crti.o" "$(DESTDIR)/lib"
-	cp -v "$(BUILD)/release/crtn.o" "$(DESTDIR)/lib"
+	cp -v "$(BUILD)/$(PROFILE)/crtn.o" "$(DESTDIR)/lib"
-	cp -v "$(BUILD)/release/ld_so" "$(DESTDIR)/lib/ld64.so.1"
+	cp -v "$(BUILD)/$(PROFILE)/ld_so" "$(DESTDIR)/lib/ld64.so.1"
 	cp -v "$(BUILD)/openlibm/libopenlibm.a" "$(DESTDIR)/lib/libm.a"
 	# Empty libraries for dl, pthread, and rt
 	$(AR) -rcs "$(DESTDIR)/lib/libdl.a"
@@ -138,6 +166,19 @@ test: sysroot
 	$(MAKE) -C tests run
 	$(MAKE) -C tests verify
+$(BUILD)/$(PROFILE)/libc.so: $(BUILD)/$(PROFILE)/librelibc.a $(BUILD)/openlibm/libopenlibm.a
+	$(CC) -nostdlib \
+		-shared \
+		-Wl,--gc-sections \
+		-Wl,-z,pack-relative-relocs \
+		-Wl,--sort-common \
+		-Wl,--allow-multiple-definition \
+		-Wl,--whole-archive $^ -Wl,--no-whole-archive \
+		-Wl,-soname,libc.so.6 \
+		-lgcc \
+		-o $@
 # Debug targets
 $(BUILD)/debug/libc.a: $(BUILD)/debug/librelibc.a $(BUILD)/openlibm/libopenlibm.a
@@ -149,12 +190,9 @@ $(BUILD)/debug/libc.a: $(BUILD)/debug/librelibc.a $(BUILD)/openlibm/libopenlibm.
 	echo "end" >> "$@.mri"
 	$(AR) -M < "$@.mri"
-$(BUILD)/debug/libc.so: $(BUILD)/debug/librelibc.a $(BUILD)/openlibm/libopenlibm.a
-	$(CC) -nostdlib -shared -Wl,--allow-multiple-definition -Wl,--whole-archive $^ -Wl,--no-whole-archive -Wl,-soname,libc.so.6 -o $@
 $(BUILD)/debug/librelibc.a: $(SRC)
-	$(CARGO) rustc $(CARGOFLAGS) -- --emit link=$@ $(RUSTCFLAGS)
+	$(CARGO) rustc $(CARGOFLAGS) -- --emit link=$@ -g -C debug-assertions=no $(RUSTCFLAGS)
-	./renamesyms.sh $@ $(BUILD)/debug/deps/
+	./renamesyms.sh "$@" "$(BUILD)/debug/deps/"
 	touch $@
 $(BUILD)/debug/crt0.o: $(SRC)
@@ -170,11 +208,11 @@ $(BUILD)/debug/crtn.o: $(SRC)
 	touch $@
 $(BUILD)/debug/ld_so.o: $(SRC)
-	$(CARGO) rustc --manifest-path src/ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	$(CARGO) rustc --manifest-path ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort -g -C debug-assertions=no $(RUSTCFLAGS)
 	touch $@
 $(BUILD)/debug/ld_so: $(BUILD)/debug/ld_so.o $(BUILD)/debug/crti.o $(BUILD)/debug/libc.a $(BUILD)/debug/crtn.o
-	$(LD) --no-relax -T src/ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections --gc-keep-exported $^ -o $@
+	$(LD) --no-relax -T ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections $^ -o $@
 # Release targets
@@ -187,14 +225,11 @@ $(BUILD)/release/libc.a: $(BUILD)/release/librelibc.a $(BUILD)/openlibm/libopenl
 	echo "end" >> "$@.mri"
 	$(AR) -M < "$@.mri"
-$(BUILD)/release/libc.so: $(BUILD)/release/librelibc.a $(BUILD)/openlibm/libopenlibm.a
-	$(CC) -nostdlib -shared -Wl,--allow-multiple-definition -Wl,--whole-archive $^ -Wl,--no-whole-archive -Wl,-soname,libc.so.6 -o $@
 $(BUILD)/release/librelibc.a: $(SRC)
 	$(CARGO) rustc --release $(CARGOFLAGS) -- --emit link=$@ $(RUSTCFLAGS)
 	# TODO: Better to only allow a certain whitelisted set of symbols? Perhaps
 	# use some cbindgen hook, specify them manually, or grep for #[no_mangle].
-	./renamesyms.sh $@ $(BUILD)/release/deps/
+	./renamesyms.sh "$@" "$(BUILD)/release/deps/"
 	touch $@
 $(BUILD)/release/crt0.o: $(SRC)
@@ -210,11 +245,11 @@ $(BUILD)/release/crtn.o: $(SRC)
 	touch $@
 $(BUILD)/release/ld_so.o: $(SRC)
-	$(CARGO) rustc --release --manifest-path src/ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	$(CARGO) rustc --release --manifest-path ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
 	touch $@
 $(BUILD)/release/ld_so: $(BUILD)/release/ld_so.o $(BUILD)/release/crti.o $(BUILD)/release/libc.a $(BUILD)/release/crtn.o
-	$(LD) --no-relax -T src/ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections --gc-keep-exported $^ -o $@
+	$(LD) --no-relax -T ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections $^ -o $@
 # Other targets
@@ -226,4 +261,5 @@ $(BUILD)/openlibm: openlibm
 	touch $@
 $(BUILD)/openlibm/libopenlibm.a: $(BUILD)/openlibm $(BUILD)/release/librelibc.a
-	$(MAKE) AR=$(AR) CC=$(CC) LD=$(LD) CPPFLAGS="-fno-stack-protector -I$(shell pwd)/include -I$(TARGET_HEADERS)" -C $< libopenlibm.a
+	$(MAKE) AR=$(AR) CC=$(CC) LD=$(LD) CPPFLAGS="$(CPPFLAGS) -fno-stack-protector -I$(shell pwd)/include -I$(TARGET_HEADERS)" -C $< libopenlibm.a
+	./renamesyms.sh "$@" "$(BUILD)/release/deps/"
--- a/README.md
+++ b/README.md
-# relibc
+# Redox C Library (relibc)
-relibc is a portable POSIX C standard library written in Rust. It is under heavy development, and currently supports Redox and Linux.
+relibc is a portable POSIX C standard library written in Rust and is under heavy development.
 The motivation for this project is twofold: Reduce issues that the Redox developers were having with [newlib](https://sourceware.org/newlib/), and create a safer alternative to a C standard library written in C. It is mainly designed to be used under Redox, as an alternative to newlib, but it also supports Linux system calls via the [sc](https://crates.io/crates/sc) crate.
-### Repository Layout
+Currently Redox and Linux are supported.
+## redox-rt
+redox-rt is our equivalent for [vDSO](https://en.wikipedia.org/wiki/VDSO) from Linux.
+## Repository Layout
 - `include` - Header files (mostly macros and variadic functions `cbindgen` can't generate)
 - `src` - Source files
@@ -22,7 +28,61 @@ The motivation for this project is twofold: Reduce issues that the Redox develop
 - `src/sync` - Synchronization primitives
 - `tests` - C tests (each MR needs to give success in all of them)
-### Build On The Build System
+## Download the sources
+To download the relibc sources run the following command:
+```sh
+git clone --recursive https://gitlab.redox-os.org/redox-os/relibc
+```
+## Build Instructions
+To build relibc out of the Redox build system, do the following steps:
+### Dependencies
+- Install `cbindgen`
+```sh
+cargo install cbindgen
+```
+#### Install the `expect` tool
+- Debian, Ubuntu and PopOS:
+```sh
+sudo apt install expect
+```
+- Fedora:
+```sh
+sudo dnf install expect
+```
+- Arch Linux:
+```sh
+sudo pacman -S expect
+```
+### Build Relibc
+To build the relibc library objects, run the following command:
+```sh
+make all
+```
+- Clean old library objects and tests
+```sh
+make clean
+```
+## Build relibc inside the Redox build system
 Inside of your Redox build system, run:
@@ -30,9 +90,59 @@ Inside of your Redox build system, run:
 make prefix
 ```
-(It only works if the timestamp of the `relibc` folder changed)
+If you need to rebuild `relibc` for testing a Cookbook recipe, run:
+```sh
+touch relibc
+make prefix r.recipe-name
+```
+Touching (changing the "last modified time" of) the `relibc` folder is needed to trigger recompilation for `make prefix`. Replace `recipe-name` with your desired recipe name.
+Note: Do not edit `relibc` inside `prefix` folder! Do your work on `relibc` folder directly inside your Redox build system instead.
+## Tests
+This section explain how to build and run the tests.
+### Build
+To build the tests run `make all` on the `tests` folder, it will store the executables at `tests/bins_static`
+If you did changes to your tests, run `make clean all` to rebuild the executables.
+### Redox OS Testing
+To test on Redox do the following steps:
+- Add the `relibc-tests` recipe on your filesystem configuration at `config/your-cpu/your-config.toml` (generally `desktop.toml`)
+- Run the following commands to rebuild relibc with your changes, update the `relibc-tests` recipe and update your QEMU image:
+```sh
+touch relibc
+```
+```sh
+make prefix cr.relibc-tests image
+```
+- Run the tests
+```sh
+/usr/share/relibc-tests/bins_static/test-name
+```
+### Linux Testing
+Run `make test` on the relibc directory.
+If you want to run one test, run the following command:
+```sh
+tests/bins_static/test-name
+```
-### Issues
+## Issues
 #### I'm building for my own platform which I run, and am getting `x86_64-linux-gnu-ar: command not found` (or similar)
@@ -51,16 +161,17 @@ An easy fix would be to replace the corresponding lines in the Makefile, e.g.
 endif
 ```
-### Contributing
+## Contributing
 Before starting to contribute, read [this](CONTRIBUTING.md) document.
-### Supported OSes
+## Supported OSes
- - Redox OS
+- Redox OS
- - Linux
+- Linux
-### Supported architectures
+## Supported architectures
- - x86_64 (Intel/AMD)
+- i686 (Intel/AMD)
- - Aarch64 (ARM64)
+- x86_64 (Intel/AMD)
+- Aarch64 (ARM64)
--- a/cbindgen.globdefs.toml
+++ b/cbindgen.globdefs.toml
+# needs a leading newline
+[defines]
+"target_os=redox" = "__redox__"
+"target_os=linux" = "__linux__"
+"target_pointer_width=64" = "__LP64__"
+"target_pointer_width=32" = "__LP32__"
+"target_arch=x86" = "__i386__"
+"target_arch=x86_64" = "__x86_64__"
+"target_arch=aarch64" = "__aarch64__"
+# This is not exact. It should be `defined(__riscv) && defined(__LP64__)`, or `defined(__riscv) && __riscv_xlen==64`
+# This will do however, as long as we only support riscv64 and not riscv32
+"target_arch=riscv64" = "__riscv"
+# XXX: silences a warning
+"feature = no_std" = "__relibc__"
+# Ensure attributes are passed down from Rust
+# <features.h> must be included where attributes are used in relibc
+[fn]
+must_use = "__nodiscard"
+deprecated = "__deprecated"
+deprecated_with_note = "__deprecatedNote({})"
+no_return = "__noreturn"
--- a/dlmalloc-rs @ e4ba8493
+++ b/dlmalloc-rs @ e4ba8493
-Subproject commit 2242e05dc862f221fa1c0cc8ef23f0e9595b1dfa
+Subproject commit e4ba8493497c72e15f2b9d428e1dea17e26bf188
--- a/fmt.sh
+++ b/fmt.sh
 #!/usr/bin/env bash
-cargo fmt --package relibc --package crt0 "$@"
+cargo fmt --package relibc --package crt0 --package redox-rt "$@"
--- a/generic-rt/Cargo.toml
+++ b/generic-rt/Cargo.toml
+[package]
+name = "generic-rt"
+version = "0.1.0"
+edition = "2021"
+[dependencies]
--- a/generic-rt/src/lib.rs
+++ b/generic-rt/src/lib.rs
+#![no_std]
+#![feature(core_intrinsics)]
+use core::{
+    arch::asm,
+    mem::{self, offset_of},
+};
+#[derive(Debug)]
+#[repr(C)]
+pub struct GenericTcb<Os> {
+    /// Pointer to the end of static TLS. Must be the first member
+    pub tls_end: *mut u8,
+    /// Size of the memory allocated for the static TLS in bytes (multiple of page size)
+    pub tls_len: usize,
+    /// Pointer to this structure
+    pub tcb_ptr: *mut Self,
+    /// Size of the memory allocated for this structure in bytes (should be same as page size)
+    pub tcb_len: usize,
+    pub os_specific: Os,
+}
+impl<Os> GenericTcb<Os> {
+    /// Architecture specific code to read a usize from the TCB - aarch64
+    #[inline(always)]
+    #[cfg(target_arch = "aarch64")]
+    pub unsafe fn arch_read(offset: usize) -> usize {
+        let abi_ptr: usize;
+        asm!(
+            "mrs {}, tpidr_el0",
+            out(reg) abi_ptr,
+        );
+        let tcb_ptr = *(abi_ptr as *const usize);
+        *((tcb_ptr + offset) as *const usize)
+    }
+    /// Architecture specific code to read a usize from the TCB - x86
+    #[inline(always)]
+    #[cfg(target_arch = "x86")]
+    pub unsafe fn arch_read(offset: usize) -> usize {
+        let value;
+        asm!(
+            "
+            mov {}, gs:[{}]
+            ",
+            out(reg) value,
+            in(reg) offset,
+        );
+        value
+    }
+    /// Architecture specific code to read a usize from the TCB - x86_64
+    #[inline(always)]
+    #[cfg(target_arch = "x86_64")]
+    pub unsafe fn arch_read(offset: usize) -> usize {
+        let value;
+        asm!(
+            "
+            mov {}, fs:[{}]
+            ",
+            out(reg) value,
+            in(reg) offset,
+        );
+        value
+    }
+    /// Architecture specific code to read a usize from the TCB - riscv64
+    #[inline(always)]
+    #[cfg(target_arch = "riscv64")]
+    unsafe fn arch_read(offset: usize) -> usize {
+        let value;
+        asm!(
+            "ld {value}, -8(tp)", // TCB
+            "add {value}, {value}, {offset}",
+            "ld {value}, 0({value})",
+            value = out(reg) value,
+            offset = in(reg) offset,
+        );
+        value
+    }
+    pub unsafe fn current_ptr() -> Option<*mut Self> {
+        let tcb_ptr = Self::arch_read(offset_of!(Self, tcb_ptr)) as *mut Self;
+        let tcb_len = Self::arch_read(offset_of!(Self, tcb_len));
+        if tcb_ptr.is_null() || tcb_len < mem::size_of::<Self>() {
+            None
+        } else {
+            Some(tcb_ptr)
+        }
+    }
+    pub unsafe fn current() -> Option<&'static mut Self> {
+        Some(&mut *Self::current_ptr()?)
+    }
+}
+pub fn panic_notls(msg: impl core::fmt::Display) -> ! {
+    //eprintln!("panicked in ld.so: {}", msg);
+    core::intrinsics::abort();
+}
+pub trait ExpectTlsFree {
+    type Unwrapped;
+    fn expect_notls(self, msg: &str) -> Self::Unwrapped;
+}
+impl<T, E: core::fmt::Debug> ExpectTlsFree for Result<T, E> {
+    type Unwrapped = T;
+    fn expect_notls(self, msg: &str) -> T {
+        match self {
+            Ok(t) => t,
+            Err(err) => panic_notls(format_args!(
+                "{}: expect failed for Result with err: {:?}",
+                msg, err
+            )),
+        }
+    }
+}
+impl<T> ExpectTlsFree for Option<T> {
+    type Unwrapped = T;
+    fn expect_notls(self, msg: &str) -> T {
+        match self {
+            Some(t) => t,
+            None => panic_notls(format_args!("{}: expect failed for Option", msg)),
+        }
+    }
+}
--- a/include/bits/errno.h
+++ b/include/bits/errno.h
@@ -5,8 +5,6 @@
 extern "C" {
 #endif
-#define ENOTSUP EOPNOTSUPP
 #define errno (*__errno_location())
 #define program_invocation_name (*__program_invocation_name())
 #define program_invocation_short_name (*__program_invocation_short_name())

--- a/include/bits/limits.h
+++ b/include/bits/limits.h
@@ -26,7 +26,7 @@
 #define UINT_MAX 0xffffffff
 #define ULLONG_MAX 0xffffffffffffffff
 #define ULONG_MAX 0xffffffffffffffff
-#define USHRT_MAX 0xffffffffffffffff
+#define USHRT_MAX 0xffff
 #define WORD_BIT 32
 #endif
--- a/include/malloc.h
+++ b/include/malloc.h
-#ifndef _MALLOC_H
+#ifndef _BITS_MALLOC_H
-#define _MALLOC_H
+#define _BITS_MALLOC_H
 #include <stddef.h>

--- a/include/bits/netdb.h
+++ b/include/bits/netdb.h
 #ifndef _BITS_NETDB_H
 #define _BITS_NETDB_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define h_errno (*__h_errno_location())
 # define        h_addr  h_addr_list[0] /* Address, for backward compatibility.*/
+#ifdef __cplusplus
+} // extern "C"
+#endif
 #endif /* _BITS_NETDB_H */
--- a/include/bits/signal.h
+++ b/include/bits/signal.h
@@ -5,4 +5,19 @@
 #define SIG_IGN ((void (*)(int))1)
 #define SIG_ERR ((void (*)(int))-1)
+typedef struct siginfo siginfo_t;
+typedef unsigned long long sigset_t;
+typedef struct ucontext ucontext_t;
+typedef struct mcontext mcontext_t;
+struct sigaction {
+  union {
+    void (*sa_handler)(int);
+    void (*sa_sigaction)(int, siginfo_t *, void *);
+  };
+  unsigned long sa_flags;
+  void (*sa_restorer)(void);
+  sigset_t sa_mask;
+};
 #endif // _BITS_SIGNAL_H
--- a/include/cpio.h
+++ b/include/cpio.h
+#ifndef _RELIBC_CPIO_H
+#define _RELIBC_CPIO_H
+#define MAGIC "070707"
+#define C_IRUSR  00000400
+#define C_IWUSR  00000200
+#define C_IXUSR  00000100
+#define C_IRGRP  00000040
+#define C_IWGRP  00000020
+#define C_IXGRP  00000010
+#define C_IROTH  00000004
+#define C_IWOTH  00000002
+#define C_IXOTH  00000001
+#define C_ISUID  00004000
+#define C_ISGID  00002000
+#define C_ISVTX  00001000
+#define C_ISDIR  00040000
+#define C_ISFIFO 00010000
+#define C_ISREG  00100000
+#define C_ISBLK  00060000
+#define C_ISCHR  00020000
+#define C_ISCTG  00110000
+#define C_ISLNK  00120000
+#define C_ISSOCK 00140000
+#endif  /* _RELIBC_CPIO_H */
--- a/include/features.h
+++ b/include/features.h
@@ -3,26 +3,92 @@
 * Copyright (c) 2020 Rich Felker musl-libc
 */
-#ifndef _FEATURES_H
+#ifndef _FEATURES_H__RELIBC
-#define _FEATURES_H
+#define _FEATURES_H__RELIBC
+// Version metadata for feature gating
+// This is useful for divergent implementation specific behavior
+// glibc, ulibc, and likely others define a similar macro
+// musl does not define an equivalent macro
+#define __RELIBC__ 1
+#define __RELIBC__MAJOR 0
+#define __RELIBC__MINOR 2
+/*
+ * Sources:
+ * https://en.cppreference.com/w/c/language/attributes
+ * https://clang.llvm.org/docs/LanguageExtensions.html
+ * https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fc_005fattribute.html
+ * https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
+ */
+// Clang doesn't define __has_cpp_attribute if compiling C code
+#if !defined(__has_cpp_attribute)
+    #define __has_cpp_attribute(x) 0
+#endif
+// Clang doesn't define __has_c_attribute if compiling C++ code
+#if !defined(__has_c_attribute)
+    #define __has_c_attribute(x) 0
+#endif
+// Check if C23+ attributes are available
+#if defined(__cplusplus)
+// HACK: GCC backports C++ attributes to C++98 but doesn't accept attributes
+// placed before the function like cbindgen emits.
+// Let's just disable attributes for C++98 by checking if a random C++11
+// feature is available.
+#define __HAS_ATTRIBUTE(x) __cpp_variable_templates &&__has_cpp_attribute(x)
+#else
+#define __HAS_ATTRIBUTE(x)                                                     \
+  (__has_c_attribute(x) || __STDC_VERSION__ >= 202311L ||                      \
+   __has_cpp_attribute(x))
+#endif
+// TODO: Not emitted with cbindgen
 #if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
+    #define __restrict restrict
 #elif !defined(__GNUC__)
-#define __restrict
+    #define __restrict
 #endif
+// TODO: Not emitted with cbindgen
 #if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
-#define __inline inline
+    #define __inline inline
 #elif !defined(__GNUC__)
-#define __inline
+    #define __inline
 #endif
-#if __STDC_VERSION__ >= 201112L
+// Analogous to Rust's Never type
+#if __HAS_ATTRIBUTE(noreturn)
+    #define __noreturn [[noreturn]]
+// #elif __STDC_VERSION__ >= 201112L
+// FIXME: cbindgen incorrectly places _Noreturn
+// #define __noreturn _Noreturn
 #elif defined(__GNUC__)
-#define _Noreturn __attribute__((__noreturn__))
+    #define __noreturn __attribute__((__noreturn__))
+#else
+    #define __noreturn
+#endif
+// Analogous to Rust's #[must_use]
+// C23 only
+#if __HAS_ATTRIBUTE(nodiscard)
+    #define __nodiscard [[nodiscard]]
+    #define __nodiscardNote(x) [[nodiscard(x)]]
+#else
+    #define __nodiscard
+    #define __nodiscardNote(x)
+#endif
+// Analogous to Rust's #[deprecated]
+// C23 only
+#if __HAS_ATTRIBUTE(deprecated)
+    #define __deprecated [[deprecated]]
+    #define __deprecatedNote(x) [[deprecated(x)]]
 #else
-#define _Noreturn
+    #define __deprecated
+    #define __deprecatedNote(x)
 #endif
 #endif
--- a/include/iso646.h
+++ b/include/iso646.h
+// Copied from musl
+#ifndef _ISO646_H
+#define _ISO646_H
+#ifndef __cplusplus
+#define and    &&
+#define and_eq &=
+#define bitand &
+#define bitor  |
+#define compl  ~
+#define not    !
+#define not_eq !=
+#define or     ||
+#define or_eq  |=
+#define xor    ^
+#define xor_eq ^=
+#endif
+#endif
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -58,7 +58,12 @@ typedef unsigned long long jmp_buf[8];
 #endif
 #ifdef __x86_64__
-typedef unsigned long jmp_buf[8];
+typedef unsigned long jmp_buf[16];
+typedef jmp_buf sigjmp_buf;
+#endif
+#ifdef __riscv
+typedef unsigned long jmp_buf[26];
 #endif
 #ifdef __cplusplus
No results found